Merge branch '3.4' into 4.3

* 3.4:
  ensure compatibility with type resolver 0.5
  Call AssertEquals with proper parameters
  [Twig] Fix Twig config extra keys
  fix tests depending on other components' tests

Author: xabbuh

Tests/JsonResponseTest.php

@@ -43,7 +43,7 @@ public function testConstructorWithSimpleTypes()
         $this->assertSame('0', $response->getContent());
 
         $response = new JsonResponse(0.1);
-        $this->assertEquals('0.1', $response->getContent());
+        $this->assertEquals(0.1, $response->getContent());
         $this->assertIsString($response->getContent());
 
         $response = new JsonResponse(true);
@@ -132,7 +132,7 @@ public function testStaticCreateWithSimpleTypes()
 
         $response = JsonResponse::create(0.1);
         $this->assertInstanceOf('Symfony\Component\HttpFoundation\JsonResponse', $response);
-        $this->assertEquals('0.1', $response->getContent());
+        $this->assertEquals(0.1, $response->getContent());
         $this->assertIsString($response->getContent());
 
         $response = JsonResponse::create(true);