From 7d987ebbbf3f4841c8454bc403b3c6ab82603a3e Mon Sep 17 00:00:00 2001 From: Jakub Zelenka Date: Fri, 17 Mar 2023 14:55:51 +0000 Subject: [PATCH] Fix FPM tester $scriptName logic --- sapi/fpm/tests/tester.inc | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/sapi/fpm/tests/tester.inc b/sapi/fpm/tests/tester.inc index ee4dff4b958..0b6ad9d0f83 100644 --- 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(