Resolving tests deprecations

yceruto · yceruto · commit f7495ec7c424 · 2019-08-21T09:05:25.000-04:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/BundlePaths/config.yml b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/BundlePaths/config.yml
@@ -8,4 +8,3 @@ framework:
 
 twig:
     strict_variables: '%kernel.debug%'
-    exception_controller: ~
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/Fragment/config.yml b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/Fragment/config.yml
@@ -7,4 +7,3 @@ framework:
 
 twig:
     strict_variables: '%kernel.debug%'
-    exception_controller: ~
diff --git a/src/Symfony/Bundle/TwigBundle/Tests/Controller/PreviewErrorControllerTest.php b/src/Symfony/Bundle/TwigBundle/Tests/Controller/PreviewErrorControllerTest.php
@@ -18,6 +18,9 @@
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\HttpKernelInterface;
 
+/**
+ * @group legacy
+ */
 class PreviewErrorControllerTest extends TestCase
 {
     public function testForwardRequestToConfiguredController()
diff --git a/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/ConfigurationTest.php b/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/ConfigurationTest.php
@@ -21,7 +21,6 @@ public function testDoNoDuplicateDefaultFormResources()
     {
         $input = [
             'strict_variables' => false, // to be removed in 5.0 relying on default
-            'exception_controller' => null, // to be removed in 5.0 relying on default
             'form_themes' => ['form_div_layout.html.twig'],
         ];
 
@@ -59,7 +58,6 @@ public function testGlobalsAreNotNormalized()
     {
         $input = [
             'strict_variables' => false, // to be removed in 5.0 relying on default
-            'exception_controller' => null, // to be removed in 5.0 relying on default
             'globals' => ['some-global' => true],
         ];
 
@@ -73,7 +71,6 @@ public function testArrayKeysInGlobalsAreNotNormalized()
     {
         $input = [
             'strict_variables' => false, // to be removed in 5.0 relying on default
-            'exception_controller' => null, // to be removed in 5.0 relying on default
             'globals' => ['global' => ['some-key' => 'some-value']],
         ];
 
diff --git a/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/Fixtures/php/customTemplateEscapingGuesser.php b/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/Fixtures/php/customTemplateEscapingGuesser.php
@@ -4,5 +4,4 @@
     'autoescape_service' => 'my_project.some_bundle.template_escaping_guesser',
     'autoescape_service_method' => 'guess',
     'strict_variables' => false, // to be removed in 5.0 relying on default
-    'exception_controller' => null, // to be removed in 5.0 relying on default
 ]);
diff --git a/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/Fixtures/php/empty.php b/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/Fixtures/php/empty.php
@@ -2,5 +2,4 @@
 
 $container->loadFromExtension('twig', [
     'strict_variables' => false, // to be removed in 5.0 relying on default
-    'exception_controller' => null, // to be removed in 5.0 relying on default
 ]);
diff --git a/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/Fixtures/php/formats.php b/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/Fixtures/php/formats.php
@@ -12,5 +12,4 @@
         'thousands_separator' => '.',
     ],
     'strict_variables' => false, // to be removed in 5.0 relying on default
-    'exception_controller' => null, // to be removed in 5.0 relying on default
 ]);
diff --git a/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/Fixtures/php/full.php b/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/Fixtures/php/full.php
@@ -17,7 +17,6 @@
     'charset' => 'ISO-8859-1',
     'debug' => true,
     'strict_variables' => true,
