[php-src] PHP-8.5: Merge branch 'PHP-8.4' into PHP-8.5

Author: Gina Peter Banyard (Girgias) Date: 2026-09-30T15:56:17+01:00 Commit: https://github.com/php/php-src/commit/5b9cb8101c84a3ce6abd29995498614d8fca292b Raw diff: https://github.com/php/php-src/commit/5b9cb8101c84a3ce6abd29995498614d8fca292b.diff Merge branch 'PHP-8.4' into PHP-8.5 * PHP-8.4: ext/soap/tests/bugs/bug62900.phpt: make use of TEST_PHP_ vars sapi/cli/tests/php_cli_server_ipv6_error_message.phpt: use TEST_PHP_ vars Changed paths: M ext/soap/tests/bugs/bug62900.phpt M sapi/cli/tests/php_cli_server_ipv6_error_message.phpt Diff: diff --git a/ext/soap/tests/bugs/bug62900.phpt b/ext/soap/tests/bugs/bug62900.phpt index 64e71aa5aaf2..5c2931650f9d 100644 --- a/ext/soap/tests/bugs/bug62900.phpt +++ b/ext/soap/tests/bugs/bug62900.phpt @@ -46,18 +46,15 @@ $combinations = [ chdir(__DIR__); -$args = ["-d", "display_startup_errors=0", "-d", "extension_dir=" . ini_get("extension_dir"), "-d", "extension=" . (substr(PHP_OS, 0, 3) == "WIN" ? "php_" : "") . "soap." . PHP_SHLIB_SUFFIX]; -if (php_ini_loaded_file()) { - // Necessary such that it works from a development directory in which case extension_dir might not be the real extension dir - $args[] = "-c"; - $args[] = php_ini_loaded_file(); -} +$php = getenv('TEST_PHP_EXECUTABLE'); +$args = getenv('TEST_PHP_EXTRA_ARGS'); +$cmd = "$php $args " . __DIR__ . '/bug62900_run'; foreach ($combinations as list($wsdl, $xsd)) { file_put_contents(__DIR__."/bug62900.wsdl", $wsdl); file_put_contents(__DIR__."/bug62900.xsd", $xsd); - $proc = proc_open([PHP_BINARY, ...$args, __DIR__.'/bug62900_run'], [1 => ["pipe", "w"], 2 => ["pipe", "w"]], $pipes); + $proc = proc_open($cmd, [1 => ["pipe", "w"], 2 => ["pipe", "w"]], $pipes); echo stream_get_contents($pipes[1]); fclose($pipes[1]); proc_close($proc); diff --git a/sapi/cli/tests/php_cli_server_ipv6_error_message.phpt b/sapi/cli/tests/php_cli_server_ipv6_error_message.phpt index 55432eeec15e..a3d552c8e368 100644 --- a/sapi/cli/tests/php_cli_server_ipv6_error_message.phpt +++ b/sapi/cli/tests/php_cli_server_ipv6_error_message.phpt @@ -14,8 +14,12 @@ $descriptorspec = array( 2 => array("pipe", "w") ); +$php = getenv('TEST_PHP_EXECUTABLE_ESCAPED'); +$args = getenv('TEST_PHP_EXTRA_ARGS'); +$cmd = "$php $args" . ' -S "[2001:db8::]:8080"'; + $process = proc_open( - PHP_BINARY . ' -S "[2001:db8::]:8080"', + $cmd, $descriptorspec, $pipes );