Patch E_ALL for Scripting Engine problem Bug #52563

Patch version 2010-08-27 10:52 UTC

• 2010-08-27 10:52 UTC [diff to current]

Developer: aharvey@php.net

diff --git a/UPGRADING b/UPGRADING
index a0d86d0..6accc3c 100755
--- a/UPGRADING
+++ b/UPGRADING
@@ -80,6 +80,8 @@ UPGRADE NOTES - PHP X.Y
   - safe_mode_protected_env_vars
   - zend.ze1_compatibility_mode
 
+- E_ALL will now report errors of all types, including strict standards.
+
 =============================
 2. Reserved words and classes
 =============================
diff --git a/Zend/tests/error_reporting01.phpt b/Zend/tests/error_reporting01.phpt
index 0969770..5153d41 100644
--- a/Zend/tests/error_reporting01.phpt
+++ b/Zend/tests/error_reporting01.phpt
@@ -22,5 +22,5 @@ var_dump(error_reporting());
 echo "Done\n";
 ?>
 --EXPECT--	
-int(30719)
+int(32767)
 Done
diff --git a/Zend/tests/error_reporting05.phpt b/Zend/tests/error_reporting05.phpt
index 2bf392d..fe5374c 100644
--- a/Zend/tests/error_reporting05.phpt
+++ b/Zend/tests/error_reporting05.phpt
@@ -30,5 +30,5 @@ echo "Done\n";
 Notice: Undefined variable: undef_value in %s on line %d
 
 Notice: Undefined variable: undef_name in %s on line %d
-int(30719)
+int(32767)
 Done
diff --git a/Zend/tests/error_reporting06.phpt b/Zend/tests/error_reporting06.phpt
index beb91bf..285a623 100644
--- a/Zend/tests/error_reporting06.phpt
+++ b/Zend/tests/error_reporting06.phpt
@@ -26,5 +26,5 @@ var_dump(error_reporting());
 echo "Done\n";
 ?>
 --EXPECTF--	
-int(30719)
+int(32767)
 Done
diff --git a/Zend/tests/error_reporting07.phpt b/Zend/tests/error_reporting07.phpt
index 5da970c..c63efae 100644
--- a/Zend/tests/error_reporting07.phpt
+++ b/Zend/tests/error_reporting07.phpt
@@ -26,5 +26,5 @@ var_dump(error_reporting());
 echo "Done\n";
 ?>
 --EXPECTF--	
-int(30719)
+int(32767)
 Done
diff --git a/Zend/tests/error_reporting10.phpt b/Zend/tests/error_reporting10.phpt
index 7205acd..12b1db5 100644
--- a/Zend/tests/error_reporting10.phpt
+++ b/Zend/tests/error_reporting10.phpt
@@ -30,6 +30,6 @@ var_dump(error_reporting());
 echo "Done\n";
 ?>
 --EXPECTF--	
-int(30719)
-int(30711)
+int(32767)
+int(32759)
 Done
diff --git a/Zend/zend_errors.h b/Zend/zend_errors.h
index 739c8d4..3fb3cf7 100644
--- a/Zend/zend_errors.h
+++ b/Zend/zend_errors.h
@@ -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_STRICT | E_RECOVERABLE_ERROR | E_DEPRECATED | E_USER_DEPRECATED)
 #define E_CORE (E_CORE_ERROR | E_CORE_WARNING)
 
 #endif /* ZEND_ERRORS_H */
diff --git a/ext/standard/tests/file/parse_ini_file_variation3.phpt b/ext/standard/tests/file/parse_ini_file_variation3.phpt
index 77ffa07..43b0274 100644
--- a/ext/standard/tests/file/parse_ini_file_variation3.phpt
+++ b/ext/standard/tests/file/parse_ini_file_variation3.phpt
@@ -79,7 +79,7 @@ foreach($newdirs as $newdir) {
 New include path is : %sparse_ini_file_variation3.dir1%sparse_ini_file_variation3.dir2%sparse_ini_file_variation3.dir3%S
 array(11) {
   ["error_reporting"]=>
-  string(5) "30719"
+  string(5) "32767"
   ["display_errors"]=>
   string(1) "1"
   ["display_startup_errors"]=>
@@ -101,4 +101,4 @@ array(11) {
   ["docref_ext"]=>
   string(5) ".html"
 }
-===Done===
\ No newline at end of file
+===Done===
diff --git a/ext/standard/tests/general_functions/parse_ini_basic.phpt b/ext/standard/tests/general_functions/parse_ini_basic.phpt
index bdd44e0..d5312ee 100644
--- a/ext/standard/tests/general_functions/parse_ini_basic.phpt
+++ b/ext/standard/tests/general_functions/parse_ini_basic.phpt
@@ -45,7 +45,7 @@ array(26) {
     ["dqstring"]=>
     string(51) "asdadfsdjkslkj ¡@£$$ { } !^~|¥¥{[()/)&/% ¤ # #"
     ["php_constant"]=>
-    string(5) "30719"
+    string(5) "32767"
     ["user_constant"]=>
     string(21) "this_is_test_constant"
   }
@@ -76,7 +76,7 @@ array(26) {
     ["dqstring"]=>
     string(41) "asdadfsdjkslkj ¡@£$$€¥¥{[()/)&/%#¤"
     ["php_constant"]=>
-    string(5) "30719"
+    string(5) "32767"
   }
   ["comments"]=>
   array(1) {
diff --git a/ext/standard/tests/general_functions/parse_ini_booleans.phpt b/ext/standard/tests/general_functions/parse_ini_booleans.phpt
index 3796578..7b012c5 100644
--- a/ext/standard/tests/general_functions/parse_ini_booleans.phpt
+++ b/ext/standard/tests/general_functions/parse_ini_booleans.phpt
@@ -15,15 +15,15 @@ array(3) {
   ["error_reporting values"]=>
   array(6) {
     ["foo"]=>
-    string(7) "30719 8"
+    string(7) "32767 8"
     ["error_reporting"]=>
-    string(5) "30719"
+    string(5) "32767"
     ["error_reporting1"]=>
     string(4) "4177"
     ["error_reporting2"]=>
-    string(5) "30711"
+    string(5) "32759"
     ["error_reporting3"]=>
-    string(5) "30711"
+    string(5) "32759"
     ["error_reporting4"]=>
     string(5) "32759"
   }