Merge branch '4.3' into 4.4

xabbuh · xabbuh · commit 2f3d9156efd0 · 2019-09-18T20:25:57.000+02:00
* 4.3:
  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
diff --git a/Tests/Controller/ControllerResolverTest.php b/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()
     {

Original file line number	Diff line number	Diff line change
`@@ -20,9 +20,9 @@`
`20`	`20`	`use Symfony\Component\DependencyInjection\ContainerAwareInterface;`
`21`	`21`	`use Symfony\Component\DependencyInjection\ContainerInterface;`
`22`	`22`	`use Symfony\Component\HttpFoundation\Request;`
`23`		`-use Symfony\Component\HttpKernel\Tests\Controller\ContainerControllerResolverTest;`
	`23`	`+use Symfony\Component\HttpKernel\Test\Controller\ContainerControllerResolverTestCase;`
`24`	`24`
`25`		`-class ControllerResolverTest extends ContainerControllerResolverTest`
	`25`	`+class ControllerResolverTest extends ContainerControllerResolverTestCase`
`26`	`26`	`{`
`27`	`27`	`public function testGetControllerOnContainerAware()`
`28`	`28`	`{`