Skip to content

Commit 7bb8f9e

Browse files
committed
Change E_ALL to include E_STRICT
1 parent 4887010 commit 7bb8f9e

File tree

4 files changed

+19
-19
lines changed

4 files changed

+19
-19
lines changed

Zend/zend_builtin_functions.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1501,7 +1501,7 @@ ZEND_FUNCTION(set_error_handler)
15011501
zval *error_handler;
15021502
zend_bool had_orig_error_handler=0;
15031503
char *error_handler_name = NULL;
1504-
long error_type = E_ALL | E_STRICT;
1504+
long error_type = E_ALL;
15051505

15061506
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z|l", &error_handler, &error_type) == FAILURE) {
15071507
return;

Zend/zend_errors.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
#define E_DEPRECATED (1<<13L)
3939
#define E_USER_DEPRECATED (1<<14L)
4040

41-
#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)
41+
#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)
4242
#define E_CORE (E_CORE_ERROR | E_CORE_WARNING)
4343

4444
#endif /* ZEND_ERRORS_H */

php.ini-development

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -102,8 +102,8 @@
102102
; Production Value: Off
103103

104104
; error_reporting
105-
; Default Value: E_ALL & ~E_NOTICE
106-
; Development Value: E_ALL | E_STRICT
105+
; Default Value: E_ALL & ~E_NOTICE & ~E_STRICT & ~E_DEPRECATED
106+
; Development Value: E_ALL
107107
; Production Value: E_ALL & ~E_DEPRECATED
108108

109109
; html_errors
@@ -412,7 +412,7 @@ memory_limit = 128M
412412
; recommend error reporting setting. Your production server shouldn't be wasting
413413
; resources complaining about best practices and coding standards. That's what
414414
; development servers and development settings are for.
415-
; Note: The php.ini-development file has this setting as E_ALL | E_STRICT. This
415+
; Note: The php.ini-development file has this setting as E_ALL. This
416416
; means it pretty much reports everything which is exactly what you want during
417417
; development and early testing.
418418
;
@@ -443,15 +443,15 @@ memory_limit = 128M
443443
; E_USER_DEPRECATED - user-generated deprecation warnings
444444
;
445445
; Common Values:
446-
; E_ALL & ~E_NOTICE (Show all errors, except for notices and coding standards warnings.)
447-
; E_ALL & ~E_NOTICE | E_STRICT (Show all errors, except for notices)
446+
; E_ALL (Show all errors, warnings and notices including coding standards.)
447+
; E_ALL & ~E_NOTICE (Show all errors, except for notices)
448+
; E_ALL & ~E_NOTICE & ~E_STRICT (Show all errors, except for notices and coding standards warnings.)
448449
; E_COMPILE_ERROR|E_RECOVERABLE_ERROR|E_ERROR|E_CORE_ERROR (Show only errors)
449-
; E_ALL | E_STRICT (Show all errors, warnings and notices including coding standards.)
450-
; Default Value: E_ALL & ~E_NOTICE
451-
; Development Value: E_ALL | E_STRICT
450+
; Default Value: E_ALL & ~E_NOTICE & ~E_STRICT & ~E_DEPRECATED
451+
; Development Value: E_ALL
452452
; Production Value: E_ALL & ~E_DEPRECATED
453453
; http://php.net/error-reporting
454-
error_reporting = E_ALL | E_STRICT
454+
error_reporting = E_ALL
455455

456456
; This directive controls whether or not and where PHP will output errors,
457457
; notices and warnings too. Error output is very useful during development, but

php.ini-production

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -102,8 +102,8 @@
102102
; Production Value: Off
103103

104104
; error_reporting
105-
; Default Value: E_ALL & ~E_NOTICE
106-
; Development Value: E_ALL | E_STRICT
105+
; Default Value: E_ALL & ~E_NOTICE & ~E_STRICT & ~E_DEPRECATED
106+
; Development Value: E_ALL
107107
; Production Value: E_ALL & ~E_DEPRECATED
108108

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

0 commit comments

Comments
 (0)