fixed Client implementation to return the right Response (closes #4475)

Author: fabpot

Client.php

@@ -13,6 +13,7 @@
 
 use Symfony\Component\HttpFoundation\File\UploadedFile;
 use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\BrowserKit\Client as BaseClient;
 use Symfony\Component\BrowserKit\Request as DomRequest;
 use Symfony\Component\BrowserKit\Response as DomResponse;
@@ -49,6 +50,26 @@ public function __construct(HttpKernelInterface $kernel, array $server = array()
         $this->followRedirects = false;
     }
 
+    /**
+     * {@inheritdoc}
+     *
+     * @return Request A Request instance
+     */
+    public function getOriginRequest()
+    {
+        return parent::getOriginRequest();
+    }
+
+    /**
+     * {@inheritdoc}
+     *
+     * @return Response A Response instance
+     */
+    public function getOriginResponse()
+    {
+        return parent::getOriginResponse();
+    }
+
     /**
      * Makes a request.
      *

Tests/ClientTest.php

@@ -35,13 +35,17 @@ public function testDoRequest()
 
         $client->request('GET', '/');
         $this->assertEquals('Request: /', $client->getResponse()->getContent(), '->doRequest() uses the request handler to make the request');
+        $this->assertInstanceOf('Symfony\Component\BrowserKit\Request', $client->getRequest());
+        $this->assertInstanceOf('Symfony\Component\HttpFoundation\Request', $client->getOriginRequest());
+        $this->assertInstanceOf('Symfony\Component\BrowserKit\Response', $client->getResponse());
+        $this->assertInstanceOf('Symfony\Component\HttpFoundation\Response', $client->getOriginResponse());
 
         $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');
+        $this->assertEquals('www.example.com', $client->getOriginRequest()->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');
+        $this->assertEquals('http://www.example.com/?parameter='.urlencode('http://google.com'), $client->getOriginRequest()->getUri(), '->doRequest() uses the request handler to make the request');
     }
 
     public function testGetScript()
@@ -120,7 +124,7 @@ public function testUploadedFile()
         foreach ($files as $file) {
             $client->request('POST', '/', array(), array('foo' => $file));
 
-            $files = $client->getRequest()->files->all();
+            $files = $client->getOriginRequest()->files->all();
 
             $this->assertCount(1, $files);
 
@@ -159,7 +163,7 @@ public function testUploadedFileWhenSizeExceedsUploadMaxFileSize()
 
         $client->request('POST', '/', array(), array($file));
 
-        $files = $client->getRequest()->files->all();
+        $files = $client->getOriginRequest()->files->all();
 
         $this->assertCount(1, $files);