From: Marcus Boerger <helly@php.net>
Date: Sat, 2 Feb 2008 15:18:30 +0000 (+0000)
Subject: - Fix remaining issue (should be last one)
X-Git-Tag: RELEASE_1_3_1~159
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ac8e76c714f6ef7b82c8730e8f89a933cb4bb17f;p=php

- Fix remaining issue (should be last one)
---

diff --git a/Zend/tests/bug32290.phpt b/Zend/tests/bug32290.phpt
index 3223e8e9ac..12699d0c64 100755
--- 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 e6d3b59732..7cc2189181 100644
--- 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;