Revert "Don't silence fatal errors with @"

nikic · nikic · commit 340c6d392720 · 2019-01-31T09:39:10.000+01:00
This reverts commit abd3628. This wasn't ready for merging yet, there are still some test failures.
diff --git a/UPGRADING b/UPGRADING
@@ -25,10 +25,6 @@ PHP 7.4 UPGRADE NOTES
   . Referencing parent:: inside a class that does not have a parent will now
     generate a compile-time error. Previously the error was only emitted at
     run-time.
-  . Supressing errors of type E_ERROR, E_CORE_ERROR, E_COMPILE_ERROR,
-    E_USER_ERROR, E_RECOVERABLE_ERROR, E_PARSE with the @ operator is no
-    longer supported. They may still be suppressed with error_reporting
-    or configuration.
 
 - Curl:
   . Attempting to serialize a CURLFile class will now generate an exception.
diff --git a/Zend/tests/bug34786.phpt b/Zend/tests/bug34786.phpt
@@ -10,13 +10,13 @@ function bar() {
 echo "bar: ".error_reporting()."\n";
 }
 
-error_reporting(E_WARNING);
+error_reporting(1);
 echo "before: ".error_reporting()."\n";
 @foo(1,@bar(),3);
 echo "after: ".error_reporting()."\n";
 ?>
 --EXPECT--
-before: 2
+before: 1
 bar: 0
 foo: 0
-after: 2
+after: 1
diff --git a/Zend/zend_errors.h b/Zend/zend_errors.h
@@ -39,11 +39,6 @@
 #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)
 
-/* Fatal errors that are ignored by the silence operator */
-#define E_FATAL_ERRORS (E_ERROR | E_CORE_ERROR | E_COMPILE_ERROR | E_USER_ERROR | E_RECOVERABLE_ERROR | E_PARSE)
-
-#define E_HAS_ONLY_FATAL_ERRORS(mask) !((mask) & ~E_FATAL_ERRORS)
-
 #endif /* ZEND_ERRORS_H */
 
 /*
diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c
@@ -3755,8 +3755,7 @@ static void cleanup_live_vars(zend_execute_data *execute_data, uint32_t op_num,
 					}
 				} else if (kind == ZEND_LIVE_SILENCE) {
 					/* restore previous error_reporting value */
-					if (E_HAS_ONLY_FATAL_ERRORS(EG(error_reporting))
-							&& !E_HAS_ONLY_FATAL_ERRORS(Z_LVAL_P(var))) {
+					if (!EG(error_reporting) && Z_LVAL_P(var) != 0) {
 						EG(error_reporting) = Z_LVAL_P(var);
 					}
 				}
diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h
@@ -6690,10 +6690,9 @@ ZEND_VM_HANDLER(57, ZEND_BEGIN_SILENCE, ANY, ANY)
 
 	ZVAL_LONG(EX_VAR(opline->result.var), EG(error_reporting));
 
