Fix FPM tester $scriptName logic

php · Mar 17, 2023 · 7d987eb · 7d987eb
1 parent 38d2e7e
commit 7d987eb
Showing 1 changed file with 5 additions and 8 deletions.
diff --git a/sapi/fpm/tests/tester.inc b/sapi/fpm/tests/tester.inc
@@ -586,17 +586,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(