Skip to content

Commit 52047ad

Browse files
nikicnikic
committed
Only force log startup errors if display_startup_errors disabled
Otherwise this results in duplicate errors. Closes GH-5941.
1 parent af64001 commit 52047ad

12 files changed

+5
-31
lines changed

‎ext/mbstring/tests/ini_mbstring_invalid.phpt

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,6 @@ mbstring.strict_detection=BOOL_STRICT_DETECTION
1818
// Empty as we are only testing INI settings
1919
?>
2020
--EXPECT--
21-
PHP Warning: PHP Startup: INI setting contains invalid encoding "DETECT_ORDER" in Unknown on line 0
22-
PHP Deprecated: PHP Startup: Use of mbstring.http_input is deprecated in Unknown on line 0
23-
PHP Warning: PHP Startup: INI setting contains invalid encoding "HTTP_INPUT" in Unknown on line 0
24-
PHP Deprecated: PHP Startup: Use of mbstring.http_output is deprecated in Unknown on line 0
25-
PHP Deprecated: PHP Startup: Use of mbstring.internal_encoding is deprecated in Unknown on line 0
26-
PHP Warning: PHP Startup: Unknown encoding "UNKNOWN_ENCODING" in ini setting in Unknown on line 0
27-
2821
Warning: PHP Startup: INI setting contains invalid encoding "DETECT_ORDER" in Unknown on line 0
2922

3023
Deprecated: PHP Startup: Use of mbstring.http_input is deprecated in Unknown on line 0

‎ext/mbstring/tests/mb_get_info.phpt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,6 @@ foreach (array_keys($result) as $key) {
2323
}
2424
?>
2525
--EXPECT--
26-
PHP Deprecated: PHP Startup: Use of mbstring.http_input is deprecated in Unknown on line 0
27-
PHP Deprecated: PHP Startup: Use of mbstring.http_output is deprecated in Unknown on line 0
28-
PHP Deprecated: PHP Startup: Use of mbstring.internal_encoding is deprecated in Unknown on line 0
29-
3026
Deprecated: PHP Startup: Use of mbstring.http_input is deprecated in Unknown on line 0
3127

3228
Deprecated: PHP Startup: Use of mbstring.http_output is deprecated in Unknown on line 0

‎ext/mbstring/tests/mb_internal_encoding_ini_basic2.phpt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@ echo ini_get('mbstring.internal_encoding')."\n";
2020

2121
?>
2222
--EXPECT--
23-
PHP Deprecated: PHP Startup: Use of mbstring.internal_encoding is deprecated in Unknown on line 0
24-
2523
Deprecated: PHP Startup: Use of mbstring.internal_encoding is deprecated in Unknown on line 0
2624
*** Testing INI mbstring.internal_encoding : basic functionality ***
2725
ISO-8859-7

‎ext/mbstring/tests/mb_internal_encoding_ini_invalid_encoding.phpt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,6 @@ echo ini_get('mbstring.internal_encoding')."\n";
2020

2121
?>
2222
--EXPECT--
23-
PHP Deprecated: PHP Startup: Use of mbstring.internal_encoding is deprecated in Unknown on line 0
24-
PHP Warning: PHP Startup: Unknown encoding "BAD" in ini setting in Unknown on line 0
25-
2623
Deprecated: PHP Startup: Use of mbstring.internal_encoding is deprecated in Unknown on line 0
2724

2825
Warning: PHP Startup: Unknown encoding "BAD" in ini setting in Unknown on line 0

‎ext/session/tests/bug60860.phpt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ include('skipif.inc');
66
?>
77
--INI--
88
session.save_handler=user
9-
display_errors=off
109
error_log=
1110
--FILE--
1211
<?php
@@ -16,5 +15,5 @@ echo "ok\n";
1615

