Merge branch 'PHP-8.4' into PHP-8.5

alexandre-daubois · alexandre-daubois · commit de61d83b0a0a · 2025-12-29T14:50:34.000+01:00
* PHP-8.4: Fix variable assignment for PHP argument escaping in `run-tests.php` (#20799)
diff --git a/run-tests.php b/run-tests.php
@@ -1821,8 +1821,8 @@ function run_test(string $php, $file, array $env): string
         $skipCache = new SkipCache($enableSkipCache, $cfg['keep']['skip']);
     }
 
-    $orig_php = $php;
     $php = escapeshellarg($php);
+    $orig_php = $php;
 
     $retried = false;
 retry:

Original file line number	Diff line number	Diff line change
`@@ -1821,8 +1821,8 @@ function run_test(string $php, $file, array $env): string`
`1821`	`1821`	`$skipCache = new SkipCache($enableSkipCache, $cfg['keep']['skip']);`
`1822`	`1822`	`}`
`1823`	`1823`
`1824`		`- $orig_php = $php;`
`1825`	`1824`	`$php = escapeshellarg($php);`
	`1825`	`+ $orig_php = $php;`
`1826`	`1826`
`1827`	`1827`	`$retried = false;`
`1828`	`1828`	`retry:`