Skip to content

Commit abd3628

Browse files
nikickrakjoe
nikic
authored and
krakjoe
committed
Don't silence fatal errors with @
1 parent 25dc5f1 commit abd3628

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+68
-54
lines changed

‎UPGRADING

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,10 @@ PHP 7.4 UPGRADE NOTES
2525
. Referencing parent:: inside a class that does not have a parent will now
2626
generate a compile-time error. Previously the error was only emitted at
2727
run-time.
28+
. Supressing errors of type E_ERROR, E_CORE_ERROR, E_COMPILE_ERROR,
29+
E_USER_ERROR, E_RECOVERABLE_ERROR, E_PARSE with the @ operator is no
30+
longer supported. They may still be suppressed with error_reporting
31+
or configuration.
2832

2933
- Curl:
3034
. Attempting to serialize a CURLFile class will now generate an exception.

‎Zend/tests/bug34786.phpt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@ function bar() {
1010
echo "bar: ".error_reporting()."\n";
1111
}
1212

13-
error_reporting(1);
13+
error_reporting(E_WARNING);
1414
echo "before: ".error_reporting()."\n";
1515
@foo(1,@bar(),3);
1616
echo "after: ".error_reporting()."\n";
1717
?>
1818
--EXPECT--
19-
before: 1
19+
before: 2
2020
bar: 0
2121
foo: 0
22-
after: 1
22+
after: 2

‎Zend/zend_errors.h

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,11 @@
3939
#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)
4040
#define E_CORE (E_CORE_ERROR | E_CORE_WARNING)
4141

42+
/* Fatal errors that are ignored by the silence operator */
43+
#define E_FATAL_ERRORS (E_ERROR | E_CORE_ERROR | E_COMPILE_ERROR | E_USER_ERROR | E_RECOVERABLE_ERROR | E_PARSE)
44+
45+
#define E_HAS_ONLY_FATAL_ERRORS(mask) !((mask) & ~E_FATAL_ERRORS)
46+
4247
#endif /* ZEND_ERRORS_H */
4348

4449
/*

‎Zend/zend_execute.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3755,7 +3755,8 @@ static void cleanup_live_vars(zend_execute_data *execute_data, uint32_t op_num,
37553755
}
37563756
} else if (kind == ZEND_LIVE_SILENCE) {
37573757
/* restore previous error_reporting value */
3758-
if (!EG(error_reporting) && Z_LVAL_P(var) != 0) {
3758+
if (E_HAS_ONLY_FATAL_ERRORS(EG(error_reporting))
3759+
&& !E_HAS_ONLY_FATAL_ERRORS(Z_LVAL_P(var))) {
37593760
EG(error_reporting) = Z_LVAL_P(var);
37603761
}
37613762
}

‎Zend/zend_vm_def.h

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6690,9 +6690,10 @@ ZEND_VM_HANDLER(57, ZEND_BEGIN_SILENCE, ANY, ANY)
66906690

66916691
ZVAL_LONG(EX_VAR(opline->result.var), EG(error_reporting));
66926692

