Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commit 7d987eb

Browse files
committed
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‎

Lines changed: 5 additions & 8 deletions
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)

AltStyle によって変換されたページ (->オリジナル) /