archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-8.0'

Browse source
This commit is contained in:
Bob Weinand 2021-06-04 16:29:40 +02:00
commit 0dbbf9ec47
1 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
run-tests.php
View file

@ -1678,6 +1678,7 @@ escape:
'E_USER_NOTICE', 'E_USER_NOTICE',
'E_STRICT', // TODO Cleanup when removed from Zend Engine. 'E_STRICT', // TODO Cleanup when removed from Zend Engine.
'E_RECOVERABLE_ERROR', 'E_RECOVERABLE_ERROR',
'E_DEPRECATED',
'E_USER_DEPRECATED' 'E_USER_DEPRECATED'
]; ];
$error_consts = array_combine(array_map('constant', $error_consts), $error_consts); $error_consts = array_combine(array_map('constant', $error_consts), $error_consts);
@ -2756,7 +2757,7 @@ $output
if (strpos($log_format, 'S') !== false) { if (strpos($log_format, 'S') !== false) {
$env_lines = []; $env_lines = [];
foreach ($env as $env_var => $env_val) { foreach ($env as $env_var => $env_val) {
$env_lines[] = "export $env_var=" . escapeshellarg($env_val); $env_lines[] = "export $env_var=" . escapeshellarg($env_val ?? "");
} }
$exported_environment = $env_lines ? "\n" . implode("\n", $env_lines) . "\n" : ""; $exported_environment = $env_lines ? "\n" . implode("\n", $env_lines) . "\n" : "";
$sh_script = <<<SH $sh_script = <<<SH