Commit 3e458e5fdc7 for php
commit 3e458e5fdc7d41d2fc0dc09432ffe6c1cc8343f9
Merge: d11cbf88561 b1a3a4e082d
Author: Gina Peter Banyard <girgias@php.net>
Date: Wed Oct 14 18:43:37 2026 +0100
Merge branch 'PHP-8.5' into PHP-8.6
* PHP-8.5:
Update NEWS
ext/standard/tests: work around Windows quoting with tempfiles.
.github/scripts/windows: pass an extension_dir to the test runner.
{ext/standard,sapi/cli}/tests: pass TEST_PHP_EXTRA_ARGS to php
ext/standard/tests: pass TEST_PHP_EXTRA_ARGS to some proc_open() tests
sapi/cli/tests/023.phpt: support TEST_PHP_EXTRA_ARGS
std: Fix memory leak of the last response headers after a nested HTTP request (#24201)
Fiber: hold the object a callable resolved to in the creating frame (#24134)
diff --cc ext/standard/tests/general_functions/proc_open_redirect.phpt
index a3d185d04f7,add5e6031ee..d550d5da09f
--- a/ext/standard/tests/general_functions/proc_open_redirect.phpt
+++ b/ext/standard/tests/general_functions/proc_open_redirect.phpt
@@@ -4,22 -4,25 +4,25 @@@ Redirection support in proc_ope
<?php
$php = getenv('TEST_PHP_EXECUTABLE');
+ $args = getenv('TEST_PHP_EXTRA_ARGS');
+ $cmd = "$php $args";
+
try {
- proc_open([$php], [['redirect']], $pipes);
+ proc_open($cmd, [['redirect']], $pipes);
-} catch (ValueError $exception) {
- echo $exception->getMessage() . "\n";
+} catch (Throwable $exception) {
+ echo $exception::class, ': ', $exception->getMessage(), "\n";
}
try {
- proc_open([$php], [['redirect', 'foo']], $pipes);
+ proc_open($cmd, [['redirect', 'foo']], $pipes);
-} catch (ValueError $exception) {
- echo $exception->getMessage() . "\n";
+} catch (Throwable $exception) {
+ echo $exception::class, ': ', $exception->getMessage(), "\n";
}
try {
- proc_open([$php], [['redirect', 42]], $pipes);
+ proc_open($cmd, [['redirect', 42]], $pipes);
-} catch (ValueError $exception) {
- echo $exception->getMessage() . "\n";
+} catch (Throwable $exception) {
+ echo $exception::class, ': ', $exception->getMessage(), "\n";
}
echo "\nWith pipe:\n";