6693-
if (EG(error_reporting)) {
6693+
if (!E_HAS_ONLY_FATAL_ERRORS(EG(error_reporting))) {
66946694
do {
6695-
EG(error_reporting) = 0;
6695+
/* Do not silence fatal errors */
6696+
EG(error_reporting) &= E_FATAL_ERRORS;
66966697
if (!EG(error_reporting_ini_entry)) {
66976698
zval *zv = zend_hash_find_ex(EG(ini_directives), ZSTR_KNOWN(ZEND_STR_ERROR_REPORTING), 1);
66986699
if (zv) {
@@ -6721,7 +6722,8 @@ ZEND_VM_HANDLER(58, ZEND_END_SILENCE, TMP, ANY)
67216722
{
67226723
USE_OPLINE
67236724

6724-
if (!EG(error_reporting) && Z_LVAL_P(EX_VAR(opline->op1.var)) != 0) {
6725+
if (E_HAS_ONLY_FATAL_ERRORS(EG(error_reporting))
6726+
&& !E_HAS_ONLY_FATAL_ERRORS(Z_LVAL_P(EX_VAR(opline->op1.var)))) {
67256727
EG(error_reporting) = Z_LVAL_P(EX_VAR(opline->op1.var));
67266728
}
67276729
ZEND_VM_NEXT_OPCODE();

‎Zend/zend_vm_execute.h

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1523,9 +1523,10 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_BEGIN_SILENCE_SPEC_HANDLER(ZEN
15231523

15241524
ZVAL_LONG(EX_VAR(opline->result.var), EG(error_reporting));
15251525

1526-
if (EG(error_reporting)) {
1526+
if (!E_HAS_ONLY_FATAL_ERRORS(EG(error_reporting))) {
15271527
do {
1528-
EG(error_reporting) = 0;
1528+
/* Do not silence fatal errors */
1529+
EG(error_reporting) &= E_FATAL_ERRORS;
15291530
if (!EG(error_reporting_ini_entry)) {
15301531
zval *zv = zend_hash_find_ex(EG(ini_directives), ZSTR_KNOWN(ZEND_STR_ERROR_REPORTING), 1);
15311532
if (zv) {
@@ -19504,7 +19505,8 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_END_SILENCE_SPEC_TMP_HANDLER(Z
1950419505
{
1950519506
USE_OPLINE
1950619507

19507-
if (!EG(error_reporting) && Z_LVAL_P(EX_VAR(opline->op1.var)) != 0) {
19508+
if (E_HAS_ONLY_FATAL_ERRORS(EG(error_reporting))
19509+
&& !E_HAS_ONLY_FATAL_ERRORS(Z_LVAL_P(EX_VAR(opline->op1.var)))) {
1950819510
EG(error_reporting) = Z_LVAL_P(EX_VAR(opline->op1.var));
1950919511
}
1951019512
ZEND_VM_NEXT_OPCODE();

‎ext/standard/tests/array/array_multisort_variation1.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ echo "*** Testing array_multisort() : usage variation ***\n";
1212

1313
// Define error handler
1414
function test_error_handler($err_no, $err_msg, $filename, $linenum, $vars) {
15-
if (error_reporting() != 0) {
15+
if (error_reporting() & $err_no) {
1616
// report non-silenced errors
1717
echo "Error: $err_no - $err_msg, $filename($linenum)\n";
1818
}

‎ext/standard/tests/array/array_multisort_variation2.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ echo "*** Testing array_multisort() : usage variation ***\n";
1212

1313
// Define error handler
1414
function test_error_handler($err_no, $err_msg, $filename, $linenum, $vars) {
15-
if (error_reporting() != 0) {
15+
if (error_reporting() & $err_no) {
1616
// report non-silenced errors
1717
echo "Error: $err_no - $err_msg, $filename($linenum)\n";
1818
}

‎ext/standard/tests/array/array_multisort_variation3.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ echo "*** Testing array_multisort() : usage variation ***\n";
1212

1313
// Define error handler
1414
function test_error_handler($err_no, $err_msg, $filename, $linenum, $vars) {
15-
if (error_reporting() != 0) {
15+
if (error_reporting() & $err_no) {
1616
// report non-silenced errors
1717
echo "Error: $err_no - $err_msg, $filename($linenum)\n";
1818
}

‎ext/standard/tests/file/basename_variation3.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ echo "*** Testing basename() : usage variation ***\n";
1212

1313
// Define error handler
1414
function test_error_handler($err_no, $err_msg, $filename, $linenum, $vars) {
15-
if (error_reporting() != 0) {
15+
if (error_reporting() & $err_no) {
1616
// report non-silenced errors
1717
echo "Error: $err_no - $err_msg, $filename($linenum)\n";
1818
}

‎ext/standard/tests/file/basename_variation4.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ echo "*** Testing basename() : usage variation ***\n";
1212

1313
// Define error handler
1414
function test_error_handler($err_no, $err_msg, $filename, $linenum, $vars) {
15-
if (error_reporting() != 0) {
15+
if (error_reporting() & $err_no) {
1616
// report non-silenced errors
1717
echo "Error: $err_no - $err_msg, $filename($linenum)\n";
1818
}

‎ext/standard/tests/file/chmod_variation3.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ echo "*** Testing chmod() : usage variation ***\n";
1212

1313
// Define error handler
1414
function test_error_handler($err_no, $err_msg, $filename, $linenum, $vars) {
15-
if (error_reporting() != 0) {
15+
if (error_reporting() & $err_no) {
1616
// report non-silenced errors
1717
echo "Error: $err_no - $err_msg, $filename($linenum)\n";
1818
}

‎ext/standard/tests/file/chmod_variation4.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ echo "*** Testing chmod() : usage variation ***\n";
1414

1515
// Define error handler
1616
function test_error_handler($err_no, $err_msg, $filename, $linenum, $vars) {
17-
if (error_reporting() != 0) {
17+
if (error_reporting() & $err_no) {
1818
// report non-silenced errors
1919
echo "Error: $err_no - $err_msg, $filename($linenum)\n";
2020
}

‎ext/standard/tests/file/dirname_variation1.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ echo "*** Testing dirname() : usage variation ***\n";
1414

1515
// Define error handler
1616
function test_error_handler($err_no, $err_msg, $filename, $linenum, $vars) {
17-
if (error_reporting() != 0) {
17+
if (error_reporting() & $err_no) {
1818
// report non-silenced errors
1919
echo "Error: $err_no - $err_msg, $filename($linenum)\n";
2020
}

‎ext/standard/tests/file/file_get_contents_variation3.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ echo "*** Testing file_get_contents() : usage variation ***\n";
1414

1515
// Define error handler
1616
function test_error_handler($err_no, $err_msg, $filename, $linenum, $vars) {
17-
if (error_reporting() != 0) {
17+
if (error_reporting() & $err_no) {
1818
// report non-silenced errors
1919
echo "Error: $err_no - $err_msg, $filename($linenum)\n";
2020
}

‎ext/standard/tests/file/file_get_contents_variation4.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ echo "*** Testing file_get_contents() : usage variation ***\n";
1414

1515
// Define error handler
1616
function test_error_handler($err_no, $err_msg, $filename, $linenum, $vars) {
17-
if (error_reporting() != 0) {
17+
if (error_reporting() & $err_no) {
1818
// report non-silenced errors
1919
echo "Error: $err_no - $err_msg, $filename($linenum)\n";
2020
}

‎ext/standard/tests/file/file_get_contents_variation5_64bit.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ echo "*** Testing file_get_contents() : usage variation ***\n";
1616

1717
// Define error handler
1818
function test_error_handler($err_no, $err_msg, $filename, $linenum, $vars) {
19-
if (error_reporting() != 0) {
19+
if (error_reporting() & $err_no) {
2020
// report non-silenced errors
2121
echo "Error: $err_no - $err_msg, $filename($linenum)\n";
2222
}

‎ext/standard/tests/file/file_get_contents_variation6.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ echo "*** Testing file_get_contents() : usage variation ***\n";
1414

1515
// Define error handler
1616
function test_error_handler($err_no, $err_msg, $filename, $linenum, $vars) {
17-
if (error_reporting() != 0) {
17+
if (error_reporting() & $err_no) {
1818
// report non-silenced errors
1919
echo "Error: $err_no - $err_msg, $filename($linenum)\n";
2020
}

‎ext/standard/tests/file/file_put_contents_variation2.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ echo "*** Testing file_put_contents() : usage variation ***\n";
1414

1515
// Define error handler
1616
function test_error_handler($err_no, $err_msg, $filename, $linenum, $vars) {
17-
if (error_reporting() != 0) {
17+
if (error_reporting() & $err_no) {
1818
// report non-silenced errors
1919
echo "Error: $err_no - $err_msg, $filename($linenum)\n";
2020
}

‎ext/standard/tests/file/file_put_contents_variation3.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ echo "*** Testing file_put_contents() : usage variation ***\n";
1414

1515
// Define error handler
1616
function test_error_handler($err_no, $err_msg, $filename, $linenum, $vars) {
17-
if (error_reporting() != 0) {
17+
if (error_reporting() & $err_no) {
1818
// report non-silenced errors
1919
echo "Error: $err_no - $err_msg, $filename($linenum)\n";
2020
}

‎ext/standard/tests/file/file_variation2.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ echo "*** Testing file() : usage variation ***\n";
1212

1313
// Define error handler
1414
function test_error_handler($err_no, $err_msg, $filename, $linenum, $vars) {
15-
if (error_reporting() != 0) {
15+
if (error_reporting() & $err_no) {
1616
// report non-silenced errors
1717
echo "Error: $err_no - $err_msg, $filename($linenum)\n";
1818
}

‎ext/standard/tests/file/file_variation3.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ echo "*** Testing file() : usage variation ***\n";
1414

1515
// Define error handler
1616
function test_error_handler($err_no, $err_msg, $filename, $linenum, $vars) {
17-
if (error_reporting() != 0) {
17+
if (error_reporting() & $err_no) {
1818
// report non-silenced errors
1919
echo "Error: $err_no - $err_msg, $filename($linenum)\n";
2020
}

‎ext/standard/tests/file/file_variation4.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ echo "*** Testing file() : usage variation ***\n";
1212

1313
// Define error handler
1414
function test_error_handler($err_no, $err_msg, $filename, $linenum, $vars) {
15-
if (error_reporting() != 0) {
15+
if (error_reporting() & $err_no) {
1616
// report non-silenced errors
1717
echo "Error: $err_no - $err_msg, $filename($linenum)\n";
1818
}

‎ext/standard/tests/file/fopen_variation3.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ echo "*** Testing fopen() : usage variation ***\n";
1414

1515
// Define error handler
1616
function test_error_handler($err_no, $err_msg, $filename, $linenum, $vars) {
17-
if (error_reporting() != 0) {
17+
if (error_reporting() & $err_no) {
1818
// report non-silenced errors
1919
echo "Error: $err_no - $err_msg, $filename($linenum)\n";
2020
}

‎ext/standard/tests/file/fopen_variation4.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ echo "*** Testing fopen() : usage variation ***\n";
1414

1515
// Define error handler
1616
function test_error_handler($err_no, $err_msg, $filename, $linenum, $vars) {
17-
if (error_reporting() != 0) {
17+
if (error_reporting() & $err_no) {
1818
// report non-silenced errors
1919
echo "Error: $err_no - $err_msg, $filename($linenum)\n";
2020
}

‎ext/standard/tests/file/fwrite_variation5.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ echo "*** Testing fwrite() : usage variation ***\n";
1414

1515
// Define error handler
1616
function test_error_handler($err_no, $err_msg, $filename, $linenum, $vars) {
17-
if (error_reporting() != 0) {
17+
if (error_reporting() & $err_no) {
1818
// report non-silenced errors
1919
echo "Error: $err_no - $err_msg, $filename($linenum)\n";
2020
}

‎ext/standard/tests/file/mkdir_variation1.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ echo "*** Testing mkdir() : usage variation ***\n";
1919

2020
// Define error handler
2121
function test_error_handler($err_no, $err_msg, $filename, $linenum, $vars) {
22-
if (error_reporting() != 0) {
22+
if (error_reporting() & $err_no) {
2323
// report non-silenced errors
2424
echo "Error: $err_no - $err_msg, $filename($linenum)\n";
2525
}

‎ext/standard/tests/file/mkdir_variation2.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ echo "*** Testing mkdir() : usage variation ***\n";
1616

1717
// Define error handler
1818
function test_error_handler($err_no, $err_msg, $filename, $linenum, $vars) {
19-
if (error_reporting() != 0) {
19+
if (error_reporting() & $err_no) {
2020
// report non-silenced errors
2121
echo "Error: $err_no - $err_msg, $filename($linenum)\n";
2222
}

‎ext/standard/tests/file/mkdir_variation3.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ echo "*** Testing mkdir() : usage variation ***\n";
1414

1515
// Define error handler
1616
function test_error_handler($err_no, $err_msg, $filename, $linenum, $vars) {
17-
if (error_reporting() != 0) {
17+
if (error_reporting() & $err_no) {
1818
// report non-silenced errors
1919
echo "Error: $err_no - $err_msg, $filename($linenum)\n";
2020
}

‎ext/standard/tests/file/mkdir_variation4.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ echo "*** Testing mkdir() : usage variation ***\n";
1414

1515
// Define error handler
1616
function test_error_handler($err_no, $err_msg, $filename, $linenum, $vars) {
17-
if (error_reporting() != 0) {
17+
if (error_reporting() & $err_no) {
1818
// report non-silenced errors
1919
echo "Error: $err_no - $err_msg, $filename($linenum)\n";
2020
}

‎ext/standard/tests/file/parse_ini_file_variation4.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ echo "*** Testing parse_ini_file() : usage variation ***\n";
1414

1515
// Define error handler
1616
function test_error_handler($err_no, $err_msg, $filename, $linenum, $vars) {
17-
if (error_reporting() != 0) {
17+
if (error_reporting() & $err_no) {
1818
// report non-silenced errors
1919
echo "Error: $err_no - $err_msg, $filename($linenum)\n";
2020
}

‎ext/standard/tests/file/parse_ini_file_variation5.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ echo "*** Testing parse_ini_file() : usage variation ***\n";
1414

1515
// Define error handler
1616
function test_error_handler($err_no, $err_msg, $filename, $linenum, $vars) {
17-
if (error_reporting() != 0) {
17+
if (error_reporting() & $err_no) {
1818
// report non-silenced errors
1919
echo "Error: $err_no - $err_msg, $filename($linenum)\n";
2020
}

‎ext/standard/tests/file/pathinfo_variation1.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ echo "*** Testing pathinfo() : usage variation ***\n";
1414

1515
// Define error handler
1616
function test_error_handler($err_no, $err_msg, $filename, $linenum, $vars) {
17-
if (error_reporting() != 0) {
17+
if (error_reporting() & $err_no) {
1818
// report non-silenced errors
1919
echo "Error: $err_no - $err_msg, $filename($linenum)\n";
2020
}

‎ext/standard/tests/file/pathinfo_variation2.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ echo "*** Testing pathinfo() : usage variation ***\n";
1616

1717
// Define error handler
1818
function test_error_handler($err_no, $err_msg, $filename, $linenum, $vars) {
19-
if (error_reporting() != 0) {
19+
if (error_reporting() & $err_no) {
2020
// report non-silenced errors
2121
echo "Error: $err_no - $err_msg, $filename($linenum)\n";
2222
}

‎ext/standard/tests/file/pclose_variation1.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ echo "*** Testing pclose() : usage variation ***\n";
1414

1515
// Define error handler
1616
function test_error_handler($err_no, $err_msg, $filename, $linenum, $vars) {
17-
if (error_reporting() != 0) {
17+
if (error_reporting() & $err_no) {
1818
// report non-silenced errors
1919
echo "Error: $err_no - $err_msg, $filename($linenum)\n";
2020
}

‎ext/standard/tests/file/readfile_variation4.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ echo "*** Testing readfile() : usage variation ***\n";
1414

1515
// Define error handler
1616
function test_error_handler($err_no, $err_msg, $filename, $linenum, $vars) {
17-
if (error_reporting() != 0) {
17+
if (error_reporting() & $err_no) {
1818
// report non-silenced errors
1919
echo "Error: $err_no - $err_msg, $filename($linenum)\n";
2020
}

‎ext/standard/tests/file/readfile_variation5.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ echo "*** Testing readfile() : usage variation ***\n";
1414

1515
// Define error handler
1616
function test_error_handler($err_no, $err_msg, $filename, $linenum, $vars) {
17-
if (error_reporting() != 0) {
17+
if (error_reporting() & $err_no) {
1818
// report non-silenced errors
1919
echo "Error: $err_no - $err_msg, $filename($linenum)\n";
2020
}

‎ext/standard/tests/file/rename_variation10.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ echo "*** Testing rename() : usage variation ***\n";
1414

1515
// Define error handler
1616
function test_error_handler($err_no, $err_msg, $filename, $linenum, $vars) {
17-
if (error_reporting() != 0) {
17+
if (error_reporting() & $err_no) {
1818
// report non-silenced errors
1919
echo "Error: $err_no - $err_msg, $filename($linenum)\n";
2020
}

‎ext/standard/tests/file/rmdir_variation1.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ echo "*** Testing rmdir() : usage variation ***\n";
1919

2020
// Define error handler
2121
function test_error_handler($err_no, $err_msg, $filename, $linenum, $vars) {
22-
if (error_reporting() != 0) {
22+
if (error_reporting() & $err_no) {
2323
// report non-silenced errors
2424
echo "Error: $err_no - $err_msg, $filename($linenum)\n";
2525
}

0 commit comments

Comments
 (0)