? main/.php_variables.c.swp ? Zend/static-classes-001.diff Index: run-tests.php =================================================================== RCS file: /repository/php-src/run-tests.php,v retrieving revision 1.226.2.37.2.35.2.30 diff -u -r1.226.2.37.2.35.2.30 run-tests.php --- run-tests.php 16 Jul 2008 15:41:58 -0000 1.226.2.37.2.35.2.30 +++ run-tests.php 18 Jul 2008 21:19:14 -0000 @@ -177,7 +177,7 @@ 'safe_mode=0', '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.231.2.10.2.22.2.6 diff -u -r1.231.2.10.2.22.2.6 php.ini-dist --- php.ini-dist 7 Apr 2008 21:24:04 -0000 1.231.2.10.2.22.2.6 +++ php.ini-dist 18 Jul 2008 21:19:14 -0000 @@ -295,6 +295,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.179.2.11.2.23.2.6 diff -u -r1.179.2.11.2.23.2.6 php.ini-recommended --- php.ini-recommended 7 Apr 2008 21:24:04 -0000 1.179.2.11.2.23.2.6 +++ php.ini-recommended 18 Jul 2008 21:19:14 -0000 @@ -344,6 +344,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.640.2.23.2.57.2.24 diff -u -r1.640.2.23.2.57.2.24 main.c --- main/main.c 25 Jun 2008 12:18:36 -0000 1.640.2.23.2.57.2.24 +++ main/main.c 18 Jul 2008 21:19:15 -0000 @@ -844,6 +844,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: @@ -894,6 +895,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.308.2.12.2.35.2.19 diff -u -r1.308.2.12.2.35.2.19 zend.c --- Zend/zend.c 29 Jun 2008 08:21:34 -0000 1.308.2.12.2.35.2.19 +++ Zend/zend.c 18 Jul 2008 21:19:15 -0000 @@ -1000,6 +1000,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.277.2.12.2.25.2.23 diff -u -r1.277.2.12.2.25.2.23 zend_builtin_functions.c --- Zend/zend_builtin_functions.c 6 Jul 2008 01:57:39 -0000 1.277.2.12.2.25.2.23 +++ Zend/zend_builtin_functions.c 18 Jul 2008 21:19:15 -0000 @@ -1479,6 +1479,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.71.2.5.2.7.2.9 diff -u -r1.71.2.5.2.7.2.9 zend_constants.c --- Zend/zend_constants.c 23 Feb 2008 17:06:19 -0000 1.71.2.5.2.7.2.9 +++ Zend/zend_constants.c 18 Jul 2008 21:19:15 -0000 @@ -109,6 +109,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.18.2.1.2.5.2.2 diff -u -r1.18.2.1.2.5.2.2 zend_errors.h --- Zend/zend_errors.h 23 Feb 2008 17:06:19 -0000 1.18.2.1.2.5.2.2 +++ Zend/zend_errors.h 18 Jul 2008 21:19:15 -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_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_RECOVERABLE_ERROR | E_DEPRECATED | E_USER_DEPRECATED) #define E_CORE (E_CORE_ERROR | E_CORE_WARNING) #endif /* ZEND_ERRORS_H */ Index: Zend/tests/015.phpt =================================================================== RCS file: /repository/ZendEngine2/tests/015.phpt,v retrieving revision 1.1.2.2.2.1 diff -u -r1.1.2.2.2.1 015.phpt --- Zend/tests/015.phpt 18 Jun 2008 23:38:37 -0000 1.1.2.2.2.1 +++ Zend/tests/015.phpt 18 Jul 2008 21:19:15 -0000 @@ -9,6 +9,7 @@ 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"; ?> @@ -30,4 +31,7 @@ Warning: error in %s on line %d bool(true) + +Deprecated: error in %s on line %d +bool(true) Done