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/Controller/ControllerResolverTest.php

@@ -20,9 +20,9 @@
 use Symfony\Component\DependencyInjection\ContainerAwareInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpKernel\Tests\Controller\ContainerControllerResolverTest;
+use Symfony\Component\HttpKernel\Test\Controller\ContainerControllerResolverTestCase;
 
-class ControllerResolverTest extends ContainerControllerResolverTest
+class ControllerResolverTest extends ContainerControllerResolverTestCase
 {
     public function testGetControllerOnContainerAware()
     {

composer.json

@@ -23,7 +23,7 @@
         "symfony/debug": "~4.0",
         "symfony/dependency-injection": "^4.3",
         "symfony/http-foundation": "^4.3",
-        "symfony/http-kernel": "^4.3.4",
+        "symfony/http-kernel": "^4.3.5",
         "symfony/polyfill-mbstring": "~1.0",
         "symfony/filesystem": "~3.4|~4.0",
         "symfony/finder": "~3.4|~4.0",