-    'exception_controller' => null,
     'default_path' => '%kernel.project_dir%/Fixtures/templates',
     'paths' => [
         'path1',
diff --git a/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/Fixtures/xml/customTemplateEscapingGuesser.xml b/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/Fixtures/xml/customTemplateEscapingGuesser.xml
@@ -6,5 +6,5 @@
            xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd
                         http://symfony.com/schema/dic/twig https://symfony.com/schema/dic/twig/twig-1.0.xsd">
 
-    <twig:config autoescape-service="my_project.some_bundle.template_escaping_guesser" autoescape-service-method="guess" strict-variables="false" exception-controller="null" />
+    <twig:config autoescape-service="my_project.some_bundle.template_escaping_guesser" autoescape-service-method="guess" strict-variables="false" />
 </container>
diff --git a/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/Fixtures/xml/empty.xml b/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/Fixtures/xml/empty.xml
@@ -6,5 +6,5 @@
            xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd
                         http://symfony.com/schema/dic/twig https://symfony.com/schema/dic/twig/twig-1.0.xsd">
 
-    <twig:config strict-variables="false" exception-controller="null" />
+    <twig:config strict-variables="false" />
 </container>
diff --git a/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/Fixtures/xml/extra.xml b/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/Fixtures/xml/extra.xml
@@ -6,7 +6,7 @@
     xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd
                         http://symfony.com/schema/dic/twig https://symfony.com/schema/dic/twig/twig-1.0.xsd">
 
-    <twig:config auto-reload="true" autoescape="true" base-template-class="stdClass" cache="/tmp" charset="ISO-8859-1" debug="true" strict-variables="true" exception-controller="null">
+    <twig:config auto-reload="true" autoescape="true" base-template-class="stdClass" cache="/tmp" charset="ISO-8859-1" debug="true" strict-variables="true">
         <twig:path namespace="namespace3">namespaced_path3</twig:path>
     </twig:config>
 </container>
diff --git a/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/Fixtures/xml/formats.xml b/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/Fixtures/xml/formats.xml
@@ -5,7 +5,7 @@
     xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd
         http://symfony.com/schema/dic/twig https://symfony.com/schema/dic/twig/twig-1.0.xsd">
 
-    <twig:config strict-variables="false" exception-controller="null">
+    <twig:config strict-variables="false">
         <twig:date format="Y-m-d" interval-format="%d" timezone="Europe/Berlin" />
         <twig:number-format decimals="2" decimal-point="," thousands-separator="." />
     </twig:config>
diff --git a/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/Fixtures/xml/full.xml b/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/Fixtures/xml/full.xml
@@ -6,7 +6,7 @@
     xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd
                         http://symfony.com/schema/dic/twig https://symfony.com/schema/dic/twig/twig-1.0.xsd">
 
-    <twig:config auto-reload="true" autoescape="true" base-template-class="stdClass" cache="/tmp" charset="ISO-8859-1" debug="true" strict-variables="true" default-path="%kernel.project_dir%/Fixtures/templates" exception-controller="null">
+    <twig:config auto-reload="true" autoescape="true" base-template-class="stdClass" cache="/tmp" charset="ISO-8859-1" debug="true" strict-variables="true" default-path="%kernel.project_dir%/Fixtures/templates">
         <twig:form-theme>MyBundle::form.html.twig</twig:form-theme>
         <twig:global key="foo" id="bar" type="service" />
         <twig:global key="baz">@@qux</twig:global>
diff --git a/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/Fixtures/yml/customTemplateEscapingGuesser.yml b/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/Fixtures/yml/customTemplateEscapingGuesser.yml
@@ -2,4 +2,3 @@ twig:
     autoescape_service: my_project.some_bundle.template_escaping_guesser
     autoescape_service_method: guess
     strict_variables: false # to be removed in 5.0 relying on default
-    exception_controller: ~ # to be removed in 5.0 relying on default
diff --git a/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/Fixtures/yml/empty.yml b/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/Fixtures/yml/empty.yml
@@ -1,3 +1,2 @@
 twig:
     strict_variables: false # to be removed in 5.0 relying on default
-    exception_controller: ~ # to be removed in 5.0 relying on default
diff --git a/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/Fixtures/yml/extra.yml b/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/Fixtures/yml/extra.yml
@@ -1,5 +1,4 @@
 twig:
     strict_variables: false # to be removed in 5.0 relying on default
-    exception_controller: ~ # to be removed in 5.0 relying on default
     paths:
         namespaced_path3: namespace3
diff --git a/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/Fixtures/yml/formats.yml b/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/Fixtures/yml/formats.yml
@@ -1,6 +1,5 @@
 twig:
     strict_variables: false # to be removed in 5.0 relying on default
-    exception_controller: ~ # to be removed in 5.0 relying on default
     date:
         format: Y-m-d
         interval_format: '%d'
diff --git a/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/Fixtures/yml/full.yml b/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/Fixtures/yml/full.yml
@@ -14,7 +14,6 @@ twig:
     debug:               true
     strict_variables:    true
     default_path: '%kernel.project_dir%/Fixtures/templates'
-    exception_controller: ~ # to be removed in 5.0 relying on default
     paths:
         path1: ''
         path2: ''
diff --git a/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/TwigExtensionTest.php b/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/TwigExtensionTest.php
@@ -32,7 +32,6 @@ public function testLoadEmptyConfiguration()
         $container->registerExtension(new TwigExtension());
         $container->loadFromExtension('twig', [
             'strict_variables' => false, // to be removed in 5.0 relying on default
-            'exception_controller' => null, // to be removed in 5.0 relying on default
         ]);
         $this->compileContainer($container);
 
@@ -158,7 +157,6 @@ public function testGlobalsWithDifferentTypesAndValues()
         $container->loadFromExtension('twig', [
             'globals' => $globals,
             'strict_variables' => false, // // to be removed in 5.0 relying on default
-            'exception_controller' => null, // to be removed in 5.0 relying on default
         ]);
         $this->compileContainer($container);
 
@@ -262,7 +260,6 @@ public function testStopwatchExtensionAvailability($debug, $stopwatchEnabled, $e
         $container->registerExtension(new TwigExtension());
         $container->loadFromExtension('twig', [
             'strict_variables' => false, // to be removed in 5.0 relying on default
-            'exception_controller' => null, // to be removed in 5.0 relying on default
         ]);
         $container->setAlias('test.twig.extension.debug.stopwatch', 'twig.extension.debug.stopwatch')->setPublic(true);
         $this->compileContainer($container);
@@ -293,7 +290,6 @@ public function testRuntimeLoader()
         $container->registerExtension(new TwigExtension());
         $container->loadFromExtension('twig', [
             'strict_variables' => false, // to be removed in 5.0 relying on default
-            'exception_controller' => null, // to be removed in 5.0 relying on default
         ]);
         $container->setParameter('kernel.environment', 'test');
         $container->setParameter('debug.file_link_format', 'test');
diff --git a/src/Symfony/Bundle/TwigBundle/Tests/Functional/CacheWarmingTest.php b/src/Symfony/Bundle/TwigBundle/Tests/Functional/CacheWarmingTest.php
@@ -99,7 +99,6 @@ public function registerContainerConfiguration(LoaderInterface $loader)
                 ])
                 ->loadFromExtension('twig', [ // to be removed in 5.0 relying on default
                     'strict_variables' => false,
-                    'exception_controller' => null,
                 ])
             ;
         });
