archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fixed bug #62976 (Notice: could not be converted to int when comparing some builtin classes)

Browse source
This commit is contained in:
Xinchen Hui 2012-08-31 11:22:43 +08:00
parent 8afb848e18
commit 5dc2cef370
3 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
NEWS
View file

@ -3,6 +3,8 @@ PHP NEWS
?? ??? 2012, PHP 5.3.16 ?? ??? 2012, PHP 5.3.16
- Core: - Core:
. Fixed bug #62976 (Notice: could not be converted to int when comparing
some builtin classes). (Laruence)
. Fixed bug (segfault while build with zts and GOTO vm-kind). (Laruence) . Fixed bug (segfault while build with zts and GOTO vm-kind). (Laruence)
. Fixed bug #62955 (Only one directive is loaded from "Per Directory Values" . Fixed bug #62955 (Only one directive is loaded from "Per Directory Values"
Windows registry). (aserbulov at parallels dot com) Windows registry). (aserbulov at parallels dot com)

3
Zend/zend_operators.c
View file

@ -1489,6 +1489,9 @@ ZEND_API int compare_function(zval *result, zval *op1, zval *op2 TSRMLS_DC) /* {
ret = compare_function(result, op1, op_free TSRMLS_CC); ret = compare_function(result, op1, op_free TSRMLS_CC);
zend_free_obj_get_result(op_free TSRMLS_CC); zend_free_obj_get_result(op_free TSRMLS_CC);
return ret; return ret;
} else if (Z_TYPE_P(op1) == IS_OBJECT) {
ZVAL_LONG(result, 1);
return SUCCESS;
} }
} }
if (!converted) { if (!converted) {

8
tests/lang/compare_objects_basic2.phpt
View file

@ -20,9 +20,5 @@ var_dump($obj1 == $obj2);
===DONE=== ===DONE===
--EXPECTF-- --EXPECTF--
Simple test comparing two objects with different compare callback handler Simple test comparing two objects with different compare callback handler
bool(false)
Notice: Object of class X could not be converted to int in %s on line %d ===DONE===
Notice: Object of class DateTime could not be converted to int in %s on line %d
bool(true)
===DONE===