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

Author: Girgias

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);

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
 );