Merge branch 'PHP-8.1' into PHP-8.2

Author: bukka

sapi/fpm/tests/tester.inc

@@ -617,17 +617,14 @@ class Tester
         string $scriptName = null,
         ?string $stdin = null
     ): array {
-        if (is_null($scriptFilename) && is_null($uri)) {
+        if (is_null($scriptFilename)) {
             $scriptFilename = $this->makeSourceFile();
-        } else {
-            if (is_null($scriptFilename)) {
-                $scriptFilename = $uri;
-            } elseif (is_null($scriptName)) {
-                $scriptName = $uri;
-            }
+        }
+        if (is_null($uri)) {
+            $uri = '/' . basename($scriptFilename);
         }
         if (is_null($scriptName)) {
-            $scriptName = '/' . basename($scriptFilename);
+            $scriptName = $uri;
         }
 
         $params = array_merge(