-	if (!E_HAS_ONLY_FATAL_ERRORS(EG(error_reporting))) {
+	if (EG(error_reporting)) {
 		do {
-			/* Do not silence fatal errors */
-			EG(error_reporting) &= E_FATAL_ERRORS;
+			EG(error_reporting) = 0;
 			if (!EG(error_reporting_ini_entry)) {
 				zval *zv = zend_hash_find_ex(EG(ini_directives), ZSTR_KNOWN(ZEND_STR_ERROR_REPORTING), 1);
 				if (zv) {
@@ -6722,8 +6721,7 @@ ZEND_VM_HANDLER(58, ZEND_END_SILENCE, TMP, ANY)
 {
 	USE_OPLINE
 
-	if (E_HAS_ONLY_FATAL_ERRORS(EG(error_reporting))
-			&& !E_HAS_ONLY_FATAL_ERRORS(Z_LVAL_P(EX_VAR(opline->op1.var)))) {
+	if (!EG(error_reporting) && Z_LVAL_P(EX_VAR(opline->op1.var)) != 0) {
 		EG(error_reporting) = Z_LVAL_P(EX_VAR(opline->op1.var));
 	}
 	ZEND_VM_NEXT_OPCODE();
diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h
@@ -1523,10 +1523,9 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_BEGIN_SILENCE_SPEC_HANDLER(ZEN
 
 	ZVAL_LONG(EX_VAR(opline->result.var), EG(error_reporting));
 
-	if (!E_HAS_ONLY_FATAL_ERRORS(EG(error_reporting))) {
+	if (EG(error_reporting)) {
 		do {
-			/* Do not silence fatal errors */
-			EG(error_reporting) &= E_FATAL_ERRORS;
+			EG(error_reporting) = 0;
 			if (!EG(error_reporting_ini_entry)) {
 				zval *zv = zend_hash_find_ex(EG(ini_directives), ZSTR_KNOWN(ZEND_STR_ERROR_REPORTING), 1);
 				if (zv) {
@@ -19505,8 +19504,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_END_SILENCE_SPEC_TMP_HANDLER(Z
 {
 	USE_OPLINE
 
-	if (E_HAS_ONLY_FATAL_ERRORS(EG(error_reporting))
-			&& !E_HAS_ONLY_FATAL_ERRORS(Z_LVAL_P(EX_VAR(opline->op1.var)))) {
+	if (!EG(error_reporting) && Z_LVAL_P(EX_VAR(opline->op1.var)) != 0) {
 		EG(error_reporting) = Z_LVAL_P(EX_VAR(opline->op1.var));
 	}
 	ZEND_VM_NEXT_OPCODE();
diff --git a/ext/standard/tests/array/array_multisort_variation1.phpt b/ext/standard/tests/array/array_multisort_variation1.phpt
@@ -12,7 +12,7 @@ echo "*** Testing array_multisort() : usage variation ***\n";
 
 // Define error handler
 function test_error_handler($err_no, $err_msg, $filename, $linenum, $vars) {
-	if (error_reporting() & $err_no) {
+	if (error_reporting() != 0) {
 		// report non-silenced errors
 		echo "Error: $err_no - $err_msg, $filename($linenum)\n";
 	}
diff --git a/ext/standard/tests/array/array_multisort_variation2.phpt b/ext/standard/tests/array/array_multisort_variation2.phpt
@@ -12,7 +12,7 @@ echo "*** Testing array_multisort() : usage variation ***\n";
 
 // Define error handler
 function test_error_handler($err_no, $err_msg, $filename, $linenum, $vars) {
-	if (error_reporting() & $err_no) {
+	if (error_reporting() != 0) {
 		// report non-silenced errors
 		echo "Error: $err_no - $err_msg, $filename($linenum)\n";
 	}
diff --git a/ext/standard/tests/array/array_multisort_variation3.phpt b/ext/standard/tests/array/array_multisort_variation3.phpt
@@ -12,7 +12,7 @@ echo "*** Testing array_multisort() : usage variation ***\n";
 
 // Define error handler
 function test_error_handler($err_no, $err_msg, $filename, $linenum, $vars) {
-	if (error_reporting() & $err_no) {
+	if (error_reporting() != 0) {
 		// report non-silenced errors
 		echo "Error: $err_no - $err_msg, $filename($linenum)\n";
 	}
diff --git a/ext/standard/tests/file/basename_variation3.phpt b/ext/standard/tests/file/basename_variation3.phpt
@@ -12,7 +12,7 @@ echo "*** Testing basename() : usage variation ***\n";
 
 // Define error handler
 function test_error_handler($err_no, $err_msg, $filename, $linenum, $vars) {
-	if (error_reporting() & $err_no) {
+	if (error_reporting() != 0) {
 		// report non-silenced errors
 		echo "Error: $err_no - $err_msg, $filename($linenum)\n";
 	}
diff --git a/ext/standard/tests/file/basename_variation4.phpt b/ext/standard/tests/file/basename_variation4.phpt
@@ -12,7 +12,7 @@ echo "*** Testing basename() : usage variation ***\n";
 
 // Define error handler
 function test_error_handler($err_no, $err_msg, $filename, $linenum, $vars) {
-	if (error_reporting() & $err_no) {
+	if (error_reporting() != 0) {
 		// report non-silenced errors
 		echo "Error: $err_no - $err_msg, $filename($linenum)\n";
 	}
diff --git a/ext/standard/tests/file/chmod_variation3.phpt b/ext/standard/tests/file/chmod_variation3.phpt
@@ -12,7 +12,7 @@ echo "*** Testing chmod() : usage variation ***\n";
 
 // Define error handler
 function test_error_handler($err_no, $err_msg, $filename, $linenum, $vars) {
-	if (error_reporting() & $err_no) {
+	if (error_reporting() != 0) {
 		// report non-silenced errors
 		echo "Error: $err_no - $err_msg, $filename($linenum)\n";
 	}
diff --git a/ext/standard/tests/file/chmod_variation4.phpt b/ext/standard/tests/file/chmod_variation4.phpt
@@ -14,7 +14,7 @@ echo "*** Testing chmod() : usage variation ***\n";
 
 // Define error handler
 function test_error_handler($err_no, $err_msg, $filename, $linenum, $vars) {
-	if (error_reporting() & $err_no) {
+	if (error_reporting() != 0) {
 		// report non-silenced errors
 		echo "Error: $err_no - $err_msg, $filename($linenum)\n";
 	}
diff --git a/ext/standard/tests/file/dirname_variation1.phpt b/ext/standard/tests/file/dirname_variation1.phpt
@@ -14,7 +14,7 @@ echo "*** Testing dirname() : usage variation ***\n";
 
 // Define error handler
 function test_error_handler($err_no, $err_msg, $filename, $linenum, $vars) {
-	if (error_reporting() & $err_no) {
+	if (error_reporting() != 0) {
 		// report non-silenced errors
 		echo "Error: $err_no - $err_msg, $filename($linenum)\n";
 	}
diff --git a/ext/standard/tests/file/file_get_contents_variation3.phpt b/ext/standard/tests/file/file_get_contents_variation3.phpt
@@ -14,7 +14,7 @@ echo "*** Testing file_get_contents() : usage variation ***\n";
 
 // Define error handler
 function test_error_handler($err_no, $err_msg, $filename, $linenum, $vars) {
-	if (error_reporting() & $err_no) {
+	if (error_reporting() != 0) {
 		// report non-silenced errors
 		echo "Error: $err_no - $err_msg, $filename($linenum)\n";
 	}
diff --git a/ext/standard/tests/file/file_get_contents_variation4.phpt b/ext/standard/tests/file/file_get_contents_variation4.phpt
@@ -14,7 +14,7 @@ echo "*** Testing file_get_contents() : usage variation ***\n";
 
 // Define error handler
 function test_error_handler($err_no, $err_msg, $filename, $linenum, $vars) {
-	if (error_reporting() & $err_no) {
+	if (error_reporting() != 0) {
 		// report non-silenced errors
 		echo "Error: $err_no - $err_msg, $filename($linenum)\n";
 	}
diff --git a/ext/standard/tests/file/file_get_contents_variation5_64bit.phpt b/ext/standard/tests/file/file_get_contents_variation5_64bit.phpt
@@ -16,7 +16,7 @@ echo "*** Testing file_get_contents() : usage variation ***\n";
 
 // Define error handler
 function test_error_handler($err_no, $err_msg, $filename, $linenum, $vars) {
-	if (error_reporting() & $err_no) {
+	if (error_reporting() != 0) {
 		// report non-silenced errors
 		echo "Error: $err_no - $err_msg, $filename($linenum)\n";
 	}
diff --git a/ext/standard/tests/file/file_get_contents_variation6.phpt b/ext/standard/tests/file/file_get_contents_variation6.phpt
@@ -14,7 +14,7 @@ echo "*** Testing file_get_contents() : usage variation ***\n";
 
 // Define error handler
 function test_error_handler($err_no, $err_msg, $filename, $linenum, $vars) {
-	if (error_reporting() & $err_no) {
+	if (error_reporting() != 0) {
 		// report non-silenced errors
 		echo "Error: $err_no - $err_msg, $filename($linenum)\n";
 	}
diff --git a/ext/standard/tests/file/file_put_contents_variation2.phpt b/ext/standard/tests/file/file_put_contents_variation2.phpt
@@ -14,7 +14,7 @@ echo "*** Testing file_put_contents() : usage variation ***\n";
 
 // Define error handler
 function test_error_handler($err_no, $err_msg, $filename, $linenum, $vars) {
-	if (error_reporting() & $err_no) {
+	if (error_reporting() != 0) {
 		// report non-silenced errors
 		echo "Error: $err_no - $err_msg, $filename($linenum)\n";
 	}
diff --git a/ext/standard/tests/file/file_put_contents_variation3.phpt b/ext/standard/tests/file/file_put_contents_variation3.phpt
@@ -14,7 +14,7 @@ echo "*** Testing file_put_contents() : usage variation ***\n";
 
 // Define error handler
 function test_error_handler($err_no, $err_msg, $filename, $linenum, $vars) {
-	if (error_reporting() & $err_no) {
+	if (error_reporting() != 0) {
 		// report non-silenced errors
 		echo "Error: $err_no - $err_msg, $filename($linenum)\n";
 	}
diff --git a/ext/standard/tests/file/file_variation2.phpt b/ext/standard/tests/file/file_variation2.phpt
@@ -12,7 +12,7 @@ echo "*** Testing file() : usage variation ***\n";
 
 // Define error handler
 function test_error_handler($err_no, $err_msg, $filename, $linenum, $vars) {
-	if (error_reporting() & $err_no) {
+	if (error_reporting() != 0) {
 		// report non-silenced errors
 		echo "Error: $err_no - $err_msg, $filename($linenum)\n";
 	}
diff --git a/ext/standard/tests/file/file_variation3.phpt b/ext/standard/tests/file/file_variation3.phpt
@@ -14,7 +14,7 @@ echo "*** Testing file() : usage variation ***\n";
 
 // Define error handler
 function test_error_handler($err_no, $err_msg, $filename, $linenum, $vars) {
-	if (error_reporting() & $err_no) {
+	if (error_reporting() != 0) {
 		// report non-silenced errors
 		echo "Error: $err_no - $err_msg, $filename($linenum)\n";
 	}
diff --git a/ext/standard/tests/file/file_variation4.phpt b/ext/standard/tests/file/file_variation4.phpt
@@ -12,7 +12,7 @@ echo "*** Testing file() : usage variation ***\n";
 
 // Define error handler
 function test_error_handler($err_no, $err_msg, $filename, $linenum, $vars) {
-	if (error_reporting() & $err_no) {
+	if (error_reporting() != 0) {
 		// report non-silenced errors
 		echo "Error: $err_no - $err_msg, $filename($linenum)\n";
 	}
diff --git a/ext/standard/tests/file/fopen_variation3.phpt b/ext/standard/tests/file/fopen_variation3.phpt
@@ -14,7 +14,7 @@ echo "*** Testing fopen() : usage variation ***\n";
 
 // Define error handler
 function test_error_handler($err_no, $err_msg, $filename, $linenum, $vars) {
-	if (error_reporting() & $err_no) {
+	if (error_reporting() != 0) {
 		// report non-silenced errors
 		echo "Error: $err_no - $err_msg, $filename($linenum)\n";
 	}
diff --git a/ext/standard/tests/file/fopen_variation4.phpt b/ext/standard/tests/file/fopen_variation4.phpt
@@ -14,7 +14,7 @@ echo "*** Testing fopen() : usage variation ***\n";
 
 // Define error handler
 function test_error_handler($err_no, $err_msg, $filename, $linenum, $vars) {
-	if (error_reporting() & $err_no) {
+	if (error_reporting() != 0) {
 		// report non-silenced errors
 		echo "Error: $err_no - $err_msg, $filename($linenum)\n";
 	}
diff --git a/ext/standard/tests/file/fwrite_variation5.phpt b/ext/standard/tests/file/fwrite_variation5.phpt
@@ -14,7 +14,7 @@ echo "*** Testing fwrite() : usage variation ***\n";
 
 // Define error handler
 function test_error_handler($err_no, $err_msg, $filename, $linenum, $vars) {
-	if (error_reporting() & $err_no) {
+	if (error_reporting() != 0) {
 		// report non-silenced errors
 		echo "Error: $err_no - $err_msg, $filename($linenum)\n";
 	}
diff --git a/ext/standard/tests/file/mkdir_variation1.phpt b/ext/standard/tests/file/mkdir_variation1.phpt
@@ -19,7 +19,7 @@ echo "*** Testing mkdir() : usage variation ***\n";
 
 // Define error handler
 function test_error_handler($err_no, $err_msg, $filename, $linenum, $vars) {
-	if (error_reporting() & $err_no) {
+	if (error_reporting() != 0) {
 		// report non-silenced errors
 		echo "Error: $err_no - $err_msg, $filename($linenum)\n";
 	}
diff --git a/ext/standard/tests/file/mkdir_variation2.phpt b/ext/standard/tests/file/mkdir_variation2.phpt
@@ -16,7 +16,7 @@ echo "*** Testing mkdir() : usage variation ***\n";
 
 // Define error handler
 function test_error_handler($err_no, $err_msg, $filename, $linenum, $vars) {
-	if (error_reporting() & $err_no) {
+	if (error_reporting() != 0) {
 		// report non-silenced errors
 		echo "Error: $err_no - $err_msg, $filename($linenum)\n";
 	}
diff --git a/ext/standard/tests/file/mkdir_variation3.phpt b/ext/standard/tests/file/mkdir_variation3.phpt
@@ -14,7 +14,7 @@ echo "*** Testing mkdir() : usage variation ***\n";
 
 // Define error handler
 function test_error_handler($err_no, $err_msg, $filename, $linenum, $vars) {
-	if (error_reporting() & $err_no) {
+	if (error_reporting() != 0) {
 		// report non-silenced errors
 		echo "Error: $err_no - $err_msg, $filename($linenum)\n";
 	}
diff --git a/ext/standard/tests/file/mkdir_variation4.phpt b/ext/standard/tests/file/mkdir_variation4.phpt
@@ -14,7 +14,7 @@ echo "*** Testing mkdir() : usage variation ***\n";
 
 // Define error handler
 function test_error_handler($err_no, $err_msg, $filename, $linenum, $vars) {
-	if (error_reporting() & $err_no) {
+	if (error_reporting() != 0) {
 		// report non-silenced errors
 		echo "Error: $err_no - $err_msg, $filename($linenum)\n";
 	}
diff --git a/ext/standard/tests/file/parse_ini_file_variation4.phpt b/ext/standard/tests/file/parse_ini_file_variation4.phpt
@@ -14,7 +14,7 @@ echo "*** Testing parse_ini_file() : usage variation ***\n";
 
 // Define error handler
 function test_error_handler($err_no, $err_msg, $filename, $linenum, $vars) {
-	if (error_reporting() & $err_no) {
+	if (error_reporting() != 0) {
 		// report non-silenced errors
 		echo "Error: $err_no - $err_msg, $filename($linenum)\n";
 	}
diff --git a/ext/standard/tests/file/parse_ini_file_variation5.phpt b/ext/standard/tests/file/parse_ini_file_variation5.phpt
@@ -14,7 +14,7 @@ echo "*** Testing parse_ini_file() : usage variation ***\n";
 
 // Define error handler
 function test_error_handler($err_no, $err_msg, $filename, $linenum, $vars) {
-	if (error_reporting() & $err_no) {
+	if (error_reporting() != 0) {
 		// report non-silenced errors
 		echo "Error: $err_no - $err_msg, $filename($linenum)\n";
 	}
diff --git a/ext/standard/tests/file/pathinfo_variation1.phpt b/ext/standard/tests/file/pathinfo_variation1.phpt
@@ -14,7 +14,7 @@ echo "*** Testing pathinfo() : usage variation ***\n";
 
 // Define error handler
 function test_error_handler($err_no, $err_msg, $filename, $linenum, $vars) {
-	if (error_reporting() & $err_no) {
+	if (error_reporting() != 0) {
 		// report non-silenced errors
 		echo "Error: $err_no - $err_msg, $filename($linenum)\n";
 	}
diff --git a/ext/standard/tests/file/pathinfo_variation2.phpt b/ext/standard/tests/file/pathinfo_variation2.phpt
@@ -16,7 +16,7 @@ echo "*** Testing pathinfo() : usage variation ***\n";
 
 // Define error handler
 function test_error_handler($err_no, $err_msg, $filename, $linenum, $vars) {
-	if (error_reporting() & $err_no) {
+	if (error_reporting() != 0) {
 		// report non-silenced errors
 		echo "Error: $err_no - $err_msg, $filename($linenum)\n";
 	}
diff --git a/ext/standard/tests/file/pclose_variation1.phpt b/ext/standard/tests/file/pclose_variation1.phpt
@@ -14,7 +14,7 @@ echo "*** Testing pclose() : usage variation ***\n";
 
 // Define error handler
 function test_error_handler($err_no, $err_msg, $filename, $linenum, $vars) {
-	if (error_reporting() & $err_no) {
+	if (error_reporting() != 0) {
 		// report non-silenced errors
 		echo "Error: $err_no - $err_msg, $filename($linenum)\n";
 	}
diff --git a/ext/standard/tests/file/readfile_variation4.phpt b/ext/standard/tests/file/readfile_variation4.phpt
@@ -14,7 +14,7 @@ echo "*** Testing readfile() : usage variation ***\n";
 
 // Define error handler
 function test_error_handler($err_no, $err_msg, $filename, $linenum, $vars) {
-	if (error_reporting() & $err_no) {
+	if (error_reporting() != 0) {
 		// report non-silenced errors
 		echo "Error: $err_no - $err_msg, $filename($linenum)\n";
 	}
diff --git a/ext/standard/tests/file/readfile_variation5.phpt b/ext/standard/tests/file/readfile_variation5.phpt
@@ -14,7 +14,7 @@ echo "*** Testing readfile() : usage variation ***\n";
 
 // Define error handler
 function test_error_handler($err_no, $err_msg, $filename, $linenum, $vars) {
-	if (error_reporting() & $err_no) {
+	if (error_reporting() != 0) {
 		// report non-silenced errors
 		echo "Error: $err_no - $err_msg, $filename($linenum)\n";
 	}
diff --git a/ext/standard/tests/file/rename_variation10.phpt b/ext/standard/tests/file/rename_variation10.phpt
@@ -14,7 +14,7 @@ echo "*** Testing rename() : usage variation ***\n";
 
 // Define error handler
 function test_error_handler($err_no, $err_msg, $filename, $linenum, $vars) {
-	if (error_reporting() & $err_no) {
+	if (error_reporting() != 0) {
 		// report non-silenced errors
 		echo "Error: $err_no - $err_msg, $filename($linenum)\n";
 	}
diff --git a/ext/standard/tests/file/rmdir_variation1.phpt b/ext/standard/tests/file/rmdir_variation1.phpt
@@ -19,7 +19,7 @@ echo "*** Testing rmdir() : usage variation ***\n";
 
 // Define error handler
 function test_error_handler($err_no, $err_msg, $filename, $linenum, $vars) {
-	if (error_reporting() & $err_no) {
+	if (error_reporting() != 0) {
 		// report non-silenced errors
 		echo "Error: $err_no - $err_msg, $filename($linenum)\n";
 	}
diff --git a/ext/standard/tests/file/rmdir_variation2.phpt b/ext/standard/tests/file/rmdir_variation2.phpt
diff --git a/ext/standard/tests/file/touch_variation3.phpt b/ext/standard/tests/file/touch_variation3.phpt
diff --git a/ext/standard/tests/file/touch_variation4.phpt b/ext/standard/tests/file/touch_variation4.phpt
diff --git a/ext/standard/tests/file/umask_variation3.phpt b/ext/standard/tests/file/umask_variation3.phpt
diff --git a/ext/standard/tests/file/unlink_variation7.phpt b/ext/standard/tests/file/unlink_variation7.phpt
diff --git a/ext/standard/tests/general_functions/call_user_func_array_variation_002.phpt b/ext/standard/tests/general_functions/call_user_func_array_variation_002.phpt
diff --git a/ext/standard/tests/general_functions/call_user_func_array_variation_003.phpt b/ext/standard/tests/general_functions/call_user_func_array_variation_003.phpt
diff --git a/ext/standard/tests/general_functions/intval_variation1.phpt b/ext/standard/tests/general_functions/intval_variation1.phpt
diff --git a/ext/standard/tests/network/ip2long_variation1.phpt b/ext/standard/tests/network/ip2long_variation1.phpt
diff --git a/ext/standard/tests/network/long2ip_variation1.phpt b/ext/standard/tests/network/long2ip_variation1.phpt
diff --git a/tests/output/ob_implicit_flush_variation_001.phpt b/tests/output/ob_implicit_flush_variation_001.phpt

Original file line number	Diff line number	Diff line change
`@@ -3755,8 +3755,7 @@ static void cleanup_live_vars(zend_execute_data *execute_data, uint32_t op_num,`
`3755`	`3755`	`}`
`3756`	`3756`	`} else if (kind == ZEND_LIVE_SILENCE) {`
`3757`	`3757`	`/* restore previous error_reporting value */`
`3758`		`- if (E_HAS_ONLY_FATAL_ERRORS(EG(error_reporting))`
`3759`		`- && !E_HAS_ONLY_FATAL_ERRORS(Z_LVAL_P(var))) {`
	`3758`	`+ if (!EG(error_reporting) && Z_LVAL_P(var) != 0) {`
`3760`	`3759`	`EG(error_reporting) = Z_LVAL_P(var);`
`3761`	`3760`	`}`
`3762`	`3761`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ echo "* Testing array_multisort() : usage variation *\n";`
`12`	`12`
`13`	`13`	`// Define error handler`
`14`	`14`	`function test_error_handler($err_no, $err_msg, $filename, $linenum, $vars) {`
`15`		`- if (error_reporting() & $err_no) {`
	`15`	`+ if (error_reporting() != 0) {`
`16`	`16`	`// report non-silenced errors`
`17`	`17`	`echo "Error: $err_no - $err_msg, $filename($linenum)\n";`
`18`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ echo "* Testing basename() : usage variation *\n";`
`12`	`12`
`13`	`13`	`// Define error handler`
`14`	`14`	`function test_error_handler($err_no, $err_msg, $filename, $linenum, $vars) {`
`15`		`- if (error_reporting() & $err_no) {`
	`15`	`+ if (error_reporting() != 0) {`
`16`	`16`	`// report non-silenced errors`
`17`	`17`	`echo "Error: $err_no - $err_msg, $filename($linenum)\n";`
`18`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ echo "* Testing chmod() : usage variation *\n";`
`12`	`12`
`13`	`13`	`// Define error handler`
`14`	`14`	`function test_error_handler($err_no, $err_msg, $filename, $linenum, $vars) {`
`15`		`- if (error_reporting() & $err_no) {`
	`15`	`+ if (error_reporting() != 0) {`
`16`	`16`	`// report non-silenced errors`
`17`	`17`	`echo "Error: $err_no - $err_msg, $filename($linenum)\n";`
`18`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ echo "* Testing chmod() : usage variation *\n";`
`14`	`14`
`15`	`15`	`// Define error handler`
`16`	`16`	`function test_error_handler($err_no, $err_msg, $filename, $linenum, $vars) {`
`17`		`- if (error_reporting() & $err_no) {`
	`17`	`+ if (error_reporting() != 0) {`
`18`	`18`	`// report non-silenced errors`
`19`	`19`	`echo "Error: $err_no - $err_msg, $filename($linenum)\n";`
`20`	`20`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ echo "* Testing dirname() : usage variation *\n";`
`14`	`14`
`15`	`15`	`// Define error handler`
`16`	`16`	`function test_error_handler($err_no, $err_msg, $filename, $linenum, $vars) {`
`17`		`- if (error_reporting() & $err_no) {`
	`17`	`+ if (error_reporting() != 0) {`
`18`	`18`	`// report non-silenced errors`
`19`	`19`	`echo "Error: $err_no - $err_msg, $filename($linenum)\n";`
`20`	`20`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ echo "* Testing file_get_contents() : usage variation *\n";`
`14`	`14`
`15`	`15`	`// Define error handler`
`16`	`16`	`function test_error_handler($err_no, $err_msg, $filename, $linenum, $vars) {`
`17`		`- if (error_reporting() & $err_no) {`
	`17`	`+ if (error_reporting() != 0) {`
`18`	`18`	`// report non-silenced errors`
`19`	`19`	`echo "Error: $err_no - $err_msg, $filename($linenum)\n";`
`20`	`20`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ echo "* Testing file_get_contents() : usage variation *\n";`
`16`	`16`
`17`	`17`	`// Define error handler`
`18`	`18`	`function test_error_handler($err_no, $err_msg, $filename, $linenum, $vars) {`
`19`		`- if (error_reporting() & $err_no) {`
	`19`	`+ if (error_reporting() != 0) {`
`20`	`20`	`// report non-silenced errors`
`21`	`21`	`echo "Error: $err_no - $err_msg, $filename($linenum)\n";`
`22`	`22`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ echo "* Testing file() : usage variation *\n";`
`12`	`12`
`13`	`13`	`// Define error handler`
`14`	`14`	`function test_error_handler($err_no, $err_msg, $filename, $linenum, $vars) {`
`15`		`- if (error_reporting() & $err_no) {`
	`15`	`+ if (error_reporting() != 0) {`
`16`	`16`	`// report non-silenced errors`
`17`	`17`	`echo "Error: $err_no - $err_msg, $filename($linenum)\n";`
`18`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ echo "* Testing fopen() : usage variation *\n";`
`14`	`14`
`15`	`15`	`// Define error handler`
`16`	`16`	`function test_error_handler($err_no, $err_msg, $filename, $linenum, $vars) {`
`17`		`- if (error_reporting() & $err_no) {`
	`17`	`+ if (error_reporting() != 0) {`
`18`	`18`	`// report non-silenced errors`
`19`	`19`	`echo "Error: $err_no - $err_msg, $filename($linenum)\n";`
`20`	`20`	`}`