[BrowserKit] Fixed the handling of parameters when redirecting

stof · stof · commit 0e437c597872 · 2013-09-16T19:28:51.000+02:00
POST parameters should not be transmitted as GET parameters after the
redirection when changing the method.
diff --git a/src/Symfony/Component/BrowserKit/Client.php b/src/Symfony/Component/BrowserKit/Client.php
@@ -435,10 +435,17 @@ public function followRedirect()
             $content = $request->getContent();
         }
 
+        if ('get' === strtolower($method)) {
+            // Don't forward parameters for GET request as it should reach the redirection URI
+            $parameters = array();
+        } else {
+            $parameters = $request->getParameters();
+        }
+
         $server = $request->getServer();
         unset($server['HTTP_IF_NONE_MATCH'], $server['HTTP_IF_MODIFIED_SINCE']);
 
-        return $this->request($method, $this->redirect, $request->getParameters(), $files, $server, $content);
+        return $this->request($method, $this->redirect, $parameters, $files, $server, $content);
     }
 
     /**
diff --git a/src/Symfony/Component/BrowserKit/Tests/ClientTest.php b/src/Symfony/Component/BrowserKit/Tests/ClientTest.php
@@ -329,9 +329,10 @@ public function testFollowRedirect()
 
         $client = new TestClient();
         $client->setNextResponse(new Response('', 302, array('Location' => 'http://www.example.com/redirected')));
-        $client->request('POST', 'http://www.example.com/foo/foobar');
+        $client->request('POST', 'http://www.example.com/foo/foobar', array('name' => 'bar'));
 
         $this->assertEquals('get', $client->getRequest()->getMethod(), '->followRedirect() uses a get for 302');
+        $this->assertEquals(array(), $client->getRequest()->getParameters(), '->followRedirect() does not submit parameters when changing the method');
     }
 
     public function testFollowRedirectWithCookies()

Original file line number	Diff line number	Diff line change
`@@ -329,9 +329,10 @@ public function testFollowRedirect()`
`329`	`329`
`330`	`330`	`$client = new TestClient();`
`331`	`331`	`$client->setNextResponse(new Response('', 302, array('Location' => 'http://www.example.com/redirected')));`
`332`		`- $client->request('POST', 'http://www.example.com/foo/foobar');`
	`332`	`+ $client->request('POST', 'http://www.example.com/foo/foobar', array('name' => 'bar'));`
`333`	`333`
`334`	`334`	`$this->assertEquals('get', $client->getRequest()->getMethod(), '->followRedirect() uses a get for 302');`
	`335`	`+ $this->assertEquals(array(), $client->getRequest()->getParameters(), '->followRedirect() does not submit parameters when changing the method');`
`335`	`336`	`}`
`336`	`337`
`337`	`338`	`public function testFollowRedirectWithCookies()`