Skip to content

Commit 7d987eb

Browse files
committedMar 17, 2023
Fix FPM tester $scriptName logic
1 parent 38d2e7e commit 7d987eb

File tree

1 file changed

+5
-8
lines changed

1 file changed

+5
-8
lines changed
 

‎sapi/fpm/tests/tester.inc

+5-8
Original file line numberDiff line numberDiff line change
@@ -586,17 +586,14 @@ class Tester
586586
string $scriptName = null,
587587
?string $stdin = null
588588
): array {
589-
if (is_null($scriptFilename) && is_null($uri)) {
589+
if (is_null($scriptFilename)) {
590590
$scriptFilename = $this->makeSourceFile();
591-
} else {
592-
if (is_null($scriptFilename)) {
593-
$scriptFilename = $uri;
594-
} elseif (is_null($scriptName)) {
595-
$scriptName = $uri;
596-
}
591+
}
592+
if (is_null($uri)) {
593+
$uri = '/' . basename($scriptFilename);
597594
}
598595
if (is_null($scriptName)) {
599-
$scriptName = '/' . basename($scriptFilename);
596+
$scriptName = $uri;
600597
}
601598

602599
$params = array_merge(

0 commit comments

Comments
 (0)