Merge branch 'PHP-8.3' into PHP-8.4

alexandre-daubois · alexandre-daubois · commit edf4cc40bd6b · 2025-12-29T14:50:19.000+01:00
* PHP-8.3: Fix variable assignment for PHP argument escaping in `run-tests.php` (php#20799)
diff --git a/run-tests.php b/run-tests.php
@@ -1833,8 +1833,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
`@@ -1833,8 +1833,8 @@ function run_test(string $php, $file, array $env): string`
`1833`	`1833`	`$skipCache = new SkipCache($enableSkipCache, $cfg['keep']['skip']);`
`1834`	`1834`	`}`
`1835`	`1835`
`1836`		`- $orig_php = $php;`
`1837`	`1836`	`$php = escapeshellarg($php);`
	`1837`	`+ $orig_php = $php;`
`1838`	`1838`
`1839`	`1839`	`$retried = false;`
`1840`	`1840`	`retry:`