cvs: ZendEngine2(PHP_5_3) / zend_API.c /tests bug32290.phpt

helly		Sat Feb  2 15:18:30 2008 UTC

  Modified files:              (Branch: PHP_5_3)
    /ZendEngine2	zend_API.c 
    /ZendEngine2/tests	bug32290.phpt 
  Log:
  - Fix remaining issue (should be last one)
  
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_API.c?r1=1.296.2.27.2.34.2.22&r2=1.296.2.27.2.34.2.23&diff_format=u
Index: ZendEngine2/zend_API.c
diff -u ZendEngine2/zend_API.c:1.296.2.27.2.34.2.22 ZendEngine2/zend_API.c:1.296.2.27.2.34.2.23
--- ZendEngine2/zend_API.c:1.296.2.27.2.34.2.22	Sat Feb  2 14:19:03 2008
+++ ZendEngine2/zend_API.c	Sat Feb  2 15:18:30 2008
@@ -18,7 +18,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: zend_API.c,v 1.296.2.27.2.34.2.22 2008/02/02 14:19:03 helly Exp $ */
+/* $Id: zend_API.c,v 1.296.2.27.2.34.2.23 2008/02/02 15:18:30 helly Exp $ */
 
 #include "zend.h"
 #include "zend_execute.h"
@@ -590,6 +590,7 @@
 						*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;
http://cvs.php.net/viewvc.cgi/ZendEngine2/tests/bug32290.phpt?r1=1.1.4.2.4.2&r2=1.1.4.2.4.3&diff_format=u
Index: ZendEngine2/tests/bug32290.phpt
diff -u ZendEngine2/tests/bug32290.phpt:1.1.4.2.4.2 ZendEngine2/tests/bug32290.phpt:1.1.4.2.4.3
--- ZendEngine2/tests/bug32290.phpt:1.1.4.2.4.2	Sat Feb  2 00:55:35 2008
+++ ZendEngine2/tests/bug32290.phpt	Sat Feb  2 15:18:30 2008
@@ -100,10 +100,9 @@
 ===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 @@
 ===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)