- Fix remaining issue (should be last one)

diff --git a/Zend/tests/bug32290.phpt b/Zend/tests/bug32290.phpt
index 3223e8e9ac85a0cc7a0a2fdc941253b4a16da725..12699d0c648ce185b6d8d2b40ef7d05770827164 100755 (executable)
--- a/Zend/tests/bug32290.phpt
+++ b/Zend/tests/bug32290.phpt
@@ -100,10 +100,9 @@ var_dump($x->doSomethingStatic(1));
 ===A===
 TestB::doSomething(1)
 
-Strict Standards: call_user_func_array() expects parameter 1 to be a valid callback, non-static method TestA::doSomething() cannot be called statically, assuming $this from compatible context TestB in %s on line %d
-
-Warning: call_user_func_array() expects parameter 2 to be a valid callback, array must have exactly two members in %s on line %d
-NULL
+Strict Standards: call_user_func_array() expects parameter 1 to be a valid callback, non-static method TestA::doSomething() should not be called statically, assuming $this from compatible context TestB in %s on line %d
+TestA::doSomething(2)
+int(1)
 
 ===B===
 TestB::doSomethingThis(1)
@@ -113,10 +112,9 @@ int(1)
 ===C===
 TestB::doSomethingParent(1)
 
-Strict Standards: call_user_func_array() expects parameter 1 to be a valid callback, non-static method TestA::doSomethingParent() cannot be called statically, assuming $this from compatible context TestB in %s on line %d
-
-Warning: call_user_func_array() expects parameter 2 to be a valid callback, array must have exactly two members in %s on line %d
-NULL
+Strict Standards: call_user_func_array() expects parameter 1 to be a valid callback, non-static method TestA::doSomethingParent() should not be called statically, assuming $this from compatible context TestB in %s on line %d
+TestA::doSomethingParent(2)
+int(1)
 
 ===D===
 TestB::doSomethingParentThis(1)

diff --git a/Zend/zend_API.c b/Zend/zend_API.c
index e6d3b5973299f9919c2d4db3ba6c59aa856badd2..7cc21891812b4b58bebdbf725a753b54d60609d4 100644 (file)
--- a/Zend/zend_API.c
+++ b/Zend/zend_API.c
@@ -590,6 +590,7 @@ static char *zend_parse_arg_impl(int arg_num, zval **arg, va_list *va, char **sp
                                                *severity = E_STRICT;
                                                zend_spprintf(error, 0, "to be a valid callback, %s", is_callable_error);
                                                efree(is_callable_error);
+                                               *spec = spec_walk;
                                                return "";
                                        }
                                        break;