bug symfony#62091 [BrowserKit] The BrowserKit history with parameter separator without slash. (biozshock)

nicolas-grekas · nicolas-grekas · commit b88230bd2c89 · 2025-11-05T08:52:43.000+01:00
This PR was merged into the 6.4 branch. Discussion ---------- [BrowserKit] The BrowserKit history with parameter separator without slash. | Q | A | ------------- | --- | Branch? | 6.4 | Bug fix? | yes | New feature? | no  | Deprecations? | no  | License | MIT When the test browser hits the page with the `?` parameters separator without the slash `/`, and next call requires query parameters, the test is failing. Commits ------- 877b5cd The BrowserKit history with parameter separator without slash.
diff --git a/src/Symfony/Component/BrowserKit/AbstractBrowser.php b/src/Symfony/Component/BrowserKit/AbstractBrowser.php
@@ -656,7 +656,7 @@ protected function getAbsoluteUri(string $uri): string
             $uri = $path.$uri;
         }
 
-        return preg_replace('#^(.*?//[^/]+)\/.*$#', '$1', $currentUri).$uri;
+        return preg_replace('#^(.*?//[^/?]+)[/?].*$#', '$1', $currentUri).$uri;
     }
 
     /**
diff --git a/src/Symfony/Component/BrowserKit/Tests/AbstractBrowserTest.php b/src/Symfony/Component/BrowserKit/Tests/AbstractBrowserTest.php
@@ -889,4 +889,13 @@ public function testInternalRequestNull()
 
         $client->getInternalRequest();
     }
+
+    public function testHistoryWithParametersAndNoSlash()
+    {
+        $client = $this->getBrowser();
+        $client->request('GET', 'https://www.example.com?the=value');
+        $client->request('GET', '/path/?parameter=value');
+
+        $this->assertSame('https://www.example.com/path/?parameter=value', $client->getRequest()->getUri(), '->request() history provides proper base.');
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -656,7 +656,7 @@ protected function getAbsoluteUri(string $uri): string`
`656`	`656`	`$uri = $path.$uri;`
`657`	`657`	`}`
`658`	`658`
`659`		`- return preg_replace('#^(.?//[^/]+)\/.$#', '$1', $currentUri).$uri;`
	`659`	`+ return preg_replace('#^(.?//[^/?]+)[/?].$#', '$1', $currentUri).$uri;`
`660`	`660`	`}`
`661`	`661`
`662`	`662`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -889,4 +889,13 @@ public function testInternalRequestNull()`
`889`	`889`
`890`	`890`	`$client->getInternalRequest();`
`891`	`891`	`}`
	`892`	`+`
	`893`	`+ public function testHistoryWithParametersAndNoSlash()`
	`894`	`+ {`
	`895`	`+ $client = $this->getBrowser();`
	`896`	`+ $client->request('GET', 'https://www.example.com?the=value');`
	`897`	`+ $client->request('GET', '/path/?parameter=value');`
	`898`	`+`
	`899`	`+ $this->assertSame('https://www.example.com/path/?parameter=value', $client->getRequest()->getUri(), '->request() history provides proper base.');`
	`900`	`+ }`
`892`	`901`	`}`