Merge branch '2.1' into 2.2

* 2.1:
  Add a public modifier to an interface method
  [HttpRequest] fixes Request::getLanguages() bug
  [HttpCache] added a test (cached content should be kept after purging)
  [DoctrineBridge] Fixed non-utf-8 recognition
  [Security] fixed HttpUtils class tests

1 files changed, 4 insertions, 4 deletions

diff --git a/Tests/Http/HttpUtilsTest.php b/Tests/Http/HttpUtilsTest.php
index 8a2d2f0..bf078da 100644
--- a/Tests/Http/HttpUtilsTest.php
+++ b/Tests/Http/HttpUtilsTest.php
@@ -137,16 +137,16 @@ class HttpUtilsTest extends \PHPUnit_Framework_TestCase
         $utils->checkRequestPath($this->getRequest(), 'foobar');
     }
 
-    public function testGenerateUrlRemovesQueryString()
+    public function testGenerateUriRemovesQueryString()
     {
-        $method = new \ReflectionMethod('Symfony\Component\Security\Http\HttpUtils', 'generateUrl');
+        $method = new \ReflectionMethod('Symfony\Component\Security\Http\HttpUtils', 'generateUri');
         $method->setAccessible(true);
 
         $utils = new HttpUtils($this->getUrlGenerator());
-        $this->assertEquals('/foo/bar', $method->invoke($utils, 'route_name'));
+        $this->assertEquals('/foo/bar', $method->invoke($utils, new Request(), 'route_name'));
 
         $utils = new HttpUtils($this->getUrlGenerator('/foo/bar?param=value'));
-        $this->assertEquals('/foo/bar', $method->invoke($utils, 'route_name'));
+        $this->assertEquals('/foo/bar', $method->invoke($utils, new Request(), 'route_name'));
     }
 
     private function getUrlGenerator($generatedUrl = '/foo/bar')