From fc40e53724ab5a0bc78edc9812dea3dd9c3df524 Mon Sep 17 00:00:00 2001
From: Fabien Potencier <fabien.potencier@gmail.com>
Date: Sat, 9 Jun 2012 21:38:22 +0200
Subject: [PATCH] Revert "merged branch jfsimon/issue-4475 (PR #4497)"

This reverts commit f8a09db5e2364d66465358fe393ce51b49b07144, reversing
changes made to ae2ec36e275d6b43c9d6d7b91b9611f10101df0e.
---
 UPGRADE-2.1.md                                        | 8 --------
 src/Symfony/Component/BrowserKit/CHANGELOG.md         | 4 ----
 src/Symfony/Component/BrowserKit/Client.php           | 8 ++++----
 src/Symfony/Component/HttpKernel/Tests/ClientTest.php | 2 --
 4 files changed, 4 insertions(+), 18 deletions(-)

diff --git a/UPGRADE-2.1.md b/UPGRADE-2.1.md
index 68df03943c..02b230ed44 100644
--- a/UPGRADE-2.1.md
+++ b/UPGRADE-2.1.md
@@ -1028,14 +1028,6 @@
     decoded twice before. Note that the `urldecode()` calls have been changed for a
     single `rawurldecode()` in order to support `+` for input paths.
 
-### BrowserKit
-
-#### BC Breaks
-
-  * The Symfony\Component\HttpKernel\Client::request() method
-    now returns a Symfony\Component\BrowserKit\Response instance
-    (instead of a Symfony\Component\HttpFoundation\Response instance)
-
 ### FrameworkBundle
 
   * session options: lifetime, path, domain, secure, httponly were deprecated.
diff --git a/src/Symfony/Component/BrowserKit/CHANGELOG.md b/src/Symfony/Component/BrowserKit/CHANGELOG.md
index 1fd9293c77..42d32a7efe 100644
--- a/src/Symfony/Component/BrowserKit/CHANGELOG.md
+++ b/src/Symfony/Component/BrowserKit/CHANGELOG.md
@@ -4,9 +4,5 @@ CHANGELOG
 2.1.0
 -----
 
- * [BR BREAK] The Symfony\Component\HttpKernel\Client::request() method
-   now returns a Symfony\Component\BrowserKit\Response instance
-   (instead of a Symfony\Component\HttpFoundation\Response instance)
-
  * [BC BREAK] The CookieJar internals have changed to allow cookies with the
    same name on different sub-domains/sub-paths
diff --git a/src/Symfony/Component/BrowserKit/Client.php b/src/Symfony/Component/BrowserKit/Client.php
index 06b64b3c47..c57b9e37a1 100644
--- a/src/Symfony/Component/BrowserKit/Client.php
+++ b/src/Symfony/Component/BrowserKit/Client.php
@@ -264,17 +264,17 @@ abstract class Client
             $this->response = $this->doRequest($this->request);
         }
 
-        $this->response = $this->filterResponse($this->response);
+        $response = $this->filterResponse($this->response);
 
-        $this->cookieJar->updateFromResponse($this->response);
+        $this->cookieJar->updateFromResponse($response);
 
-        $this->redirect = $this->response->getHeader('Location');
+        $this->redirect = $response->getHeader('Location');
 
         if ($this->followRedirects && $this->redirect) {
             return $this->crawler = $this->followRedirect();
         }
 
-        return $this->crawler = $this->createCrawlerFromContent($request->getUri(), $this->response->getContent(), $this->response->getHeader('Content-Type'));
+        return $this->crawler = $this->createCrawlerFromContent($request->getUri(), $response->getContent(), $response->getHeader('Content-Type'));
     }
 
     /**
diff --git a/src/Symfony/Component/HttpKernel/Tests/ClientTest.php b/src/Symfony/Component/HttpKernel/Tests/ClientTest.php
index 0754bb4119..c1fc6619f9 100644
--- a/src/Symfony/Component/HttpKernel/Tests/ClientTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/ClientTest.php
@@ -11,7 +11,6 @@
 
 namespace Symfony\Component\HttpKernel\Tests;
 
-use Symfony\Component\BrowserKit\Response as DomResponse;
 use Symfony\Component\HttpKernel\Client;
 use Symfony\Component\HttpKernel\HttpKernel;
 use Symfony\Component\HttpFoundation\Request;
@@ -35,7 +34,6 @@ class ClientTest extends \PHPUnit_Framework_TestCase
 
         $client->request('GET', '/');
         $this->assertEquals('Request: /', $client->getResponse()->getContent(), '->doRequest() uses the request handler to make the request');
-        $this->assertTrue($client->getResponse() instanceof DomResponse, '->getResponse() returns a Symfony\Component\BrowserKit\Response instance');
 
         $client->request('GET', 'http://www.example.com/');
         $this->assertEquals('Request: /', $client->getResponse()->getContent(), '->doRequest() uses the request handler to make the request');