diff --git a/src/Symfony/Bundle/TwigBundle/Tests/Functional/EmptyAppTest.php b/src/Symfony/Bundle/TwigBundle/Tests/Functional/EmptyAppTest.php
@@ -42,7 +42,6 @@ public function registerContainerConfiguration(LoaderInterface $loader)
         $loader->load(static function (ContainerBuilder $container) {
             $container->loadFromExtension('twig', [ // to be removed in 5.0 relying on default
                 'strict_variables' => false,
-                'exception_controller' => null,
             ]);
             $container->register('error_renderer', ErrorRenderer::class);
             $container->setParameter('debug.file_link_format', null);
diff --git a/src/Symfony/Bundle/TwigBundle/Tests/Functional/NoTemplatingEntryTest.php b/src/Symfony/Bundle/TwigBundle/Tests/Functional/NoTemplatingEntryTest.php
@@ -68,7 +68,6 @@ public function registerContainerConfiguration(LoaderInterface $loader)
                 ])
                 ->loadFromExtension('twig', [
                     'strict_variables' => false, // to be removed in 5.0 relying on default
-                    'exception_controller' => null, // to be removed in 5.0 relying on default
                     'default_path' => __DIR__.'/templates',
                 ])
             ;

Original file line number	Diff line number	Diff line change
`@@ -8,4 +8,3 @@ framework:`
`8`	`8`
`9`	`9`	`twig:`
`10`	`10`	`strict_variables: '%kernel.debug%'`
`11`		`- exception_controller: ~`
Original file line number	Diff line number	Diff line change
`@@ -7,4 +7,3 @@ framework:`
`7`	`7`
`8`	`8`	`twig:`
`9`	`9`	`strict_variables: '%kernel.debug%'`
`10`		`- exception_controller: ~`
Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,9 @@`
`18`	`18`	`use Symfony\Component\HttpFoundation\Response;`
`19`	`19`	`use Symfony\Component\HttpKernel\HttpKernelInterface;`
`20`	`20`
	`21`	`+/**`
	`22`	`+ * @group legacy`
	`23`	`+ */`
`21`	`24`	`class PreviewErrorControllerTest extends TestCase`
`22`	`25`	`{`
`23`	`26`	`public function testForwardRequestToConfiguredController()`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,6 @@ public function testDoNoDuplicateDefaultFormResources()`
`21`	`21`	`{`
`22`	`22`	`$input = [`
`23`	`23`	`'strict_variables' => false, // to be removed in 5.0 relying on default`
`24`		`- 'exception_controller' => null, // to be removed in 5.0 relying on default`
`25`	`24`	`'form_themes' => ['form_div_layout.html.twig'],`
`26`	`25`	`];`
`27`	`26`
`@@ -59,7 +58,6 @@ public function testGlobalsAreNotNormalized()`
`59`	`58`	`{`
`60`	`59`	`$input = [`
`61`	`60`	`'strict_variables' => false, // to be removed in 5.0 relying on default`
`62`		`- 'exception_controller' => null, // to be removed in 5.0 relying on default`
`63`	`61`	`'globals' => ['some-global' => true],`
`64`	`62`	`];`
`65`	`63`
`@@ -73,7 +71,6 @@ public function testArrayKeysInGlobalsAreNotNormalized()`
`73`	`71`	`{`
`74`	`72`	`$input = [`
`75`	`73`	`'strict_variables' => false, // to be removed in 5.0 relying on default`
`76`		`- 'exception_controller' => null, // to be removed in 5.0 relying on default`
`77`	`74`	`'globals' => ['global' => ['some-key' => 'some-value']],`
`78`	`75`	`];`
`79`	`76`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,2 @@`
`1`	`1`	`twig:`
`2`	`2`	`strict_variables: false # to be removed in 5.0 relying on default`
`3`		`- exception_controller: ~ # to be removed in 5.0 relying on default`
Original file line number	Diff line number	Diff line change
`@@ -99,7 +99,6 @@ public function registerContainerConfiguration(LoaderInterface $loader)`
`99`	`99`	`])`
`100`	`100`	`->loadFromExtension('twig', [ // to be removed in 5.0 relying on default`
`101`	`101`	`'strict_variables' => false,`
`102`		`- 'exception_controller' => null,`
`103`	`102`	`])`
`104`	`103`	`;`
`105`	`104`	`});`
Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,6 @@ public function registerContainerConfiguration(LoaderInterface $loader)`
`68`	`68`	`])`
`69`	`69`	`->loadFromExtension('twig', [`
`70`	`70`	`'strict_variables' => false, // to be removed in 5.0 relying on default`
`71`		`- 'exception_controller' => null, // to be removed in 5.0 relying on default`
`72`	`71`	`'default_path' => __DIR__.'/templates',`
`73`	`72`	`])`
`74`	`73`	`;`