1716
?>
1817
--EXPECT--
19-
PHP Recoverable fatal error: PHP Startup: Cannot set 'user' save handler by ini_set() or session_module_name() in Unknown on line 0
18+
Recoverable fatal error: PHP Startup: Cannot set 'user' save handler by ini_set() or session_module_name() in Unknown on line 0
2019
ok

‎ext/session/tests/bug66481.phpt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@ ob_start();
1212
var_dump(session_name("foo"));
1313
var_dump(session_name("bar"));
1414
--EXPECT--
15-
PHP Warning: PHP Startup: session.name cannot be a numeric or empty '' in Unknown on line 0
16-
1715
Warning: PHP Startup: session.name cannot be a numeric or empty '' in Unknown on line 0
1816
string(9) "PHPSESSID"
1917
string(3) "foo"

‎ext/session/tests/rfc1867_invalid_settings.phpt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,5 @@ include('skipif.inc');
1212
var_dump(ini_get("session.upload_progress.freq"));
1313
?>
1414
--EXPECTF--
15-
PHP Warning: PHP Startup: session.upload_progress.freq must be greater than or equal to zero in %s
16-
1715
Warning: PHP Startup: session.upload_progress.freq must be greater than or equal to zero in %s
1816
string(%d) "1%"

‎ext/session/tests/rfc1867_invalid_settings_2.phpt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,5 @@ include('skipif.inc');
1212
var_dump(ini_get("session.upload_progress.freq"));
1313
?>
1414
--EXPECTF--
15-
PHP Warning: PHP Startup: session.upload_progress.freq cannot be over 100% in %s
16-
1715
Warning: PHP Startup: session.upload_progress.freq cannot be over 100% in %s
1816
string(%d) "1%"

‎ext/session/tests/session_set_save_handler_class_014.phpt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@ Test session_set_save_handler() : calling default handler when save_handler=user
33
--INI--
44
session.save_handler=user
55
session.name=PHPSESSID
6-
display_errors=off
7-
error_log=
86
--SKIPIF--
97
<?php
108
include('skipif.inc');
@@ -22,5 +20,5 @@ session_set_save_handler($handler);
2220

2321
session_start();
2422
--EXPECT--
25-
PHP Recoverable fatal error: PHP Startup: Cannot set 'user' save handler by ini_set() or session_module_name() in Unknown on line 0
23+
Recoverable fatal error: PHP Startup: Cannot set 'user' save handler by ini_set() or session_module_name() in Unknown on line 0
2624
*** Testing session_set_save_handler() : calling default handler when save_handler=user ***

‎ext/standard/tests/strings/htmlentities25.phpt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,5 @@ var_dump(htmlentities('äöü'));
1515

1616
?>
1717
--EXPECT--
18-
PHP Deprecated: PHP Startup: Use of mbstring.internal_encoding is deprecated in Unknown on line 0
19-
2018
Deprecated: PHP Startup: Use of mbstring.internal_encoding is deprecated in Unknown on line 0
2119
string(18) "&auml;&ouml;&uuml;"

‎main/main.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1312,7 +1312,8 @@ static ZEND_COLD void php_error_cb(int orig_type, const char *error_filename, co
13121312
break;
13131313
}
13141314

1315-
if (!module_initialized || PG(log_errors)) {
1315+
if (PG(log_errors)
1316+
|| (!module_initialized && (!PG(display_startup_errors) || !PG(display_errors)))) {
13161317
char *log_buffer;
13171318
#ifdef PHP_WIN32
13181319
if (type == E_CORE_ERROR || type == E_CORE_WARNING) {

‎tests/run-test/bug75042-3.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@ nonexistentsharedmodule
99
--FILE--
1010
<?php
1111
--EXPECTF--
12-
PHP Warning: PHP Startup: Unable to load dynamic library '%snonexistentsharedmodule.%s' %A
12+
Warning: PHP Startup: Unable to load dynamic library '%snonexistentsharedmodule.%s' %A

0 commit comments

Comments
 (0)