Fixed test (tests/experimental/setmulti_badserialize.phpt)

laruence · laruence · commit 6837d894944a · 2016-07-23T20:44:03.000+08:00
diff --git a/php_memcached.c b/php_memcached.c
@@ -1786,7 +1786,7 @@ static void php_memc_setMulti_impl(INTERNAL_FUNCTION_PARAMETERS, zend_bool by_ke
 		}
 
 		if (!s_memc_write_zval (intern, MEMC_OP_SET, server_key, str_key, value, expiration)) {
-			php_error_docref(NULL, E_WARNING, "failed to set key %s", str_key->val);
+			php_error_docref(NULL, E_WARNING, "failed to set key %s", ZSTR_VAL(str_key));
 		}
 
 		if (!skey) {
diff --git a/tests/experimental/setmulti_badserialize.phpt b/tests/experimental/setmulti_badserialize.phpt
@@ -42,6 +42,6 @@ try {
 var_dump($m->getByKey('kef', 'foo'));
 
 --EXPECT--
-
+Memcached::setMultiByKey(): failed to set key foo
 1234
 int(10)

Original file line number	Diff line number	Diff line change
`@@ -1786,7 +1786,7 @@ static void php_memc_setMulti_impl(INTERNAL_FUNCTION_PARAMETERS, zend_bool by_ke`
`1786`	`1786`	`}`
`1787`	`1787`
`1788`	`1788`	`if (!s_memc_write_zval (intern, MEMC_OP_SET, server_key, str_key, value, expiration)) {`
`1789`		`- php_error_docref(NULL, E_WARNING, "failed to set key %s", str_key->val);`
	`1789`	`+ php_error_docref(NULL, E_WARNING, "failed to set key %s", ZSTR_VAL(str_key));`
`1790`	`1790`	`}`
`1791`	`1791`
`1792`	`1792`	`if (!skey) {`
Original file line number	Diff line number	Diff line change
`@@ -42,6 +42,6 @@ try {`
`42`	`42`	`var_dump($m->getByKey('kef', 'foo'));`
`43`	`43`
`44`	`44`	`--EXPECT--`
`45`		`-`
	`45`	`+Memcached::setMultiByKey(): failed to set key foo`
`46`	`46`	`1234`
`47`	`47`	`int(10)`