Skip to content

Commit 839bdf1

Browse files
krakjoekrakjoe
committed
Merge branch 'PHP-7.4'
* PHP-7.4: Don't silence fatal errors with @
2 parents 4e0dd6b + abd3628 commit 839bdf1

Some content is hidden

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

49 files changed

+64
-54
lines changed

‎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
@@ -3749,7 +3749,8 @@ static void cleanup_live_vars(zend_execute_data *execute_data, uint32_t op_num,
37493749
}
37503750
} else if (kind == ZEND_LIVE_SILENCE) {
37513751
/* restore previous error_reporting value */
3752-
if (!EG(error_reporting) && Z_LVAL_P(var) != 0) {
3752+
if (E_HAS_ONLY_FATAL_ERRORS(EG(error_reporting))
3753+
&& !E_HAS_ONLY_FATAL_ERRORS(Z_LVAL_P(var))) {
37533754
EG(error_reporting) = Z_LVAL_P(var);
37543755
}
37553756
}

‎Zend/zend_vm_def.h

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

66816681
ZVAL_LONG(EX_VAR(opline->result.var), EG(error_reporting));
66826682

6683-
if (EG(error_reporting)) {
6683+
if (!E_HAS_ONLY_FATAL_ERRORS(EG(error_reporting))) {
66846684
do {
6685-
EG(error_reporting) = 0;
6685+
/* Do not silence fatal errors */
6686+
EG(error_reporting) &= E_FATAL_ERRORS;
66866687
if (!EG(error_reporting_ini_entry)) {
66876688
zval *zv = zend_hash_find_ex(EG(ini_directives), ZSTR_KNOWN(ZEND_STR_ERROR_REPORTING), 1);
66886689
if (zv) {
@@ -6711,7 +6712,8 @@ ZEND_VM_HANDLER(58, ZEND_END_SILENCE, TMP, ANY)
67116712
{
67126713
USE_OPLINE
67136714

6714-
if (!EG(error_reporting) && Z_LVAL_P(EX_VAR(opline->op1.var)) != 0) {
6715+
if (E_HAS_ONLY_FATAL_ERRORS(EG(error_reporting))
6716+
&& !E_HAS_ONLY_FATAL_ERRORS(Z_LVAL_P(EX_VAR(opline->op1.var)))) {
67156717
EG(error_reporting) = Z_LVAL_P(EX_VAR(opline->op1.var));
67166718
}
67176719
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) {
@@ -19472,7 +19473,8 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_END_SILENCE_SPEC_TMP_HANDLER(Z
1947219473
{
1947319474
USE_OPLINE
1947419475

19475-
if (!EG(error_reporting) && Z_LVAL_P(EX_VAR(opline->op1.var)) != 0) {
19476+
if (E_HAS_ONLY_FATAL_ERRORS(EG(error_reporting))
19477+
&& !E_HAS_ONLY_FATAL_ERRORS(Z_LVAL_P(EX_VAR(opline->op1.var)))) {
1947619478
EG(error_reporting) = Z_LVAL_P(EX_VAR(opline->op1.var));
1947719479
}
1947819480
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
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ echo "*** Testing rmdir() : 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/touch_variation3.phpt

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

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

0 commit comments

Comments
 (0)