Index: run-tests.php =================================================================== RCS file: /repository/php-src/run-tests.php,v retrieving revision 1.361 diff -u -r1.361 run-tests.php --- run-tests.php 8 Jul 2008 18:18:49 -0000 1.361 +++ run-tests.php 18 Jul 2008 21:25:44 -0000 @@ -166,7 +166,7 @@ 'open_basedir=', 'disable_functions=', 'output_buffering=Off', - 'error_reporting=16383', + 'error_reporting=30719', 'display_errors=1', 'display_startup_errors=1', 'log_errors=0', Index: php.ini-dist =================================================================== RCS file: /repository/php-src/php.ini-dist,v retrieving revision 1.274 diff -u -r1.274 php.ini-dist --- php.ini-dist 7 Apr 2008 21:23:28 -0000 1.274 +++ php.ini-dist 18 Jul 2008 21:25:45 -0000 @@ -245,6 +245,7 @@ ; E_USER_NOTICE - user-generated notice message ; E_DEPRECATED - warn about code that will not work in future versions ; of PHP +; E_USER_DEPRECATED - user-generated deprecation warnings ; ; Examples: ; Index: php.ini-recommended =================================================================== RCS file: /repository/php-src/php.ini-recommended,v retrieving revision 1.224 diff -u -r1.224 php.ini-recommended --- php.ini-recommended 7 Apr 2008 21:23:28 -0000 1.224 +++ php.ini-recommended 18 Jul 2008 21:25:45 -0000 @@ -282,6 +282,7 @@ ; E_USER_NOTICE - user-generated notice message ; E_DEPRECATED - warn about code that will not work in future versions ; of PHP +; E_USER_DEPRECATED - user-generated deprecation warnings ; ; Examples: ; Index: main/main.c =================================================================== RCS file: /repository/php-src/main/main.c,v retrieving revision 1.771 diff -u -r1.771 main.c --- main/main.c 25 Jun 2008 12:18:51 -0000 1.771 +++ main/main.c 18 Jul 2008 21:25:46 -0000 @@ -944,6 +944,7 @@ break; case E_STRICT: case E_DEPRECATED: + case E_USER_DEPRECATED: /* for the sake of BC to old damaged code */ break; case E_NOTICE: @@ -994,6 +995,7 @@ error_type_str = "Strict Standards"; break; case E_DEPRECATED: + case E_USER_DEPRECATED: error_type_str = "Deprecated"; break; default: Index: Zend/zend.c =================================================================== RCS file: /repository/ZendEngine2/zend.c,v retrieving revision 1.418 diff -u -r1.418 zend.c --- Zend/zend.c 13 Jul 2008 21:30:18 -0000 1.418 +++ Zend/zend.c 18 Jul 2008 21:25:46 -0000 @@ -1521,6 +1521,7 @@ case E_USER_ERROR: case E_USER_WARNING: case E_USER_NOTICE: + case E_USER_DEPRECATED: case E_RECOVERABLE_ERROR: if (zend_is_compiling(TSRMLS_C)) { error_filename = zend_get_compiled_filename(TSRMLS_C); Index: Zend/zend_builtin_functions.c =================================================================== RCS file: /repository/ZendEngine2/zend_builtin_functions.c,v retrieving revision 1.377 diff -u -r1.377 zend_builtin_functions.c --- Zend/zend_builtin_functions.c 6 Jul 2008 05:03:46 -0000 1.377 +++ Zend/zend_builtin_functions.c 18 Jul 2008 21:25:46 -0000 @@ -1480,6 +1480,7 @@ case E_USER_ERROR: case E_USER_WARNING: case E_USER_NOTICE: + case E_USER_DEPRECATED: break; default: zend_error(E_WARNING, "Invalid error type specified"); Index: Zend/zend_constants.c =================================================================== RCS file: /repository/ZendEngine2/zend_constants.c,v retrieving revision 1.110 diff -u -r1.110 zend_constants.c --- Zend/zend_constants.c 20 May 2008 15:29:01 -0000 1.110 +++ Zend/zend_constants.c 18 Jul 2008 21:25:46 -0000 @@ -112,6 +112,7 @@ REGISTER_MAIN_LONG_CONSTANT("E_USER_ERROR", E_USER_ERROR, CONST_PERSISTENT | CONST_CS); REGISTER_MAIN_LONG_CONSTANT("E_USER_WARNING", E_USER_WARNING, CONST_PERSISTENT | CONST_CS); REGISTER_MAIN_LONG_CONSTANT("E_USER_NOTICE", E_USER_NOTICE, CONST_PERSISTENT | CONST_CS); + REGISTER_MAIN_LONG_CONSTANT("E_USER_DEPRECATED", E_USER_DEPRECATED, CONST_PERSISTENT | CONST_CS); REGISTER_MAIN_LONG_CONSTANT("E_ALL", E_ALL, CONST_PERSISTENT | CONST_CS); Index: Zend/zend_errors.h =================================================================== RCS file: /repository/ZendEngine2/zend_errors.h,v retrieving revision 1.25 diff -u -r1.25 zend_errors.h --- Zend/zend_errors.h 23 Feb 2008 17:03:51 -0000 1.25 +++ Zend/zend_errors.h 18 Jul 2008 21:25:46 -0000 @@ -36,8 +36,9 @@ #define E_STRICT (1<<11L) #define E_RECOVERABLE_ERROR (1<<12L) #define E_DEPRECATED (1<<13L) +#define E_USER_DEPRECATED (1<<14L) -#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_STRICT | E_RECOVERABLE_ERROR | E_DEPRECATED) +#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_STRICT | E_RECOVERABLE_ERROR | E_DEPRECATED | E_USER_DEPRECATED) #define E_CORE (E_CORE_ERROR | E_CORE_WARNING) #endif /* ZEND_ERRORS_H */ Index: Zend/zend_ini_scanner.c =================================================================== RCS file: /repository/ZendEngine2/zend_ini_scanner.c,v retrieving revision 1.4 diff -u -r1.4 zend_ini_scanner.c --- Zend/zend_ini_scanner.c 7 Apr 2008 11:50:00 -0000 1.4 +++ Zend/zend_ini_scanner.c 18 Jul 2008 21:25:46 -0000 @@ -1,4 +1,4 @@ -/* Generated by re2c 0.13.4.dev on Mon Apr 7 12:50:51 2008 */ +/* Generated by re2c 0.13.5 on Thu Jun 12 22:26:42 2008 */ #line 1 "Zend/zend_ini_scanner.l" /* +----------------------------------------------------------------------+ @@ -22,7 +22,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_ini_scanner.c,v 1.4 2008/04/07 11:50:00 scottmac Exp $ */ +/* $Id: zend_ini_scanner.l,v 1.53 2008/04/07 11:50:00 scottmac Exp $ */ #include #include "zend.h" Index: Zend/tests/015.phpt =================================================================== RCS file: /repository/ZendEngine2/tests/015.phpt,v retrieving revision 1.2 diff -u -r1.2 015.phpt --- Zend/tests/015.phpt 26 May 2008 14:33:42 -0000 1.2 +++ Zend/tests/015.phpt 18 Jul 2008 21:25:46 -0000 @@ -9,20 +9,19 @@ var_dump(trigger_error("error", -1)); var_dump(trigger_error("error", 0)); var_dump(trigger_error("error", E_USER_WARNING)); +var_dump(trigger_error("error", E_USER_DEPRECATED)); echo "Done\n"; ?> ---EXPECTF-- -Warning: Wrong parameter count for trigger_error() in %s on line %d +--EXPECTF-- +Warning: trigger_error() expects at least 1 parameter, 0 given in %s on line %d NULL Notice: error in %s on line %d bool(true) -Notice: Array to string conversion in %s on line %d - -Notice: Array in %s on line %d -bool(true) +Warning: trigger_error() expects parameter 1 to be string (Unicode or binary), array given in %s on line %d +NULL Warning: Invalid error type specified in %s on line %d bool(false) @@ -32,4 +31,7 @@ Warning: error in %s on line %d bool(true) + +Deprecated: error in %s on line %d +bool(true) Done