archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Change E_ALL to include E_STRICT

Browse source
This commit is contained in:
Stanislav Malyshev 2011-07-23 22:07:22 +00:00
parent 48870107dc
commit 7bb8f9eecb
4 changed files with 19 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Zend/zend_builtin_functions.c
View file

@ -1501,7 +1501,7 @@ ZEND_FUNCTION(set_error_handler)
zval *error_handler; zval *error_handler;
zend_bool had_orig_error_handler=0; zend_bool had_orig_error_handler=0;
char *error_handler_name = NULL; char *error_handler_name = NULL;
long error_type = E_ALL | E_STRICT; long error_type = E_ALL;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z|l", &error_handler, &error_type) == FAILURE) { if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z|l", &error_handler, &error_type) == FAILURE) {
return; return;

2
Zend/zend_errors.h
View file

@ -38,7 +38,7 @@
#define E_DEPRECATED (1<<13L) #define E_DEPRECATED (1<<13L)
#define E_USER_DEPRECATED (1<<14L) #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 | E_USER_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 | E_STRICT)
#define E_CORE (E_CORE_ERROR | E_CORE_WARNING) #define E_CORE (E_CORE_ERROR | E_CORE_WARNING)
#endif /* ZEND_ERRORS_H */ #endif /* ZEND_ERRORS_H */

18
php.ini-development
View file

@ -102,8 +102,8 @@
; Production Value: Off ; Production Value: Off
; error_reporting ; error_reporting
; Default Value: E_ALL & ~E_NOTICE ; Default Value: E_ALL & ~E_NOTICE & ~E_STRICT & ~E_DEPRECATED
; Development Value: E_ALL | E_STRICT ; Development Value: E_ALL
; Production Value: E_ALL & ~E_DEPRECATED ; Production Value: E_ALL & ~E_DEPRECATED
; html_errors ; html_errors
@ -412,7 +412,7 @@ memory_limit = 128M
; recommend error reporting setting. Your production server shouldn't be wasting ; recommend error reporting setting. Your production server shouldn't be wasting
; resources complaining about best practices and coding standards. That's what ; resources complaining about best practices and coding standards. That's what
; development servers and development settings are for. ; development servers and development settings are for.
; Note: The php.ini-development file has this setting as E_ALL | E_STRICT. This ; Note: The php.ini-development file has this setting as E_ALL. This
; means it pretty much reports everything which is exactly what you want during ; means it pretty much reports everything which is exactly what you want during
; development and early testing. ; development and early testing.
; ;
@ -443,15 +443,15 @@ memory_limit = 128M
; E_USER_DEPRECATED - user-generated deprecation warnings ; E_USER_DEPRECATED - user-generated deprecation warnings
; ;
; Common Values: ; Common Values:
; E_ALL & ~E_NOTICE (Show all errors, except for notices and coding standards warnings.) ; E_ALL (Show all errors, warnings and notices including coding standards.)
; E_ALL & ~E_NOTICE | E_STRICT (Show all errors, except for notices) ; E_ALL & ~E_NOTICE (Show all errors, except for notices)
; E_ALL & ~E_NOTICE & ~E_STRICT (Show all errors, except for notices and coding standards warnings.)
; E_COMPILE_ERROR|E_RECOVERABLE_ERROR|E_ERROR|E_CORE_ERROR (Show only errors) ; E_COMPILE_ERROR|E_RECOVERABLE_ERROR|E_ERROR|E_CORE_ERROR (Show only errors)
; E_ALL | E_STRICT (Show all errors, warnings and notices including coding standards.) ; Default Value: E_ALL & ~E_NOTICE & ~E_STRICT & ~E_DEPRECATED
; Default Value: E_ALL & ~E_NOTICE ; Development Value: E_ALL
; Development Value: E_ALL | E_STRICT
; Production Value: E_ALL & ~E_DEPRECATED ; Production Value: E_ALL & ~E_DEPRECATED
; http://php.net/error-reporting ; http://php.net/error-reporting
error_reporting = E_ALL | E_STRICT error_reporting = E_ALL
; This directive controls whether or not and where PHP will output errors, ; This directive controls whether or not and where PHP will output errors,
; notices and warnings too. Error output is very useful during development, but ; notices and warnings too. Error output is very useful during development, but

16
php.ini-production
View file

@ -102,8 +102,8 @@
; Production Value: Off ; Production Value: Off
; error_reporting ; error_reporting
; Default Value: E_ALL & ~E_NOTICE ; Default Value: E_ALL & ~E_NOTICE & ~E_STRICT & ~E_DEPRECATED
; Development Value: E_ALL | E_STRICT ; Development Value: E_ALL
; Production Value: E_ALL & ~E_DEPRECATED ; Production Value: E_ALL & ~E_DEPRECATED
; html_errors ; html_errors
@ -412,7 +412,7 @@ memory_limit = 128M
; recommend error reporting setting. Your production server shouldn't be wasting ; recommend error reporting setting. Your production server shouldn't be wasting
; resources complaining about best practices and coding standards. That's what ; resources complaining about best practices and coding standards. That's what
; development servers and development settings are for. ; development servers and development settings are for.
; Note: The php.ini-development file has this setting as E_ALL | E_STRICT. This ; Note: The php.ini-development file has this setting as E_ALL. This
; means it pretty much reports everything which is exactly what you want during ; means it pretty much reports everything which is exactly what you want during
; development and early testing. ; development and early testing.
; ;
@ -443,12 +443,12 @@ memory_limit = 128M
; E_USER_DEPRECATED - user-generated deprecation warnings ; E_USER_DEPRECATED - user-generated deprecation warnings
; ;
; Common Values: ; Common Values:
; E_ALL & ~E_NOTICE (Show all errors, except for notices and coding standards warnings.) ; E_ALL (Show all errors, warnings and notices including coding standards.)
; E_ALL & ~E_NOTICE | E_STRICT (Show all errors, except for notices) ; E_ALL & ~E_NOTICE (Show all errors, except for notices)
; E_ALL & ~E_NOTICE & ~E_STRICT (Show all errors, except for notices and coding standards warnings.)
; E_COMPILE_ERROR|E_RECOVERABLE_ERROR|E_ERROR|E_CORE_ERROR (Show only errors) ; E_COMPILE_ERROR|E_RECOVERABLE_ERROR|E_ERROR|E_CORE_ERROR (Show only errors)
; E_ALL | E_STRICT (Show all errors, warnings and notices including coding standards.) ; Default Value: E_ALL & ~E_NOTICE & ~E_STRICT & ~E_DEPRECATED
; Default Value: E_ALL & ~E_NOTICE ; Development Value: E_ALL
; Development Value: E_ALL | E_STRICT
; Production Value: E_ALL & ~E_DEPRECATED ; Production Value: E_ALL & ~E_DEPRECATED
; http://php.net/error-reporting ; http://php.net/error-reporting
error_reporting = E_ALL & ~E_DEPRECATED error_reporting = E_ALL & ~E_DEPRECATED