felipe Thu May 8 18:51:29 2008 UTC
Modified files: (Branch: PHP_5_3)
/ZendEngine2 zend_API.c
/ZendEngine2/tests bug31720.phpt
/php-src/ext/standard/tests/array array_filter_variation2.phpt
array_map_variation17.phpt
uasort_variation2.phpt
Log:
- MFH: Fixed detection of invalid class name
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_API.c?r1=1.296.2.27.2.34.2.34&r2=1.296.2.27.2.34.2.35&diff_format=u
Index: ZendEngine2/zend_API.c
diff -u ZendEngine2/zend_API.c:1.296.2.27.2.34.2.34
ZendEngine2/zend_API.c:1.296.2.27.2.34.2.35
--- ZendEngine2/zend_API.c:1.296.2.27.2.34.2.34 Mon May 5 09:44:39 2008
+++ ZendEngine2/zend_API.c Thu May 8 18:51:28 2008
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend_API.c,v 1.296.2.27.2.34.2.34 2008/05/05 09:44:39 dmitry Exp $ */
+/* $Id: zend_API.c,v 1.296.2.27.2.34.2.35 2008/05/08 18:51:28 felipe Exp $ */
#include "zend.h"
#include "zend_execute.h"
@@ -2571,7 +2571,7 @@
}
} else {
if
(zend_hash_num_elements(Z_ARRVAL_P(callable)) == 2) {
- if (!obj) {
+ if (!obj || (Z_TYPE_PP(obj) !=
IS_STRING && Z_TYPE_PP(obj) != IS_OBJECT)) {
if (error)
zend_spprintf(error, 0, "first array member is not a valid class name or
object");
} else {
if (error)
zend_spprintf(error, 0, "second array member is not a valid method");
http://cvs.php.net/viewvc.cgi/ZendEngine2/tests/bug31720.phpt?r1=1.3.6.2&r2=1.3.6.3&diff_format=u
Index: ZendEngine2/tests/bug31720.phpt
diff -u ZendEngine2/tests/bug31720.phpt:1.3.6.2
ZendEngine2/tests/bug31720.phpt:1.3.6.3
--- ZendEngine2/tests/bug31720.phpt:1.3.6.2 Sat Feb 2 00:55:35 2008
+++ ZendEngine2/tests/bug31720.phpt Thu May 8 18:51:28 2008
@@ -10,5 +10,5 @@
--EXPECTF--
Notice: Undefined variable: nonesuchvar in %s on line %d
-Warning: array_walk() expects parameter 2 to be a valid callback, second array
member is not a valid method in %s on line %d
+Warning: array_walk() expects parameter 2 to be a valid callback, first array
member is not a valid class name or object in %s on line %d
===DONE===
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/array_filter_variation2.phpt?r1=1.1.4.4&r2=1.1.4.5&diff_format=u
Index: php-src/ext/standard/tests/array/array_filter_variation2.phpt
diff -u php-src/ext/standard/tests/array/array_filter_variation2.phpt:1.1.4.4
php-src/ext/standard/tests/array/array_filter_variation2.phpt:1.1.4.5
--- php-src/ext/standard/tests/array/array_filter_variation2.phpt:1.1.4.4
Sat Feb 2 01:31:18 2008
+++ php-src/ext/standard/tests/array/array_filter_variation2.phpt Thu May
8 18:51:28 2008
@@ -134,7 +134,7 @@
Warning: array_filter() expects parameter 2 to be a valid callback, array must
have exactly two members in %s on line %d
NULL
-- Iteration 13 --
-Warning: array_filter() expects parameter 2 to be a valid callback, second
array member is not a valid method in %s on line %d
+Warning: array_filter() expects parameter 2 to be a valid callback, first
array member is not a valid class name or object in %s on line %d
NULL
-- Iteration 14 --
Warning: array_filter() expects parameter 2 to be a valid callback, first
array member is not a valid class name or object in %s on line %d
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/array_map_variation17.phpt?r1=1.1.2.5&r2=1.1.2.6&diff_format=u
Index: php-src/ext/standard/tests/array/array_map_variation17.phpt
diff -u php-src/ext/standard/tests/array/array_map_variation17.phpt:1.1.2.5
php-src/ext/standard/tests/array/array_map_variation17.phpt:1.1.2.6
--- php-src/ext/standard/tests/array/array_map_variation17.phpt:1.1.2.5 Sat Feb
2 03:00:57 2008
+++ php-src/ext/standard/tests/array/array_map_variation17.phpt Thu May 8
18:51:28 2008
@@ -141,11 +141,11 @@
NULL
-- Iteration 17 --
-Warning: array_map() expects parameter 1 to be a valid callback, second array
member is not a valid method in %s on line %d
+Warning: array_map() expects parameter 1 to be a valid callback, first array
member is not a valid class name or object in %s on line %d
NULL
-- Iteration 18 --
-Warning: array_map() expects parameter 1 to be a valid callback, second array
member is not a valid method in %s on line %d
+Warning: array_map() expects parameter 1 to be a valid callback, first array
member is not a valid class name or object in %s on line %d
NULL
-- Iteration 19 --
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/uasort_variation2.phpt?r1=1.1.4.3&r2=1.1.4.4&diff_format=u
Index: php-src/ext/standard/tests/array/uasort_variation2.phpt
diff -u php-src/ext/standard/tests/array/uasort_variation2.phpt:1.1.4.3
php-src/ext/standard/tests/array/uasort_variation2.phpt:1.1.4.4
--- php-src/ext/standard/tests/array/uasort_variation2.phpt:1.1.4.3 Sat Feb
2 02:29:27 2008
+++ php-src/ext/standard/tests/array/uasort_variation2.phpt Thu May 8
18:51:28 2008
@@ -147,7 +147,7 @@
NULL
-- Iteration 13 --
-Warning: uasort() expects parameter 2 to be a valid callback, second array
member is not a valid method in %s on line %d
+Warning: uasort() expects parameter 2 to be a valid callback, first array
member is not a valid class name or object in %s on line %d
NULL
-- Iteration 14 --
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
