helly Sat Feb 23 17:06:24 2008 UTC Modified files: (Branch: PHP_5_3) /php-src NEWS /ZendEngine2 zend.c zend_builtin_functions.c zend_compile.c zend_constants.c zend_errors.h zend_execute_API.c zend_language_parser.y zend_vm_def.h zend_vm_execute.h /ZendEngine2/tests bug33771.phpt bug34767.phpt error_reporting01.phpt error_reporting02.phpt error_reporting03.phpt error_reporting04.phpt error_reporting05.phpt error_reporting06.phpt error_reporting07.phpt error_reporting08.phpt error_reporting09.phpt error_reporting10.phpt is_a.phpt /php-src/ext/date php_date.c /php-src/ext/mysql php_mysql.c /php-src/ext/standard basic_functions.c dl.c file.c string.c /php-src/ext/standard/tests/file magic_quotes.phpt /php-src/ext/standard/tests/serialize bug31402.phpt /php-src/ext/standard/tests/strings setlocale_error.phpt /php-src/main main.c /php-src/tests/classes new_001.phpt /php-src/tests/lang bug20175.phpt bug22231.phpt bug22510.phpt Log: - MFH Add E_DEPRECATED (Lars Strojny, Felipe Pena, Marcus) [DOC] Finally added deprecation messages
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.116&r2=1.2027.2.547.2.965.2.117&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.965.2.116 php-src/NEWS:1.2027.2.547.2.965.2.117 --- php-src/NEWS:1.2027.2.547.2.965.2.116 Thu Feb 21 20:01:23 2008 +++ php-src/NEWS Sat Feb 23 17:06:19 2008 @@ -1,6 +1,8 @@ PHP NEWS ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| ?? ??? 20??, PHP 5.3.0 +- Add new error mode E_DEPRECATED that informs about stuff that gets dropped in + later PHP versions. (Lars Strojny, Felipe, Marcus) - Added and improved PHP syntax and semantics: . Added NOWDOC. (Gwynne Raskind, Stas, Dmitry) . Added "?:" operator. (Marcus) http://cvs.php.net/viewvc.cgi/ZendEngine2/zend.c?r1=1.308.2.12.2.35.2.7&r2=1.308.2.12.2.35.2.8&diff_format=u Index: ZendEngine2/zend.c diff -u ZendEngine2/zend.c:1.308.2.12.2.35.2.7 ZendEngine2/zend.c:1.308.2.12.2.35.2.8 --- ZendEngine2/zend.c:1.308.2.12.2.35.2.7 Mon Jan 28 20:34:02 2008 +++ ZendEngine2/zend.c Sat Feb 23 17:06:19 2008 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend.c,v 1.308.2.12.2.35.2.7 2008/01/28 20:34:02 derick Exp $ */ +/* $Id: zend.c,v 1.308.2.12.2.35.2.8 2008/02/23 17:06:19 helly Exp $ */ #include "zend.h" #include "zend_extensions.h" @@ -66,7 +66,7 @@ static ZEND_INI_MH(OnUpdateErrorReporting) /* {{{ */ { if (!new_value) { - EG(error_reporting) = E_ALL & ~E_NOTICE & ~E_STRICT; + EG(error_reporting) = E_ALL & ~E_NOTICE & ~E_STRICT & ~E_DEPRECATED; } else { EG(error_reporting) = atoi(new_value); } @@ -974,6 +974,7 @@ case E_ERROR: case E_NOTICE: case E_STRICT: + case E_DEPRECATED: case E_WARNING: case E_USER_ERROR: case E_USER_WARNING: http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_builtin_functions.c?r1=1.277.2.12.2.25.2.12&r2=1.277.2.12.2.25.2.13&diff_format=u Index: ZendEngine2/zend_builtin_functions.c diff -u ZendEngine2/zend_builtin_functions.c:1.277.2.12.2.25.2.12 ZendEngine2/zend_builtin_functions.c:1.277.2.12.2.25.2.13 --- ZendEngine2/zend_builtin_functions.c:1.277.2.12.2.25.2.12 Thu Feb 21 15:14:27 2008 +++ ZendEngine2/zend_builtin_functions.c Sat Feb 23 17:06:19 2008 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_builtin_functions.c,v 1.277.2.12.2.25.2.12 2008/02/21 15:14:27 dmitry Exp $ */ +/* $Id: zend_builtin_functions.c,v 1.277.2.12.2.25.2.13 2008/02/23 17:06:19 helly Exp $ */ #include "zend.h" #include "zend_API.h" @@ -744,7 +744,7 @@ Returns true if the object is of this class or has this class as one of its parents */ ZEND_FUNCTION(is_a) { - zend_error(E_STRICT, "is_a(): Deprecated. Please use the instanceof operator"); + zend_error(E_DEPRECATED, "is_a(): Deprecated. Please use the instanceof operator"); is_a_impl(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0); } /* }}} */ http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_compile.c?r1=1.647.2.27.2.41.2.43&r2=1.647.2.27.2.41.2.44&diff_format=u Index: ZendEngine2/zend_compile.c diff -u ZendEngine2/zend_compile.c:1.647.2.27.2.41.2.43 ZendEngine2/zend_compile.c:1.647.2.27.2.41.2.44 --- ZendEngine2/zend_compile.c:1.647.2.27.2.41.2.43 Wed Feb 20 12:05:56 2008 +++ ZendEngine2/zend_compile.c Sat Feb 23 17:06:19 2008 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_compile.c,v 1.647.2.27.2.41.2.43 2008/02/20 12:05:56 dmitry Exp $ */ +/* $Id: zend_compile.c,v 1.647.2.27.2.41.2.44 2008/02/23 17:06:19 helly Exp $ */ #include <zend_language_parser.h> #include "zend.h" @@ -477,7 +477,7 @@ void fetch_string_offset(znode *result, znode *parent, znode *offset TSRMLS_DC) { #ifdef ilia_0 - zend_error(E_STRICT, "Usage of {} to access string offsets is deprecated and will be removed in PHP 6"); + zend_error(E_DEPRECATED, "Usage of {} to access string offsets is deprecated and will be removed in PHP 6"); #endif fetch_array_dim(result, parent, offset TSRMLS_CC); } @@ -1853,7 +1853,7 @@ if (original_op==ZEND_SEND_REF && !CG(allow_call_time_pass_reference)) { - zend_error(E_COMPILE_WARNING, + zend_error(E_DEPRECATED, "Call-time pass-by-reference has been deprecated; " "If you would like to pass it by reference, modify the declaration of %s(). " "If you would like to enable call-time pass-by-reference, you can set " http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_constants.c?r1=1.71.2.5.2.7.2.8&r2=1.71.2.5.2.7.2.9&diff_format=u Index: ZendEngine2/zend_constants.c diff -u ZendEngine2/zend_constants.c:1.71.2.5.2.7.2.8 ZendEngine2/zend_constants.c:1.71.2.5.2.7.2.9 --- ZendEngine2/zend_constants.c:1.71.2.5.2.7.2.8 Tue Feb 19 12:00:53 2008 +++ ZendEngine2/zend_constants.c Sat Feb 23 17:06:19 2008 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_constants.c,v 1.71.2.5.2.7.2.8 2008/02/19 12:00:53 dmitry Exp $ */ +/* $Id: zend_constants.c,v 1.71.2.5.2.7.2.9 2008/02/23 17:06:19 helly Exp $ */ #include "zend.h" #include "zend_constants.h" @@ -101,6 +101,7 @@ REGISTER_MAIN_LONG_CONSTANT("E_PARSE", E_PARSE, CONST_PERSISTENT | CONST_CS); REGISTER_MAIN_LONG_CONSTANT("E_NOTICE", E_NOTICE, CONST_PERSISTENT | CONST_CS); REGISTER_MAIN_LONG_CONSTANT("E_STRICT", E_STRICT, CONST_PERSISTENT | CONST_CS); + REGISTER_MAIN_LONG_CONSTANT("E_DEPRECATED", E_DEPRECATED, CONST_PERSISTENT | CONST_CS); REGISTER_MAIN_LONG_CONSTANT("E_CORE_ERROR", E_CORE_ERROR, CONST_PERSISTENT | CONST_CS); REGISTER_MAIN_LONG_CONSTANT("E_CORE_WARNING", E_CORE_WARNING, CONST_PERSISTENT | CONST_CS); REGISTER_MAIN_LONG_CONSTANT("E_COMPILE_ERROR", E_COMPILE_ERROR, CONST_PERSISTENT | CONST_CS); http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_errors.h?r1=1.18.2.1.2.5.2.1&r2=1.18.2.1.2.5.2.2&diff_format=u Index: ZendEngine2/zend_errors.h diff -u ZendEngine2/zend_errors.h:1.18.2.1.2.5.2.1 ZendEngine2/zend_errors.h:1.18.2.1.2.5.2.2 --- ZendEngine2/zend_errors.h:1.18.2.1.2.5.2.1 Mon Dec 31 07:17:04 2007 +++ ZendEngine2/zend_errors.h Sat Feb 23 17:06:19 2008 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_errors.h,v 1.18.2.1.2.5.2.1 2007/12/31 07:17:04 sebastian Exp $ */ +/* $Id: zend_errors.h,v 1.18.2.1.2.5.2.2 2008/02/23 17:06:19 helly Exp $ */ #ifndef ZEND_ERRORS_H #define ZEND_ERRORS_H @@ -35,8 +35,9 @@ #define E_USER_NOTICE (1<<10L) #define E_STRICT (1<<11L) #define E_RECOVERABLE_ERROR (1<<12L) +#define E_DEPRECATED (1<<13L) -#define E_ALL (E_ERROR | E_WARNING | E_PARSE | E_NOTICE | E_CORE_ERROR | E_CORE_WARNING | E_COMPILE_ERROR | E_COMPILE_WARNING | E_USER_ERROR | E_USER_WARNING | E_USER_NOTICE | E_RECOVERABLE_ERROR) +#define E_ALL (E_ERROR | E_WARNING | E_PARSE | E_NOTICE | E_CORE_ERROR | E_CORE_WARNING | E_COMPILE_ERROR | E_COMPILE_WARNING | E_USER_ERROR | E_USER_WARNING | E_USER_NOTICE | E_RECOVERABLE_ERROR | E_DEPRECATED) #define E_CORE (E_CORE_ERROR | E_CORE_WARNING) #endif /* ZEND_ERRORS_H */ http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_execute_API.c?r1=1.331.2.20.2.24.2.25&r2=1.331.2.20.2.24.2.26&diff_format=u Index: ZendEngine2/zend_execute_API.c diff -u ZendEngine2/zend_execute_API.c:1.331.2.20.2.24.2.25 ZendEngine2/zend_execute_API.c:1.331.2.20.2.24.2.26 --- ZendEngine2/zend_execute_API.c:1.331.2.20.2.24.2.25 Sat Feb 2 15:48:04 2008 +++ ZendEngine2/zend_execute_API.c Sat Feb 23 17:06:19 2008 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_execute_API.c,v 1.331.2.20.2.24.2.25 2008/02/02 15:48:04 helly Exp $ */ +/* $Id: zend_execute_API.c,v 1.331.2.20.2.24.2.26 2008/02/23 17:06:19 helly Exp $ */ #include <stdio.h> #include <signal.h> @@ -937,7 +937,7 @@ zend_error_noreturn(E_ERROR, "Cannot call abstract method %s::%s()", EX(function_state).function->common.scope->name, EX(function_state).function->common.function_name); } if (EX(function_state).function->common.fn_flags & ZEND_ACC_DEPRECATED) { - zend_error(E_STRICT, "Function %s%s%s() is deprecated", + zend_error(E_DEPRECATED, "Function %v%s%v() is deprecated", EX(function_state).function->common.scope ? EX(function_state).function->common.scope->name : "", EX(function_state).function->common.scope ? "::" : "", EX(function_state).function->common.function_name); http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_language_parser.y?r1=1.160.2.4.2.8.2.17&r2=1.160.2.4.2.8.2.18&diff_format=u Index: ZendEngine2/zend_language_parser.y diff -u ZendEngine2/zend_language_parser.y:1.160.2.4.2.8.2.17 ZendEngine2/zend_language_parser.y:1.160.2.4.2.8.2.18 --- ZendEngine2/zend_language_parser.y:1.160.2.4.2.8.2.17 Tue Feb 12 09:27:45 2008 +++ ZendEngine2/zend_language_parser.y Sat Feb 23 17:06:19 2008 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_language_parser.y,v 1.160.2.4.2.8.2.17 2008/02/12 09:27:45 dmitry Exp $ */ +/* $Id: zend_language_parser.y,v 1.160.2.4.2.8.2.18 2008/02/23 17:06:19 helly Exp $ */ /* * LALR shift/reduce conflicts and how they are resolved: @@ -565,7 +565,7 @@ T_LIST '(' { zend_do_list_init(TSRMLS_C); } assignment_list ')' '=' expr { zend_do_list_end(&$$, &$7 TSRMLS_CC); } | variable '=' expr { zend_check_writable_variable(&$1); zend_do_assign(&$$, &$1, &$3 TSRMLS_CC); } | variable '=' '&' variable { zend_check_writable_variable(&$1); zend_do_end_variable_parse(BP_VAR_W, 1 TSRMLS_CC); zend_do_end_variable_parse(BP_VAR_W, 0 TSRMLS_CC); zend_do_assign_ref(&$$, &$1, &$4 TSRMLS_CC); } - | variable '=' '&' T_NEW class_name_reference { zend_error(E_STRICT, "Assigning the return value of new by reference is deprecated"); zend_check_writable_variable(&$1); zend_do_extended_fcall_begin(TSRMLS_C); zend_do_begin_new_object(&$4, &$5 TSRMLS_CC); } ctor_arguments { zend_do_end_new_object(&$3, &$4, &$7 TSRMLS_CC); zend_do_extended_fcall_end(TSRMLS_C); zend_do_end_variable_parse(BP_VAR_W, 0 TSRMLS_CC); zend_do_assign_ref(&$$, &$1, &$3 TSRMLS_CC); } + | variable '=' '&' T_NEW class_name_reference { zend_error(E_DEPRECATED, "Assigning the return value of new by reference is deprecated"); zend_check_writable_variable(&$1); zend_do_extended_fcall_begin(TSRMLS_C); zend_do_begin_new_object(&$4, &$5 TSRMLS_CC); } ctor_arguments { zend_do_end_new_object(&$3, &$4, &$7 TSRMLS_CC); zend_do_extended_fcall_end(TSRMLS_C); zend_do_end_variable_parse(BP_VAR_W, 0 TSRMLS_CC); zend_do_assign_ref(&$$, &$1, &$3 TSRMLS_CC); } | T_NEW class_name_reference { zend_do_extended_fcall_begin(TSRMLS_C); zend_do_begin_new_object(&$1, &$2 TSRMLS_CC); } ctor_arguments { zend_do_end_new_object(&$$, &$1, &$4 TSRMLS_CC); zend_do_extended_fcall_end(TSRMLS_C);} | T_CLONE expr { zend_do_clone(&$$, &$2 TSRMLS_CC); } | variable T_PLUS_EQUAL expr { zend_check_writable_variable(&$1); zend_do_end_variable_parse(BP_VAR_RW, 0 TSRMLS_CC); zend_do_binary_assign_op(ZEND_ASSIGN_ADD, &$$, &$1, &$3 TSRMLS_CC); } http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_vm_def.h?r1=1.59.2.29.2.48.2.37&r2=1.59.2.29.2.48.2.38&diff_format=u Index: ZendEngine2/zend_vm_def.h diff -u ZendEngine2/zend_vm_def.h:1.59.2.29.2.48.2.37 ZendEngine2/zend_vm_def.h:1.59.2.29.2.48.2.38 --- ZendEngine2/zend_vm_def.h:1.59.2.29.2.48.2.37 Wed Feb 20 12:05:56 2008 +++ ZendEngine2/zend_vm_def.h Sat Feb 23 17:06:20 2008 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_vm_def.h,v 1.59.2.29.2.48.2.37 2008/02/20 12:05:56 dmitry Exp $ */ +/* $Id: zend_vm_def.h,v 1.59.2.29.2.48.2.38 2008/02/23 17:06:20 helly Exp $ */ /* If you change this file, please regenerate the zend_vm_execute.h and * zend_vm_opcodes.h files by running: @@ -2067,7 +2067,7 @@ ZEND_VM_NEXT_OPCODE(); /* Never reached */ } if (EX(function_state).function->common.fn_flags & ZEND_ACC_DEPRECATED) { - zend_error(E_STRICT, "Function %s%s%s() is deprecated", + zend_error(E_DEPRECATED, "Function %s%s%s() is deprecated", EX(function_state).function->common.scope ? EX(function_state).function->common.scope->name : "", EX(function_state).function->common.scope ? "::" : "", EX(function_state).function->common.function_name); http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_vm_execute.h?r1=1.62.2.30.2.49.2.36&r2=1.62.2.30.2.49.2.37&diff_format=u Index: ZendEngine2/zend_vm_execute.h diff -u ZendEngine2/zend_vm_execute.h:1.62.2.30.2.49.2.36 ZendEngine2/zend_vm_execute.h:1.62.2.30.2.49.2.37 --- ZendEngine2/zend_vm_execute.h:1.62.2.30.2.49.2.36 Wed Feb 20 12:05:56 2008 +++ ZendEngine2/zend_vm_execute.h Sat Feb 23 17:06:20 2008 @@ -133,7 +133,7 @@ ZEND_VM_NEXT_OPCODE(); /* Never reached */ } if (EX(function_state).function->common.fn_flags & ZEND_ACC_DEPRECATED) { - zend_error(E_STRICT, "Function %s%s%s() is deprecated", + zend_error(E_DEPRECATED, "Function %s%s%s() is deprecated", EX(function_state).function->common.scope ? EX(function_state).function->common.scope->name : "", EX(function_state).function->common.scope ? "::" : "", EX(function_state).function->common.function_name); http://cvs.php.net/viewvc.cgi/ZendEngine2/tests/bug33771.phpt?r1=1.1.2.2.2.2&r2=1.1.2.2.2.2.2.1&diff_format=u Index: ZendEngine2/tests/bug33771.phpt diff -u ZendEngine2/tests/bug33771.phpt:1.1.2.2.2.2 ZendEngine2/tests/bug33771.phpt:1.1.2.2.2.2.2.1 --- ZendEngine2/tests/bug33771.phpt:1.1.2.2.2.2 Wed May 10 22:57:50 2006 +++ ZendEngine2/tests/bug33771.phpt Sat Feb 23 17:06:21 2008 @@ -34,7 +34,7 @@ echo "Done\n"; ?> --EXPECTF-- -int(8191) -int(8191) -int(6143) +int(16383) +int(16383) +int(14335) Done http://cvs.php.net/viewvc.cgi/ZendEngine2/tests/bug34767.phpt?r1=1.1.2.1.2.2&r2=1.1.2.1.2.2.2.1&diff_format=u Index: ZendEngine2/tests/bug34767.phpt diff -u ZendEngine2/tests/bug34767.phpt:1.1.2.1.2.2 ZendEngine2/tests/bug34767.phpt:1.1.2.1.2.2.2.1 --- ZendEngine2/tests/bug34767.phpt:1.1.2.1.2.2 Mon Jun 5 13:58:52 2006 +++ ZendEngine2/tests/bug34767.phpt Sat Feb 23 17:06:21 2008 @@ -2,7 +2,7 @@ Bug #34767 (Zend Engine 1 Compatibility not copying objects correctly) --INI-- zend.ze1_compatibility_mode=1 -error_reporting=4095 +error_reporting=E_ALL | E_DEPRECATED | E_STRICT --FILE-- <?php $a->y = &new stdClass(); @@ -13,7 +13,7 @@ ?> --EXPECTF-- -Strict Standards: Assigning the return value of new by reference is deprecated in %sbug34767.php on line 2 +Deprecated: Assigning the return value of new by reference is deprecated in %sbug34767.php on line 2 stdClass Object ( [y] => stdClass Object http://cvs.php.net/viewvc.cgi/ZendEngine2/tests/error_reporting01.phpt?r1=1.1.2.1.2.2&r2=1.1.2.1.2.2.2.1&diff_format=u Index: ZendEngine2/tests/error_reporting01.phpt diff -u ZendEngine2/tests/error_reporting01.phpt:1.1.2.1.2.2 ZendEngine2/tests/error_reporting01.phpt:1.1.2.1.2.2.2.1 --- ZendEngine2/tests/error_reporting01.phpt:1.1.2.1.2.2 Wed May 17 20:13:05 2006 +++ ZendEngine2/tests/error_reporting01.phpt Sat Feb 23 17:06:21 2008 @@ -22,5 +22,5 @@ echo "Done\n"; ?> --EXPECT-- -int(6143) +int(14335) Done http://cvs.php.net/viewvc.cgi/ZendEngine2/tests/error_reporting02.phpt?r1=1.1.2.1.2.1&r2=1.1.2.1.2.1.2.1&diff_format=u Index: ZendEngine2/tests/error_reporting02.phpt diff -u ZendEngine2/tests/error_reporting02.phpt:1.1.2.1.2.1 ZendEngine2/tests/error_reporting02.phpt:1.1.2.1.2.1.2.1 --- ZendEngine2/tests/error_reporting02.phpt:1.1.2.1.2.1 Wed May 10 14:04:52 2006 +++ ZendEngine2/tests/error_reporting02.phpt Sat Feb 23 17:06:21 2008 @@ -23,5 +23,5 @@ echo "Done\n"; ?> --EXPECT-- -int(8191) +int(16383) Done http://cvs.php.net/viewvc.cgi/ZendEngine2/tests/error_reporting03.phpt?r1=1.1.2.1.2.1&r2=1.1.2.1.2.1.2.1&diff_format=u Index: ZendEngine2/tests/error_reporting03.phpt diff -u ZendEngine2/tests/error_reporting03.phpt:1.1.2.1.2.1 ZendEngine2/tests/error_reporting03.phpt:1.1.2.1.2.1.2.1 --- ZendEngine2/tests/error_reporting03.phpt:1.1.2.1.2.1 Wed May 10 14:04:52 2006 +++ ZendEngine2/tests/error_reporting03.phpt Sat Feb 23 17:06:21 2008 @@ -31,5 +31,5 @@ ?> --EXPECTF-- Notice: Undefined variable: undef2 in %s on line %d -int(8191) +int(16383) Done http://cvs.php.net/viewvc.cgi/ZendEngine2/tests/error_reporting04.phpt?r1=1.1.2.1.2.1&r2=1.1.2.1.2.1.2.1&diff_format=u Index: ZendEngine2/tests/error_reporting04.phpt diff -u ZendEngine2/tests/error_reporting04.phpt:1.1.2.1.2.1 ZendEngine2/tests/error_reporting04.phpt:1.1.2.1.2.1.2.1 --- ZendEngine2/tests/error_reporting04.phpt:1.1.2.1.2.1 Wed May 10 14:04:52 2006 +++ ZendEngine2/tests/error_reporting04.phpt Sat Feb 23 17:06:21 2008 @@ -19,5 +19,5 @@ ?> --EXPECTF-- Notice: Undefined variable: undef in %s on line %d -int(8191) +int(16383) Done http://cvs.php.net/viewvc.cgi/ZendEngine2/tests/error_reporting05.phpt?r1=1.1.2.1.2.2&r2=1.1.2.1.2.2.2.1&diff_format=u Index: ZendEngine2/tests/error_reporting05.phpt diff -u ZendEngine2/tests/error_reporting05.phpt:1.1.2.1.2.2 ZendEngine2/tests/error_reporting05.phpt:1.1.2.1.2.2.2.1 --- ZendEngine2/tests/error_reporting05.phpt:1.1.2.1.2.2 Wed May 17 20:13:05 2006 +++ ZendEngine2/tests/error_reporting05.phpt Sat Feb 23 17:06:21 2008 @@ -30,5 +30,5 @@ Notice: Undefined variable: undef_value in %s on line %d Notice: Undefined variable: undef_name in %s on line %d -int(6143) +int(14335) Done http://cvs.php.net/viewvc.cgi/ZendEngine2/tests/error_reporting06.phpt?r1=1.1.2.1.2.2&r2=1.1.2.1.2.2.2.1&diff_format=u Index: ZendEngine2/tests/error_reporting06.phpt diff -u ZendEngine2/tests/error_reporting06.phpt:1.1.2.1.2.2 ZendEngine2/tests/error_reporting06.phpt:1.1.2.1.2.2.2.1 --- ZendEngine2/tests/error_reporting06.phpt:1.1.2.1.2.2 Wed May 17 20:13:05 2006 +++ ZendEngine2/tests/error_reporting06.phpt Sat Feb 23 17:06:21 2008 @@ -26,5 +26,5 @@ echo "Done\n"; ?> --EXPECTF-- -int(6143) +int(14335) Done http://cvs.php.net/viewvc.cgi/ZendEngine2/tests/error_reporting07.phpt?r1=1.1.2.1.2.2&r2=1.1.2.1.2.2.2.1&diff_format=u Index: ZendEngine2/tests/error_reporting07.phpt diff -u ZendEngine2/tests/error_reporting07.phpt:1.1.2.1.2.2 ZendEngine2/tests/error_reporting07.phpt:1.1.2.1.2.2.2.1 --- ZendEngine2/tests/error_reporting07.phpt:1.1.2.1.2.2 Wed May 17 20:13:05 2006 +++ ZendEngine2/tests/error_reporting07.phpt Sat Feb 23 17:06:21 2008 @@ -26,5 +26,5 @@ echo "Done\n"; ?> --EXPECTF-- -int(6143) +int(14335) Done http://cvs.php.net/viewvc.cgi/ZendEngine2/tests/error_reporting08.phpt?r1=1.1.2.1.2.1&r2=1.1.2.1.2.1.2.1&diff_format=u Index: ZendEngine2/tests/error_reporting08.phpt diff -u ZendEngine2/tests/error_reporting08.phpt:1.1.2.1.2.1 ZendEngine2/tests/error_reporting08.phpt:1.1.2.1.2.1.2.1 --- ZendEngine2/tests/error_reporting08.phpt:1.1.2.1.2.1 Wed May 10 14:04:52 2006 +++ ZendEngine2/tests/error_reporting08.phpt Sat Feb 23 17:06:21 2008 @@ -28,5 +28,5 @@ ?> --EXPECTF-- Notice: Undefined variable: undef3 in %s on line %d -int(8191) +int(16383) Done http://cvs.php.net/viewvc.cgi/ZendEngine2/tests/error_reporting09.phpt?r1=1.1.2.1.2.1&r2=1.1.2.1.2.1.2.1&diff_format=u Index: ZendEngine2/tests/error_reporting09.phpt diff -u ZendEngine2/tests/error_reporting09.phpt:1.1.2.1.2.1 ZendEngine2/tests/error_reporting09.phpt:1.1.2.1.2.1.2.1 --- ZendEngine2/tests/error_reporting09.phpt:1.1.2.1.2.1 Wed May 10 14:04:52 2006 +++ ZendEngine2/tests/error_reporting09.phpt Sat Feb 23 17:06:21 2008 @@ -27,5 +27,5 @@ Notice: Undefined variable: blah in %s on line %d Notice: Undefined variable: undef2 in %s on line %d -int(8191) +int(16383) Done http://cvs.php.net/viewvc.cgi/ZendEngine2/tests/error_reporting10.phpt?r1=1.1.2.2.2.2&r2=1.1.2.2.2.2.2.1&diff_format=u Index: ZendEngine2/tests/error_reporting10.phpt diff -u ZendEngine2/tests/error_reporting10.phpt:1.1.2.2.2.2 ZendEngine2/tests/error_reporting10.phpt:1.1.2.2.2.2.2.1 --- ZendEngine2/tests/error_reporting10.phpt:1.1.2.2.2.2 Wed May 17 20:13:05 2006 +++ ZendEngine2/tests/error_reporting10.phpt Sat Feb 23 17:06:21 2008 @@ -30,6 +30,6 @@ echo "Done\n"; ?> --EXPECTF-- -int(6143) -int(6135) +int(14335) +int(14327) Done http://cvs.php.net/viewvc.cgi/ZendEngine2/tests/is_a.phpt?r1=1.2.2.2.2.1&r2=1.2.2.2.2.1.2.1&diff_format=u Index: ZendEngine2/tests/is_a.phpt diff -u ZendEngine2/tests/is_a.phpt:1.2.2.2.2.1 ZendEngine2/tests/is_a.phpt:1.2.2.2.2.1.2.1 --- ZendEngine2/tests/is_a.phpt:1.2.2.2.2.1 Wed Aug 22 13:19:48 2007 +++ ZendEngine2/tests/is_a.phpt Sat Feb 23 17:06:21 2008 @@ -1,7 +1,7 @@ --TEST-- is_a() and is_subclass_of() shouldn't call __autoload --INI-- -error_reporting=4095 +error_reporting=14335 --FILE-- <?php function __autoload($name) { @@ -31,16 +31,16 @@ var_dump(is_subclass_of("X1", "X2")); ?> --EXPECTF-- -Strict Standards: is_a(): Deprecated. Please use the instanceof operator in %sis_a.php on line 17 +Deprecated: is_a(): Deprecated. Please use the instanceof operator in %sis_a.php on line 17 bool(false) -Strict Standards: is_a(): Deprecated. Please use the instanceof operator in %sis_a.php on line 18 +Deprecated: is_a(): Deprecated. Please use the instanceof operator in %sis_a.php on line 18 bool(true) -Strict Standards: is_a(): Deprecated. Please use the instanceof operator in %sis_a.php on line 19 +Deprecated: is_a(): Deprecated. Please use the instanceof operator in %sis_a.php on line 19 bool(true) -Strict Standards: is_a(): Deprecated. Please use the instanceof operator in %sis_a.php on line 20 +Deprecated: is_a(): Deprecated. Please use the instanceof operator in %sis_a.php on line 20 bool(true) bool(false) bool(false) http://cvs.php.net/viewvc.cgi/php-src/ext/date/php_date.c?r1=1.43.2.45.2.51.2.19&r2=1.43.2.45.2.51.2.20&diff_format=u Index: php-src/ext/date/php_date.c diff -u php-src/ext/date/php_date.c:1.43.2.45.2.51.2.19 php-src/ext/date/php_date.c:1.43.2.45.2.51.2.20 --- php-src/ext/date/php_date.c:1.43.2.45.2.51.2.19 Wed Feb 13 21:53:12 2008 +++ php-src/ext/date/php_date.c Sat Feb 23 17:06:21 2008 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_date.c,v 1.43.2.45.2.51.2.19 2008/02/13 21:53:12 derick Exp $ */ +/* $Id: php_date.c,v 1.43.2.45.2.51.2.20 2008/02/23 17:06:21 helly Exp $ */ #include "php.h" #include "php_streams.h" @@ -1241,7 +1241,7 @@ } /* Support for the deprecated is_dst parameter */ if (dst != -1) { - php_error_docref(NULL TSRMLS_CC, E_STRICT, "The is_dst parameter is deprecated"); + php_error_docref(NULL TSRMLS_CC, E_DEPRECATED, "The is_dst parameter is deprecated"); if (gmt) { /* GMT never uses DST */ if (dst == 1) { http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/php_mysql.c?r1=1.213.2.6.2.16.2.10&r2=1.213.2.6.2.16.2.11&diff_format=u Index: php-src/ext/mysql/php_mysql.c diff -u php-src/ext/mysql/php_mysql.c:1.213.2.6.2.16.2.10 php-src/ext/mysql/php_mysql.c:1.213.2.6.2.16.2.11 --- php-src/ext/mysql/php_mysql.c:1.213.2.6.2.16.2.10 Tue Feb 12 20:43:42 2008 +++ php-src/ext/mysql/php_mysql.c Sat Feb 23 17:06:21 2008 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_mysql.c,v 1.213.2.6.2.16.2.10 2008/02/12 20:43:42 johannes Exp $ */ +/* $Id: php_mysql.c,v 1.213.2.6.2.16.2.11 2008/02/23 17:06:21 helly Exp $ */ /* TODO: * @@ -1462,7 +1462,7 @@ } if (MySG(trace_mode) || !strcasecmp(get_active_function_name(TSRMLS_C), "mysql")) { - php_error_docref(NULL TSRMLS_CC, E_NOTICE, "This function is deprecated; use mysql_query() instead."); + php_error_docref(NULL TSRMLS_CC, E_DEPRECATED, "This function is deprecated; use mysql_query() instead."); } php_mysql_do_query_general(query, mysql_link, id, db, MYSQL_STORE_RESULT, return_value TSRMLS_CC); @@ -1762,7 +1762,7 @@ Z_TYPE_P(return_value) = IS_STRING; if (MySG(trace_mode)){ - php_error_docref("function.mysql-real-escape-string" TSRMLS_CC, E_WARNING, "This function is deprecated; use mysql_real_escape_string() instead."); + php_error_docref("function.mysql-real-escape-string" TSRMLS_CC, E_DEPRECATED, "This function is deprecated; use mysql_real_escape_string() instead."); } } /* }}} */ http://cvs.php.net/viewvc.cgi/php-src/ext/standard/basic_functions.c?r1=1.725.2.31.2.64.2.19&r2=1.725.2.31.2.64.2.20&diff_format=u Index: php-src/ext/standard/basic_functions.c diff -u php-src/ext/standard/basic_functions.c:1.725.2.31.2.64.2.19 php-src/ext/standard/basic_functions.c:1.725.2.31.2.64.2.20 --- php-src/ext/standard/basic_functions.c:1.725.2.31.2.64.2.19 Sun Feb 3 14:44:59 2008 +++ php-src/ext/standard/basic_functions.c Sat Feb 23 17:06:21 2008 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: basic_functions.c,v 1.725.2.31.2.64.2.19 2008/02/03 14:44:59 helly Exp $ */ +/* $Id: basic_functions.c,v 1.725.2.31.2.64.2.20 2008/02/23 17:06:21 helly Exp $ */ #include "php.h" #include "php_streams.h" @@ -4934,6 +4934,9 @@ if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &new_setting) == FAILURE) { RETURN_FALSE; } + + php_error_docref(NULL TSRMLS_CC, E_DEPRECATED, "This function is deprecated and removed in PHP 6. See http://php.net/{migrate}#set_magic_quotes_runtime for details."); + convert_to_boolean_ex(new_setting); PG(magic_quotes_runtime) = (zend_bool) Z_LVAL_PP(new_setting); @@ -4945,6 +4948,7 @@ Get the current active configuration setting of magic_quotes_runtime */ PHP_FUNCTION(get_magic_quotes_runtime) { + php_error_docref(NULL TSRMLS_CC, E_DEPRECATED, "This function is deprecated and removed in PHP 6. See http://php.net/{migrate}#get_magic_quotes_runtime for details."); RETURN_LONG(PG(magic_quotes_runtime)); } /* }}} */ @@ -4953,6 +4957,7 @@ Get the current active configuration setting of magic_quotes_gpc */ PHP_FUNCTION(get_magic_quotes_gpc) { + php_error_docref(NULL TSRMLS_CC, E_DEPRECATED, "This function is deprecated and removed in PHP 6. See http://php.net/{migrate}#get_magic_quotes_gpc for details."); RETURN_LONG(PG(magic_quotes_gpc)); } /* }}} */ http://cvs.php.net/viewvc.cgi/php-src/ext/standard/dl.c?r1=1.106.2.1.2.5.2.4&r2=1.106.2.1.2.5.2.5&diff_format=u Index: php-src/ext/standard/dl.c diff -u php-src/ext/standard/dl.c:1.106.2.1.2.5.2.4 php-src/ext/standard/dl.c:1.106.2.1.2.5.2.5 --- php-src/ext/standard/dl.c:1.106.2.1.2.5.2.4 Mon Dec 31 07:17:14 2007 +++ php-src/ext/standard/dl.c Sat Feb 23 17:06:21 2008 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: dl.c,v 1.106.2.1.2.5.2.4 2007/12/31 07:17:14 sebastian Exp $ */ +/* $Id: dl.c,v 1.106.2.1.2.5.2.5 2008/02/23 17:06:21 helly Exp $ */ #include "php.h" #include "dl.h" @@ -80,7 +80,7 @@ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Not supported in multithreaded Web servers - use extension=%s in your php.ini", Z_STRVAL_P(filename)); RETURN_FALSE; #else - php_error_docref(NULL TSRMLS_CC, E_STRICT, "dl() is deprecated - use extension=%s in your php.ini", Z_STRVAL_P(filename)); + php_error_docref(NULL TSRMLS_CC, E_DEPRECATED, "dl() is deprecated - use extension=%s in your php.ini", Z_STRVAL_P(filename)); #endif } @@ -97,6 +97,8 @@ #define USING_ZTS 0 #endif +/* {{{ php_dl + */ PHPAPI int php_load_extension(char *filename, int type, int start_now TSRMLS_DC) /* {{{ */ { void *handle; http://cvs.php.net/viewvc.cgi/php-src/ext/standard/file.c?r1=1.409.2.6.2.28.2.7&r2=1.409.2.6.2.28.2.8&diff_format=u Index: php-src/ext/standard/file.c diff -u php-src/ext/standard/file.c:1.409.2.6.2.28.2.7 php-src/ext/standard/file.c:1.409.2.6.2.28.2.8 --- php-src/ext/standard/file.c:1.409.2.6.2.28.2.7 Mon Dec 31 07:17:14 2007 +++ php-src/ext/standard/file.c Sat Feb 23 17:06:21 2008 @@ -21,7 +21,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: file.c,v 1.409.2.6.2.28.2.7 2007/12/31 07:17:14 sebastian Exp $ */ +/* $Id: file.c,v 1.409.2.6.2.28.2.8 2008/02/23 17:06:21 helly Exp $ */ /* Synced with php 3.0 revision 1.218 1999-06-16 [ssb] */ @@ -1382,6 +1382,8 @@ { int ret; + php_error_docref(NULL TSRMLS_CC, E_DEPRECATED, "This function is deprecated; use php_stream_mkdir() instead."); + if (PG(safe_mode) && (!php_checkuid(dir, NULL, CHECKUID_CHECK_FILE_AND_DIR))) { return -1; } http://cvs.php.net/viewvc.cgi/php-src/ext/standard/string.c?r1=1.445.2.14.2.69.2.17&r2=1.445.2.14.2.69.2.18&diff_format=u Index: php-src/ext/standard/string.c diff -u php-src/ext/standard/string.c:1.445.2.14.2.69.2.17 php-src/ext/standard/string.c:1.445.2.14.2.69.2.18 --- php-src/ext/standard/string.c:1.445.2.14.2.69.2.17 Wed Feb 13 17:02:15 2008 +++ php-src/ext/standard/string.c Sat Feb 23 17:06:21 2008 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: string.c,v 1.445.2.14.2.69.2.17 2008/02/13 17:02:15 colder Exp $ */ +/* $Id: string.c,v 1.445.2.14.2.69.2.18 2008/02/23 17:06:21 helly Exp $ */ /* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */ @@ -4071,7 +4071,7 @@ cat = Z_LVAL_PP(pcategory); } else { /* FIXME: The following behaviour should be removed. */ char *category; - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Passing locale category name as string is deprecated. Use the LC_* -constants instead"); + php_error_docref(NULL TSRMLS_CC, E_DEPRECATED, "Passing locale category name as string is deprecated. Use the LC_* -constants instead"); convert_to_string_ex(pcategory); category = Z_STRVAL_P(*pcategory); http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/magic_quotes.phpt?r1=1.1.2.1&r2=1.1.2.1.2.1&diff_format=u Index: php-src/ext/standard/tests/file/magic_quotes.phpt diff -u php-src/ext/standard/tests/file/magic_quotes.phpt:1.1.2.1 php-src/ext/standard/tests/file/magic_quotes.phpt:1.1.2.1.2.1 --- php-src/ext/standard/tests/file/magic_quotes.phpt:1.1.2.1 Thu Nov 16 13:01:23 2006 +++ php-src/ext/standard/tests/file/magic_quotes.phpt Sat Feb 23 17:06:22 2008 @@ -1,5 +1,7 @@ --TEST-- various magic quotes tests +--INI-- +error_reporting=14335 --FILE-- <?php @@ -41,21 +43,45 @@ echo "Done\n"; ?> --EXPECTF-- + +Deprecated: get_magic_quotes_runtime(): This function is deprecated and will be removed in PHP 6. See http://php.net/%s#get_magic_quotes_runtime for details. in %s on line %d int(0) + +Deprecated: get_magic_quotes_runtime(): This function is deprecated and will be removed in PHP 6. See http://php.net/%s#get_magic_quotes_runtime for details. in %s on line %d int(0) + +Deprecated: set_magic_quotes_runtime(): This function is deprecated and will be removed in PHP 6. See http://php.net/%s#set_magic_quotes_runtime for details. in %s on line %d bool(true) + +Deprecated: get_magic_quotes_runtime(): This function is deprecated and will be removed in PHP 6. See http://php.net/%s#get_magic_quotes_runtime for details. in %s on line %d int(1) + +Deprecated: set_magic_quotes_runtime(): This function is deprecated and will be removed in PHP 6. See http://php.net/%s#set_magic_quotes_runtime for details. in %s on line %d bool(true) + +Deprecated: get_magic_quotes_runtime(): This function is deprecated and will be removed in PHP 6. See http://php.net/%s#get_magic_quotes_runtime for details. in %s on line %d int(1) string(30) "some\'content\'here\"and}there" + +Deprecated: set_magic_quotes_runtime(): This function is deprecated and will be removed in PHP 6. See http://php.net/%s#set_magic_quotes_runtime for details. in %s on line %d bool(true) + +Deprecated: get_magic_quotes_runtime(): This function is deprecated and will be removed in PHP 6. See http://php.net/%s#get_magic_quotes_runtime for details. in %s on line %d int(0) string(27) "some'content'here"and}there" + +Deprecated: set_magic_quotes_runtime(): This function is deprecated and will be removed in PHP 6. See http://php.net/%s#set_magic_quotes_runtime for details. in %s on line %d bool(true) + +Deprecated: get_magic_quotes_runtime(): This function is deprecated and will be removed in PHP 6. See http://php.net/%s#get_magic_quotes_runtime for details. in %s on line %d int(1) string(30) "some\'content\'here\"and}there" + +Deprecated: set_magic_quotes_runtime(): This function is deprecated and will be removed in PHP 6. See http://php.net/%s#set_magic_quotes_runtime for details. in %s on line %d bool(true) bool(false) + +Deprecated: get_magic_quotes_runtime(): This function is deprecated and will be removed in PHP 6. See http://php.net/%s#get_magic_quotes_runtime for details. in %s on line %d int(0) string(27) "some'content'here"and}there" Done http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/serialize/bug31402.phpt?r1=1.3&r2=1.3.6.1&diff_format=u Index: php-src/ext/standard/tests/serialize/bug31402.phpt diff -u php-src/ext/standard/tests/serialize/bug31402.phpt:1.3 php-src/ext/standard/tests/serialize/bug31402.phpt:1.3.6.1 --- php-src/ext/standard/tests/serialize/bug31402.phpt:1.3 Fri Mar 11 00:22:28 2005 +++ php-src/ext/standard/tests/serialize/bug31402.phpt Sat Feb 23 17:06:22 2008 @@ -1,7 +1,7 @@ --TEST-- Bug #31402 (unserialize() generates references when it should not) --INI-- -error_reporting=E_ALL&~E_STRICT +error_reporting=E_ALL&~E_STRICT&~E_DEPRECATED --FILE-- <?php http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/setlocale_error.phpt?r1=1.1.4.2&r2=1.1.4.3&diff_format=u Index: php-src/ext/standard/tests/strings/setlocale_error.phpt diff -u php-src/ext/standard/tests/strings/setlocale_error.phpt:1.1.4.2 php-src/ext/standard/tests/strings/setlocale_error.phpt:1.1.4.3 --- php-src/ext/standard/tests/strings/setlocale_error.phpt:1.1.4.2 Fri Oct 5 19:32:28 2007 +++ php-src/ext/standard/tests/strings/setlocale_error.phpt Sat Feb 23 17:06:22 2008 @@ -1,5 +1,7 @@ --TEST-- Test setlocale() function : error condition +--INI-- +error_reporting=14335 --SKIPIF-- <?php if (substr(PHP_OS, 0, 3) == 'WIN') { @@ -60,7 +62,7 @@ -- Testing setlocale() function with invalid category -- -Warning: setlocale(): Passing locale category name as string is deprecated. Use the LC_* -constants instead in %s on line %d +Deprecated: setlocale(): Passing locale category name as string is deprecated. Use the LC_* -constants instead in %s on line %d Warning: setlocale(): Invalid locale category name TEST, must be one of LC_ALL, LC_COLLATE, LC_CTYPE, LC_MONETARY, LC_NUMERIC, or LC_TIME in %s on line %d bool(false) http://cvs.php.net/viewvc.cgi/php-src/main/main.c?r1=1.640.2.23.2.57.2.9&r2=1.640.2.23.2.57.2.10&diff_format=u Index: php-src/main/main.c diff -u php-src/main/main.c:1.640.2.23.2.57.2.9 php-src/main/main.c:1.640.2.23.2.57.2.10 --- php-src/main/main.c:1.640.2.23.2.57.2.9 Fri Feb 15 14:51:39 2008 +++ php-src/main/main.c Sat Feb 23 17:06:22 2008 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: main.c,v 1.640.2.23.2.57.2.9 2008/02/15 14:51:39 pajoye Exp $ */ +/* $Id: main.c,v 1.640.2.23.2.57.2.10 2008/02/23 17:06:22 helly Exp $ */ /* {{{ includes */ @@ -843,6 +843,7 @@ /* fatal errors are real errors and cannot be made exceptions */ break; case E_STRICT: + case E_DEPRECATED: /* for the sake of BC to old damaged code */ break; case E_NOTICE: @@ -892,6 +893,9 @@ case E_STRICT: error_type_str = "Strict Standards"; break; + case E_DEPRECATED: + error_type_str = "Deprecated"; + break; default: error_type_str = "Unknown error"; break; http://cvs.php.net/viewvc.cgi/php-src/tests/classes/new_001.phpt?r1=1.1.4.2&r2=1.1.4.3&diff_format=u Index: php-src/tests/classes/new_001.phpt diff -u php-src/tests/classes/new_001.phpt:1.1.4.2 php-src/tests/classes/new_001.phpt:1.1.4.3 --- php-src/tests/classes/new_001.phpt:1.1.4.2 Wed Jan 30 14:25:42 2008 +++ php-src/tests/classes/new_001.phpt Sat Feb 23 17:06:22 2008 @@ -1,5 +1,7 @@ --TEST-- Confirm difference between assigning new directly and by reference. +--INI-- +error_reporting=E_ALL | E_DEPRECATED --FILE-- <?php echo "Compile-time strict error message should precede this.\n"; @@ -27,7 +29,7 @@ var_dump($f); ?> --EXPECTF-- -Strict Standards: Assigning the return value of new by reference is deprecated in %s on line 23 +Deprecated: Assigning the return value of new by reference is deprecated in %s on line 23 Compile-time strict error message should precede this. $f initially points to the first object: object(Inc)#%d (1) { http://cvs.php.net/viewvc.cgi/php-src/tests/lang/bug20175.phpt?r1=1.8.4.1&r2=1.8.4.1.2.1&diff_format=u Index: php-src/tests/lang/bug20175.phpt diff -u php-src/tests/lang/bug20175.phpt:1.8.4.1 php-src/tests/lang/bug20175.phpt:1.8.4.1.2.1 --- php-src/tests/lang/bug20175.phpt:1.8.4.1 Thu Sep 13 19:30:19 2007 +++ php-src/tests/lang/bug20175.phpt Sat Feb 23 17:06:22 2008 @@ -3,7 +3,7 @@ --SKIPIF-- <?php if (version_compare(zend_version(),'2.0.0-dev','<')) die('skip ZE1 does not have static class members'); ?> --INI-- -error_reporting=4095 +error_reporting=E_ALL | E_STRICT | E_DEPRECATED --FILE-- <?php print zend_version()."\n"; @@ -139,7 +139,7 @@ print $oop_tester->oop_static()."\n"; ?> --EXPECTF-- -Strict Standards: Assigning the return value of new by reference is deprecated in %s.php on line %d +Deprecated: Assigning the return value of new by reference is deprecated in %s.php on line %d %s foo_static() foo_global() http://cvs.php.net/viewvc.cgi/php-src/tests/lang/bug22231.phpt?r1=1.5&r2=1.5.6.1&diff_format=u Index: php-src/tests/lang/bug22231.phpt diff -u php-src/tests/lang/bug22231.phpt:1.5 php-src/tests/lang/bug22231.phpt:1.5.6.1 --- php-src/tests/lang/bug22231.phpt:1.5 Fri Apr 29 01:18:41 2005 +++ php-src/tests/lang/bug22231.phpt Sat Feb 23 17:06:22 2008 @@ -1,7 +1,7 @@ --TEST-- Bug #22231 (segfault when returning a global variable by reference) --INI-- -error_reporting=4095 +error_reporting=E_ALL | E_DEPRECATED --FILE-- <?php class foo { @@ -27,7 +27,7 @@ var_dump($foo->fubar); ?> --EXPECTF-- -Strict Standards: Assigning the return value of new by reference is deprecated in %s on line %d +Deprecated: Assigning the return value of new by reference is deprecated in %s on line %d object(foo)#%d (1) { ["fubar"]=> string(5) "fubar" http://cvs.php.net/viewvc.cgi/php-src/tests/lang/bug22510.phpt?r1=1.8&r2=1.8.6.1&diff_format=u Index: php-src/tests/lang/bug22510.phpt diff -u php-src/tests/lang/bug22510.phpt:1.8 php-src/tests/lang/bug22510.phpt:1.8.6.1 --- php-src/tests/lang/bug22510.phpt:1.8 Tue Jul 12 11:20:05 2005 +++ php-src/tests/lang/bug22510.phpt Sat Feb 23 17:06:22 2008 @@ -1,7 +1,7 @@ --TEST-- Bug #22510 (segfault among complex references) --INI-- -error_reporting=4095 +error_reporting=E_ALL | E_DEPRECATED --FILE-- <?php class foo @@ -91,7 +91,7 @@ print "I'm alive!\n"; ?> --EXPECTF-- -Strict Standards: Assigning the return value of new by reference is deprecated in %s on line %d +Deprecated: Assigning the return value of new by reference is deprecated in %s on line %d ok1 bar::run1 foo::method1
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php