com php-src: Merge branch 'PHP-5.3' into PHP-5.4: NEWS Zend/tests/bug62005.phpt Zend/zend_execute.c

Commit: 6a5095582a1e3b9a065863c9990e2f001d1cdc10 Author: Xinchen Hui <laruence@php.net> Sat, 12 May 2012 13:19:27 +0800 Parents: 8b4b70df56e14be0f7172b5cc5f8da44b3272ac3 3332943c9d20a8b5e09816b11f38742de0e16085 Branches: PHP-5.4 Link: http://git.php.net/?p=php-src..git;a=commitdiff;h=6a5095582a1e3b9a065863c9990e2f001d1cdc10 Log: Merge branch 'PHP-5.3' into PHP-5.4 * PHP-5.3: Fixed Bug #62005 (unexpected behavior when incrementally assigning to a member of a null object) fix stack overflow in php_intlog10abs() Conflicts: Zend/zend_execute.c Bugs: https://bugs.php.net/62005 Changed paths: MM NEWS AM Zend/tests/bug62005.phpt MM Zend/zend_execute.c Diff: diff --cc NEWS index 3717537,1057db7..a872112 --- a/NEWS +++ b/NEWS @@@ -16,27 -11,19 +16,29 @@@ PH (Laruence) - Core: + . Fixed bug #62005 (unexpected behavior when incrementally assigning to a + member of a null object). (Laruence) + . Fixed bug #61978 (Object recursion not detected for classes that implement + JsonSerializable). (Felipe) . Fixed bug #61730 (Segfault from array_walk modifying an array passed by reference). (Laruence) + .. Fixed bug #61922 (ZTS build doesn't accept zend.script_encoding config). + (Laruence) . Fixed missing bound check in iptcparse(). (chris at chiappa.net) - . Fixed bug #61764 ('I' unpacks n as signed if n > 2^31-1 on LP64). (Gustavo) + . Fixed bug #61827 (incorrect \e processing on Windows) (Anatoliy) + . Fixed bug #61761 ('Overriding' a private static method with a different + signature causes crash). (Laruence) + . Fixed bug #61728 (PHP crash when calling ob_start in request_shutdown + phase). (Laruence) + . Fixed bug #61660 (bin2hex(hex2bin($data)) != $data). (Nikita Popov) + . Fixed bug #61650 (ini parser crashes when using ${xxxx} ini variables + (without apache2)). (Laruence) + . Fixed bug #61605 (header_remove() does not remove all headers). (Laruence) . Fixed bug #54197 ([PATH=] sections incompatibility with user_ini.filename set to null). (Anatoliy) - . Fixed bug #61713 (Logic error in charset detection for htmlentities). - (Anatoliy) . Fixed bug #61991 (long overflow in realpath_cache_get()). (Anatoliy) -- Fileinfo: +- FPM . Fixed bug #61812 (Uninitialised value used in libmagic). (Laruence, Gustavo) diff --cc Zend/tests/bug62005.phpt index 0000000,4ff4b2c..c99b287 mode 000000,100644..100644 --- a/Zend/tests/bug62005.phpt +++ b/Zend/tests/bug62005.phpt @@@ -1,0 -1,15 +1,15 @@@ + --TEST-- + Bug #62005 (unexpected behavior when incrementally assigning to a member of a null object) + --FILE-- + <?php + function add_points($player, $points) { + $player->energy += $points; + print_r($player); + } + add_points(NULL, 2); + --EXPECTF-- -Strict Standards: Creating default object from empty value in %sbug62005.php on line %d ++Warning: Creating default object from empty value in %sbug62005.php on line %d + stdClass Object + ( + [energy] => 2 + ) diff --cc Zend/zend_execute.c index d72fc73,4423921..205531f --- a/Zend/zend_execute.c +++ b/Zend/zend_execute.c @@@ -557,8 -435,7 +557,7 @@@ static inline void make_real_object(zva SEPARATE_ZVAL_IF_NOT_REF(object_ptr); zval_dtor(*object_ptr); object_init(*object_ptr); - zend_error(E_STRICT, "Creating default object from empty value"); ++ zend_error(E_WARNING, "Creating default object from empty value"); } }