bug #36592 [BrowserKit] Allow Referer set by history to be overridden (Slamdunk)

nicolas-grekas · nicolas-grekas · commit cb7e78c809f2 · 2020-05-16T12:06:03.000+02:00
This PR was merged into the 3.4 branch. Discussion ---------- [BrowserKit] Allow Referer set by history to be overridden | Q | A | ------------- | --- | Branch? | 3.4, see #36591 for 5.0 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | | License | MIT | Doc PR | Commits ------- 4774946 [BrowserKit] Allow Referer set by history to be overridden (3.4)
diff --git a/src/Symfony/Component/BrowserKit/Client.php b/src/Symfony/Component/BrowserKit/Client.php
@@ -294,7 +294,7 @@ public function request($method, $uri, array $parameters = [], array $files = []
             $uri = preg_replace('{^'.parse_url($uri, PHP_URL_SCHEME).'}', $server['HTTPS'] ? 'https' : 'http', $uri);
         }
 
-        if (!$this->history->isEmpty()) {
+        if (!isset($server['HTTP_REFERER']) && !$this->history->isEmpty()) {
             $server['HTTP_REFERER'] = $this->history->current()->getUri();
         }
 
diff --git a/src/Symfony/Component/BrowserKit/Tests/ClientTest.php b/src/Symfony/Component/BrowserKit/Tests/ClientTest.php
@@ -233,6 +233,15 @@ public function testRequestReferer()
         $this->assertEquals('http://www.example.com/foo/foobar', $server['HTTP_REFERER'], '->request() sets the referer');
     }
 
+    public function testRequestRefererCanBeOverridden()
+    {
+        $client = new TestClient();
+        $client->request('GET', 'http://www.example.com/foo/foobar');
+        $client->request('GET', 'bar', [], [], ['HTTP_REFERER' => 'xyz']);
+        $server = $client->getRequest()->getServer();
+        $this->assertEquals('xyz', $server['HTTP_REFERER'], '->request() allows referer to be overridden');
+    }
+
     public function testRequestHistory()
     {
         $client = new TestClient();

Original file line number	Diff line number	Diff line change
`@@ -294,7 +294,7 @@ public function request($method, $uri, array $parameters = [], array $files = []`
`294`	`294`	`$uri = preg_replace('{^'.parse_url($uri, PHP_URL_SCHEME).'}', $server['HTTPS'] ? 'https' : 'http', $uri);`
`295`	`295`	`}`
`296`	`296`
`297`		`- if (!$this->history->isEmpty()) {`
	`297`	`+ if (!isset($server['HTTP_REFERER']) && !$this->history->isEmpty()) {`
`298`	`298`	`$server['HTTP_REFERER'] = $this->history->current()->getUri();`
`299`	`299`	`}`
`300`	`300`