stas Sat, 23 Jul 2011 22:07:22 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=313645
Log:
Change E_ALL to include E_STRICT
Changed paths:
U php/php-src/branches/PHP_5_4/NEWS
U php/php-src/branches/PHP_5_4/Zend/zend_builtin_functions.c
U php/php-src/branches/PHP_5_4/Zend/zend_errors.h
U php/php-src/branches/PHP_5_4/php.ini-development
U php/php-src/branches/PHP_5_4/php.ini-production
U php/php-src/trunk/Zend/zend_builtin_functions.c
U php/php-src/trunk/Zend/zend_errors.h
U php/php-src/trunk/php.ini-development
U php/php-src/trunk/php.ini-production
Modified: php/php-src/branches/PHP_5_4/NEWS
===================================================================
--- php/php-src/branches/PHP_5_4/NEWS 2011-07-23 22:05:08 UTC (rev 313644)
+++ php/php-src/branches/PHP_5_4/NEWS 2011-07-23 22:07:22 UTC (rev 313645)
@@ -10,6 +10,8 @@
get_magic_quotes_gpc, get_magic_quotes_runtime are kept but always return
false, set_magic_quotes_runtime raises an E_CORE_ERROR. (Pierrick, Pierre)
+- Changed E_ALL to include E_STRICT. (Stas)
+
- Improved PHP-FPM SAPI:
. Added process.max to control the number of process FPM can fork. FR #55166.
(fat)
Modified: php/php-src/branches/PHP_5_4/Zend/zend_builtin_functions.c
===================================================================
--- php/php-src/branches/PHP_5_4/Zend/zend_builtin_functions.c 2011-07-23 22:05:08 UTC (rev 313644)
+++ php/php-src/branches/PHP_5_4/Zend/zend_builtin_functions.c 2011-07-23 22:07:22 UTC (rev 313645)
@@ -1501,7 +1501,7 @@
zval *error_handler;
zend_bool had_orig_error_handler=0;
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) {
return;
Modified: php/php-src/branches/PHP_5_4/Zend/zend_errors.h
===================================================================
--- php/php-src/branches/PHP_5_4/Zend/zend_errors.h 2011-07-23 22:05:08 UTC (rev 313644)
+++ php/php-src/branches/PHP_5_4/Zend/zend_errors.h 2011-07-23 22:07:22 UTC (rev 313645)
@@ -38,7 +38,7 @@
#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 | 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)
#endif /* ZEND_ERRORS_H */
Modified: php/php-src/branches/PHP_5_4/php.ini-development
===================================================================
--- php/php-src/branches/PHP_5_4/php.ini-development 2011-07-23 22:05:08 UTC (rev 313644)
+++ php/php-src/branches/PHP_5_4/php.ini-development 2011-07-23 22:07:22 UTC (rev 313645)
@@ -102,8 +102,8 @@
; Production Value: Off
; error_reporting
-; Default Value: E_ALL & ~E_NOTICE
-; Development Value: E_ALL | E_STRICT
+; Default Value: E_ALL & ~E_NOTICE & ~E_STRICT & ~E_DEPRECATED
+; Development Value: E_ALL
; Production Value: E_ALL & ~E_DEPRECATED
; html_errors
@@ -412,7 +412,7 @@
; recommend error reporting setting. Your production server shouldn't be wasting
; resources complaining about best practices and coding standards. That's what
; 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
; development and early testing.
;
@@ -443,15 +443,15 @@
; E_USER_DEPRECATED - user-generated deprecation warnings
;
; Common Values:
-; E_ALL & ~E_NOTICE (Show all errors, except for notices and coding standards warnings.)
-; E_ALL & ~E_NOTICE | E_STRICT (Show all errors, except for notices)
+; E_ALL (Show all errors, warnings and notices including coding standards.)
+; 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_ALL | E_STRICT (Show all errors, warnings and notices including coding standards.)
-; Default Value: E_ALL & ~E_NOTICE
-; Development Value: E_ALL | E_STRICT
+; Default Value: E_ALL & ~E_NOTICE & ~E_STRICT & ~E_DEPRECATED
+; Development Value: E_ALL
; Production Value: E_ALL & ~E_DEPRECATED
; 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,
; notices and warnings too. Error output is very useful during development, but
Modified: php/php-src/branches/PHP_5_4/php.ini-production
===================================================================
--- php/php-src/branches/PHP_5_4/php.ini-production 2011-07-23 22:05:08 UTC (rev 313644)
+++ php/php-src/branches/PHP_5_4/php.ini-production 2011-07-23 22:07:22 UTC (rev 313645)
@@ -102,8 +102,8 @@
; Production Value: Off
; error_reporting
-; Default Value: E_ALL & ~E_NOTICE
-; Development Value: E_ALL | E_STRICT
+; Default Value: E_ALL & ~E_NOTICE & ~E_STRICT & ~E_DEPRECATED
+; Development Value: E_ALL
; Production Value: E_ALL & ~E_DEPRECATED
; html_errors
@@ -412,7 +412,7 @@
; recommend error reporting setting. Your production server shouldn't be wasting
; resources complaining about best practices and coding standards. That's what
; 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
; development and early testing.
;
@@ -443,12 +443,12 @@
; E_USER_DEPRECATED - user-generated deprecation warnings
;
; Common Values:
-; E_ALL & ~E_NOTICE (Show all errors, except for notices and coding standards warnings.)
-; E_ALL & ~E_NOTICE | E_STRICT (Show all errors, except for notices)
+; E_ALL (Show all errors, warnings and notices including coding standards.)
+; 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_ALL | E_STRICT (Show all errors, warnings and notices including coding standards.)
-; Default Value: E_ALL & ~E_NOTICE
-; Development Value: E_ALL | E_STRICT
+; Default Value: E_ALL & ~E_NOTICE & ~E_STRICT & ~E_DEPRECATED
+; Development Value: E_ALL
; Production Value: E_ALL & ~E_DEPRECATED
; http://php.net/error-reporting
error_reporting = E_ALL & ~E_DEPRECATED
Modified: php/php-src/trunk/Zend/zend_builtin_functions.c
===================================================================
--- php/php-src/trunk/Zend/zend_builtin_functions.c 2011-07-23 22:05:08 UTC (rev 313644)
+++ php/php-src/trunk/Zend/zend_builtin_functions.c 2011-07-23 22:07:22 UTC (rev 313645)
@@ -1501,7 +1501,7 @@
zval *error_handler;
zend_bool had_orig_error_handler=0;
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) {
return;
Modified: php/php-src/trunk/Zend/zend_errors.h
===================================================================
--- php/php-src/trunk/Zend/zend_errors.h 2011-07-23 22:05:08 UTC (rev 313644)
+++ php/php-src/trunk/Zend/zend_errors.h 2011-07-23 22:07:22 UTC (rev 313645)
@@ -38,7 +38,7 @@
#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 | 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)
#endif /* ZEND_ERRORS_H */
Modified: php/php-src/trunk/php.ini-development
===================================================================
--- php/php-src/trunk/php.ini-development 2011-07-23 22:05:08 UTC (rev 313644)
+++ php/php-src/trunk/php.ini-development 2011-07-23 22:07:22 UTC (rev 313645)
@@ -102,8 +102,8 @@
; Production Value: Off
; error_reporting
-; Default Value: E_ALL & ~E_NOTICE
-; Development Value: E_ALL | E_STRICT
+; Default Value: E_ALL & ~E_NOTICE & ~E_STRICT & ~E_DEPRECATED
+; Development Value: E_ALL
; Production Value: E_ALL & ~E_DEPRECATED
; html_errors
@@ -412,7 +412,7 @@
; recommend error reporting setting. Your production server shouldn't be wasting
; resources complaining about best practices and coding standards. That's what
; 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
; development and early testing.
;
@@ -443,15 +443,15 @@
; E_USER_DEPRECATED - user-generated deprecation warnings
;
; Common Values:
-; E_ALL & ~E_NOTICE (Show all errors, except for notices and coding standards warnings.)
-; E_ALL & ~E_NOTICE | E_STRICT (Show all errors, except for notices)
+; E_ALL (Show all errors, warnings and notices including coding standards.)
+; 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_ALL | E_STRICT (Show all errors, warnings and notices including coding standards.)
-; Default Value: E_ALL & ~E_NOTICE
-; Development Value: E_ALL | E_STRICT
+; Default Value: E_ALL & ~E_NOTICE & ~E_STRICT & ~E_DEPRECATED
+; Development Value: E_ALL
; Production Value: E_ALL & ~E_DEPRECATED
; 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,
; notices and warnings too. Error output is very useful during development, but
Modified: php/php-src/trunk/php.ini-production
===================================================================
--- php/php-src/trunk/php.ini-production 2011-07-23 22:05:08 UTC (rev 313644)
+++ php/php-src/trunk/php.ini-production 2011-07-23 22:07:22 UTC (rev 313645)
@@ -102,8 +102,8 @@
; Production Value: Off
; error_reporting
-; Default Value: E_ALL & ~E_NOTICE
-; Development Value: E_ALL | E_STRICT
+; Default Value: E_ALL & ~E_NOTICE & ~E_STRICT & ~E_DEPRECATED
+; Development Value: E_ALL
; Production Value: E_ALL & ~E_DEPRECATED
; html_errors
@@ -412,7 +412,7 @@
; recommend error reporting setting. Your production server shouldn't be wasting
; resources complaining about best practices and coding standards. That's what
; 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
; development and early testing.
;
@@ -443,12 +443,12 @@
; E_USER_DEPRECATED - user-generated deprecation warnings
;
; Common Values:
-; E_ALL & ~E_NOTICE (Show all errors, except for notices and coding standards warnings.)
-; E_ALL & ~E_NOTICE | E_STRICT (Show all errors, except for notices)
+; E_ALL (Show all errors, warnings and notices including coding standards.)
+; 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_ALL | E_STRICT (Show all errors, warnings and notices including coding standards.)
-; Default Value: E_ALL & ~E_NOTICE
-; Development Value: E_ALL | E_STRICT
+; Default Value: E_ALL & ~E_NOTICE & ~E_STRICT & ~E_DEPRECATED
+; Development Value: E_ALL
; Production Value: E_ALL & ~E_DEPRECATED
; http://php.net/error-reporting
error_reporting = E_ALL & ~E_DEPRECATED
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
