diff options
| author | Hannes Magnusson <bjori@php.net> | 2008-07-21 09:41:00 +0000 |
|---|---|---|
| committer | Hannes Magnusson <bjori@php.net> | 2008-07-21 09:41:00 +0000 |
| commit | d619b57efa42c81eb4632d1794747f074cc3fb91 (patch) | |
| tree | 3709c14f92704ad842b1a968d68852a3d05aaee9 /Zend | |
| parent | 4fb0ceca1bf0aca919d83876bcef52ed87619fca (diff) | |
| download | php-git-d619b57efa42c81eb4632d1794747f074cc3fb91.tar.gz | |
MFH: Add E_USER_DEPRECATED (patch by Lars Strojny)
Diffstat (limited to 'Zend')
| -rw-r--r-- | Zend/tests/015.phpt | 4 | ||||
| -rw-r--r-- | Zend/zend.c | 1 | ||||
| -rw-r--r-- | Zend/zend_builtin_functions.c | 1 | ||||
| -rw-r--r-- | Zend/zend_constants.c | 1 | ||||
| -rw-r--r-- | Zend/zend_errors.h | 3 |
5 files changed, 9 insertions, 1 deletions
diff --git a/Zend/tests/015.phpt b/Zend/tests/015.phpt index b8b2338861..ffe1a4f94e 100644 --- a/Zend/tests/015.phpt +++ b/Zend/tests/015.phpt @@ -9,6 +9,7 @@ var_dump(trigger_error(array())); 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 @@ bool(false) Warning: error in %s on line %d bool(true) + +Deprecated: error in %s on line %d +bool(true) Done diff --git a/Zend/zend.c b/Zend/zend.c index 42e8efd9b1..0e35dd40cc 100644 --- a/Zend/zend.c +++ b/Zend/zend.c @@ -1000,6 +1000,7 @@ ZEND_API void zend_error(int type, const char *format, ...) /* {{{ */ 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); diff --git a/Zend/zend_builtin_functions.c b/Zend/zend_builtin_functions.c index 5beb229426..5680646092 100644 --- a/Zend/zend_builtin_functions.c +++ b/Zend/zend_builtin_functions.c @@ -1479,6 +1479,7 @@ ZEND_FUNCTION(trigger_error) 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"); diff --git a/Zend/zend_constants.c b/Zend/zend_constants.c index 3ca4a29e8c..c672b5e4c6 100644 --- a/Zend/zend_constants.c +++ b/Zend/zend_constants.c @@ -109,6 +109,7 @@ void zend_register_standard_constants(TSRMLS_D) 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); diff --git a/Zend/zend_errors.h b/Zend/zend_errors.h index 1f5d0e74bb..708a2dce00 100644 --- a/Zend/zend_errors.h +++ b/Zend/zend_errors.h @@ -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 */ |