Browse Source

Merge remote branch 'opensky/hotfix/test_client'

* opensky/hotfix/test_client:
  [HttpKernel] added test for uri change
  [HttpKernel] got rid of url transformation into uri, as parse_url doesn't work with uris
Fabien Potencier 14 years ago
parent
commit
72586b2d5f

+ 1 - 6
src/Symfony/Component/HttpKernel/Client.php

@@ -95,12 +95,7 @@ EOF;
      */
     protected function filterRequest(DomRequest $request)
     {
-        $uri = $request->getUri();
-        if (preg_match('#^https?\://([^/]+)/(.*)$#', $uri, $matches)) {
-            $uri = '/'.$matches[2];
-        }
-
-        return Request::create($uri, $request->getMethod(), $request->getParameters(), $request->getCookies(), $request->getFiles(), $request->getServer(), $request->getContent());
+        return Request::create($request->getUri(), $request->getMethod(), $request->getParameters(), $request->getCookies(), $request->getFiles(), $request->getServer(), $request->getContent());
     }
 
     /**

+ 3 - 0
tests/Symfony/Tests/Component/HttpKernel/ClientTest.php

@@ -44,6 +44,9 @@ class ClientTest extends \PHPUnit_Framework_TestCase
         $client->request('GET', 'http://www.example.com/');
         $this->assertEquals('Request: /', $client->getResponse()->getContent(), '->doRequest() uses the request handler to make the request');
         $this->assertEquals('www.example.com', $client->getRequest()->getHost(), '->doRequest() uses the request handler to make the request');
+
+        $client->request('GET', 'http://www.example.com/?parameter=http://google.com');
+        $this->assertEquals('http://www.example.com/?parameter='.urlencode('http://google.com'), $client->getRequest()->getUri(), '->doRequest() uses the request handler to make the request');
     }
 
     public function testGetScript()