Skip to content

Commit 0dbbf9e

Browse files
committed
Merge branch 'PHP-8.0'
2 parents 953143d + c916613 commit 0dbbf9e

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

run-tests.php

+2-1
Original file line numberDiff line numberDiff line change
@@ -1678,6 +1678,7 @@ function run_all_tests_parallel(array $test_files, array $env, $redir_tested): v
16781678
'E_USER_NOTICE',
16791679
'E_STRICT', // TODO Cleanup when removed from Zend Engine.
16801680
'E_RECOVERABLE_ERROR',
1681+
'E_DEPRECATED',
16811682
'E_USER_DEPRECATED'
16821683
];
16831684
$error_consts = array_combine(array_map('constant', $error_consts), $error_consts);
@@ -2756,7 +2757,7 @@ function run_test(string $php, $file, array $env): string
27562757
if (strpos($log_format, 'S') !== false) {
27572758
$env_lines = [];
27582759
foreach ($env as $env_var => $env_val) {
2759-
$env_lines[] = "export $env_var=" . escapeshellarg($env_val);
2760+
$env_lines[] = "export $env_var=" . escapeshellarg($env_val ?? "");
27602761
}
27612762
$exported_environment = $env_lines ? "\n" . implode("\n", $env_lines) . "\n" : "";
27622763
$sh_script = <<<SH

0 commit comments

Comments
 (0)