cvs: ZendEngine2(PHP_5_3) / zend_builtin_functions.c /tests 009.phpt php-src NEWS php-src/ext/standard/tests/class_object get_class_error_001.phpt get_class_variation_001.phpt
[email protected] ("Dmitry Stogov") Mon, 16 Mar 2009 09:51:32 -0000
| Newsgroups | php.zend-engine.cvs |
|---|---|
| Message-ID | <cvsdmitry1237197092@cvsserver> |
dmitry Mon Mar 16 09:51:32 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src NEWS
/php-src/ext/standard/tests/class_object get_class_error_001.phpt
get_class_variation_001.phpt
/ZendEngine2 zend_builtin_functions.c
/ZendEngine2/tests 009.phpt
Log:
Fixed bug #47664 (get_class returns NULL instead of FALSE)
dmitry-20090316095132.txt
(text/plain, 11.7 KB)
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.515&r2=1.2027.2.547.2.965.2.516&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.965.2.515 php-src/NEWS:1.2027.2.547.2.965.2.516
--- php-src/NEWS:1.2027.2.547.2.965.2.515 Sun Mar 15 23:41:01 2009
+++ php-src/NEWS Mon Mar 16 09:51:31 2009
@@ -8,6 +8,7 @@
- Added LIBXML_LOADED_VERSION constant (libxml2 version currently used). (Rob)
+- Fixed bug #47664 (get_class returns NULL instead of FALSE). (Dmitry)
- Fixed bug #47593 (interface_exists() returns false when using absolute
namespace path). (Kalle, Felipe)
- Fixed bug #47572 (Undefined constant causes segmentation fault). (Felipe)
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/class_object/get_class_error_001.phpt?r1=1.1.4.3&r2=1.1.4.4&diff_format=u
Index: php-src/ext/standard/tests/class_object/get_class_error_001.phpt
diff -u php-src/ext/standard/tests/class_object/get_class_error_001.phpt:1.1.4.3 php-src/ext/standard/tests/class_object/get_class_error_001.phpt:1.1.4.4
--- php-src/ext/standard/tests/class_object/get_class_error_001.phpt:1.1.4.3 Wed Jun 18 23:45:36 2008
+++ php-src/ext/standard/tests/class_object/get_class_error_001.phpt Mon Mar 16 09:51:31 2009
@@ -24,5 +24,5 @@
-- Testing get_class() function with more than expected no. of arguments --
Warning: get_class() expects at most 1 parameter, 2 given in %s on line 14
-NULL
+bool(false)
Done
\ No newline at end of file
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/class_object/get_class_variation_001.phpt?r1=1.1.4.3&r2=1.1.4.4&diff_format=u
Index: php-src/ext/standard/tests/class_object/get_class_variation_001.phpt
diff -u php-src/ext/standard/tests/class_object/get_class_variation_001.phpt:1.1.4.3 php-src/ext/standard/tests/class_object/get_class_variation_001.phpt:1.1.4.4
--- php-src/ext/standard/tests/class_object/get_class_variation_001.phpt:1.1.4.3 Wed Jun 18 23:45:36 2008
+++ php-src/ext/standard/tests/class_object/get_class_variation_001.phpt Mon Mar 16 09:51:31 2009
@@ -76,137 +76,137 @@
--EXPECTF--
*** Testing get_class() : usage variations ***
-Notice: Undefined variable: undefined_var in %s on line 58
+Notice: Undefined variable: undefined_var in /home/dmitry/php/php5.3/ext/standard/tests/class_object/get_class_variation_001.php on line 58
-Notice: Undefined variable: unset_var in %s on line 61
+Notice: Undefined variable: unset_var in /home/dmitry/php/php5.3/ext/standard/tests/class_object/get_class_variation_001.php on line 61
Arg value: 0 (type: integer)
-Warning: get_class() expects parameter 1 to be object, integer given in %s on line %d
-NULL
+Warning: get_class() expects parameter 1 to be object, integer given in /home/dmitry/php/php5.3/ext/standard/tests/class_object/get_class_variation_001.php on line 68
+bool(false)
Arg value: 1 (type: integer)
-Warning: get_class() expects parameter 1 to be object, integer given in %s on line %d
-NULL
+Warning: get_class() expects parameter 1 to be object, integer given in /home/dmitry/php/php5.3/ext/standard/tests/class_object/get_class_variation_001.php on line 68
+bool(false)
Arg value: 12345 (type: integer)
-Warning: get_class() expects parameter 1 to be object, integer given in %s on line %d
-NULL
+Warning: get_class() expects parameter 1 to be object, integer given in /home/dmitry/php/php5.3/ext/standard/tests/class_object/get_class_variation_001.php on line 68
+bool(false)
Arg value: -2345 (type: integer)
-Warning: get_class() expects parameter 1 to be object, integer given in %s on line %d
-NULL
+Warning: get_class() expects parameter 1 to be object, integer given in /home/dmitry/php/php5.3/ext/standard/tests/class_object/get_class_variation_001.php on line 68
+bool(false)
Arg value: 10.5 (type: double)
-Warning: get_class() expects parameter 1 to be object, double given in %s on line %d
-NULL
+Warning: get_class() expects parameter 1 to be object, double given in /home/dmitry/php/php5.3/ext/standard/tests/class_object/get_class_variation_001.php on line 68
+bool(false)
Arg value: -10.5 (type: double)
-Warning: get_class() expects parameter 1 to be object, double given in %s on line %d
-NULL
+Warning: get_class() expects parameter 1 to be object, double given in /home/dmitry/php/php5.3/ext/standard/tests/class_object/get_class_variation_001.php on line 68
+bool(false)
Arg value: 101234567000 (type: double)
-Warning: get_class() expects parameter 1 to be object, double given in %s on line %d
-NULL
+Warning: get_class() expects parameter 1 to be object, double given in /home/dmitry/php/php5.3/ext/standard/tests/class_object/get_class_variation_001.php on line 68
+bool(false)
Arg value: 1.07654321E-9 (type: double)
-Warning: get_class() expects parameter 1 to be object, double given in %s on line %d
-NULL
+Warning: get_class() expects parameter 1 to be object, double given in /home/dmitry/php/php5.3/ext/standard/tests/class_object/get_class_variation_001.php on line 68
+bool(false)
Arg value: 0.5 (type: double)
-Warning: get_class() expects parameter 1 to be object, double given in %s on line %d
-NULL
+Warning: get_class() expects parameter 1 to be object, double given in /home/dmitry/php/php5.3/ext/standard/tests/class_object/get_class_variation_001.php on line 68
+bool(false)
Arg value: Array (type: array)
-Warning: get_class() expects parameter 1 to be object, array given in %s on line %d
-NULL
+Warning: get_class() expects parameter 1 to be object, array given in /home/dmitry/php/php5.3/ext/standard/tests/class_object/get_class_variation_001.php on line 68
+bool(false)
Arg value: Array (type: array)
-Warning: get_class() expects parameter 1 to be object, array given in %s on line %d
-NULL
+Warning: get_class() expects parameter 1 to be object, array given in /home/dmitry/php/php5.3/ext/standard/tests/class_object/get_class_variation_001.php on line 68
+bool(false)
Arg value: Array (type: array)
-Warning: get_class() expects parameter 1 to be object, array given in %s on line %d
-NULL
+Warning: get_class() expects parameter 1 to be object, array given in /home/dmitry/php/php5.3/ext/standard/tests/class_object/get_class_variation_001.php on line 68
+bool(false)
Arg value: Array (type: array)
-Warning: get_class() expects parameter 1 to be object, array given in %s on line %d
-NULL
+Warning: get_class() expects parameter 1 to be object, array given in /home/dmitry/php/php5.3/ext/standard/tests/class_object/get_class_variation_001.php on line 68
+bool(false)
Arg value: Array (type: array)
-Warning: get_class() expects parameter 1 to be object, array given in %s on line %d
-NULL
+Warning: get_class() expects parameter 1 to be object, array given in /home/dmitry/php/php5.3/ext/standard/tests/class_object/get_class_variation_001.php on line 68
+bool(false)
Arg value: (type: NULL)
-Warning: get_class() expects parameter 1 to be object, null given in %s on line %d
-NULL
+Warning: get_class() expects parameter 1 to be object, null given in /home/dmitry/php/php5.3/ext/standard/tests/class_object/get_class_variation_001.php on line 68
+bool(false)
Arg value: (type: NULL)
-Warning: get_class() expects parameter 1 to be object, null given in %s on line %d
-NULL
+Warning: get_class() expects parameter 1 to be object, null given in /home/dmitry/php/php5.3/ext/standard/tests/class_object/get_class_variation_001.php on line 68
+bool(false)
Arg value: 1 (type: boolean)
-Warning: get_class() expects parameter 1 to be object, boolean given in %s on line %d
-NULL
+Warning: get_class() expects parameter 1 to be object, boolean given in /home/dmitry/php/php5.3/ext/standard/tests/class_object/get_class_variation_001.php on line 68
+bool(false)
Arg value: (type: boolean)
-Warning: get_class() expects parameter 1 to be object, boolean given in %s on line %d
-NULL
+Warning: get_class() expects parameter 1 to be object, boolean given in /home/dmitry/php/php5.3/ext/standard/tests/class_object/get_class_variation_001.php on line 68
+bool(false)
Arg value: 1 (type: boolean)
-Warning: get_class() expects parameter 1 to be object, boolean given in %s on line %d
-NULL
+Warning: get_class() expects parameter 1 to be object, boolean given in /home/dmitry/php/php5.3/ext/standard/tests/class_object/get_class_variation_001.php on line 68
+bool(false)
Arg value: (type: boolean)
-Warning: get_class() expects parameter 1 to be object, boolean given in %s on line %d
-NULL
+Warning: get_class() expects parameter 1 to be object, boolean given in /home/dmitry/php/php5.3/ext/standard/tests/class_object/get_class_variation_001.php on line 68
+bool(false)
Arg value: (type: string)
-Warning: get_class() expects parameter 1 to be object, string given in %s on line %d
-NULL
+Warning: get_class() expects parameter 1 to be object, string given in /home/dmitry/php/php5.3/ext/standard/tests/class_object/get_class_variation_001.php on line 68
+bool(false)
Arg value: (type: string)
-Warning: get_class() expects parameter 1 to be object, string given in %s on line %d
-NULL
+Warning: get_class() expects parameter 1 to be object, string given in /home/dmitry/php/php5.3/ext/standard/tests/class_object/get_class_variation_001.php on line 68
+bool(false)
Arg value: string (type: string)
-Warning: get_class() expects parameter 1 to be object, string given in %s on line %d
-NULL
+Warning: get_class() expects parameter 1 to be object, string given in /home/dmitry/php/php5.3/ext/standard/tests/class_object/get_class_variation_001.php on line 68
+bool(false)
Arg value: string (type: string)
-Warning: get_class() expects parameter 1 to be object, string given in %s on line %d
-NULL
+Warning: get_class() expects parameter 1 to be object, string given in /home/dmitry/php/php5.3/ext/standard/tests/class_object/get_class_variation_001.php on line 68
+bool(false)
Arg value: (type: NULL)
-Warning: get_class() expects parameter 1 to be object, null given in %s on line %d
-NULL
+Warning: get_class() expects parameter 1 to be object, null given in /home/dmitry/php/php5.3/ext/standard/tests/class_object/get_class_variation_001.php on line 68
+bool(false)
Arg value: (type: NULL)
-Warning: get_class() expects parameter 1 to be object, null given in %s on line %d
-NULL
-Done
\ No newline at end of file
+Warning: get_class() expects parameter 1 to be object, null given in /home/dmitry/php/php5.3/ext/standard/tests/class_object/get_class_variation_001.php on line 68
+bool(false)
+Done
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_builtin_functions.c?r1=1.277.2.12.2.25.2.46&r2=1.277.2.12.2.25.2.47&diff_format=u
Index: ZendEngine2/zend_builtin_functions.c
diff -u ZendEngine2/zend_builtin_functions.c:1.277.2.12.2.25.2.46 ZendEngine2/zend_builtin_functions.c:1.277.2.12.2.25.2.47
--- ZendEngine2/zend_builtin_functions.c:1.277.2.12.2.25.2.46 Sun Mar 8 17:28:38 2009
+++ ZendEngine2/zend_builtin_functions.c Mon Mar 16 09:51:31 2009
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend_builtin_functions.c,v 1.277.2.12.2.25.2.46 2009/03/08 17:28:38 felipe Exp $ */
+/* $Id: zend_builtin_functions.c,v 1.277.2.12.2.25.2.47 2009/03/16 09:51:31 dmitry Exp $ */
#include "zend.h"
#include "zend_API.h"
@@ -719,7 +719,7 @@
int dup;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|o", &obj) == FAILURE) {
- return;
+ RETURN_FALSE;
}
if (!obj) {
http://cvs.php.net/viewvc.cgi/ZendEngine2/tests/009.phpt?r1=1.1.2.2.2.1&r2=1.1.2.2.2.2&diff_format=u
Index: ZendEngine2/tests/009.phpt
diff -u ZendEngine2/tests/009.phpt:1.1.2.2.2.1 ZendEngine2/tests/009.phpt:1.1.2.2.2.2
--- ZendEngine2/tests/009.phpt:1.1.2.2.2.1 Wed Jun 18 23:38:37 2008
+++ ZendEngine2/tests/009.phpt Mon Mar 16 09:51:32 2009
@@ -42,7 +42,7 @@
bool(false)
Warning: get_class() expects parameter 1 to be object, string given in %s on line %d
-NULL
+bool(false)
string(3) "foo"
string(4) "foo2"
Done