minor symfony#32615 fix tests (xabbuh)

nicolas-grekas · nicolas-grekas · commit 170a67577509 · 2019-07-19T10:22:40.000+02:00
This PR was merged into the 3.4 branch. Discussion ---------- fix tests | Q | A | ------------- | --- | Branch? | 3.4 | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | | License | MIT | Doc PR | Commits ------- a616e18 fix tests
diff --git a/src/Symfony/Bundle/DebugBundle/Tests/DependencyInjection/DebugExtensionTest.php b/src/Symfony/Bundle/DebugBundle/Tests/DependencyInjection/DebugExtensionTest.php
@@ -52,6 +52,7 @@ private function compileContainer(ContainerBuilder $container)
     {
         $container->getCompilerPassConfig()->setOptimizationPasses([]);
         $container->getCompilerPassConfig()->setRemovingPasses([]);
+        $container->getCompilerPassConfig()->setAfterRemovingPasses([]);
         $container->compile();
     }
 }
diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/ContainerDebugCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/ContainerDebugCommand.php
@@ -194,6 +194,7 @@ protected function getContainerBuilder()
             $buildContainer = \Closure::bind(function () { return $this->buildContainer(); }, $kernel, \get_class($kernel));
             $container = $buildContainer();
             $container->getCompilerPassConfig()->setRemovingPasses([]);
+            $container->getCompilerPassConfig()->setAfterRemovingPasses([]);
             $container->compile();
         } else {
             (new XmlFileLoader($container = new ContainerBuilder(), new FileLocator()))->load($kernel->getContainer()->getParameter('debug.container.dump'));
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/CompleteConfigurationTest.php b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/CompleteConfigurationTest.php
@@ -617,6 +617,7 @@ protected function getContainer($file)
 
         $container->getCompilerPassConfig()->setOptimizationPasses([]);
         $container->getCompilerPassConfig()->setRemovingPasses([]);
+        $container->getCompilerPassConfig()->setAfterRemovingPasses([]);
         $container->compile();
 
         return $container;
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/SecurityExtensionTest.php b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/SecurityExtensionTest.php
@@ -321,6 +321,7 @@ protected function getRawContainer()
 
         $container->getCompilerPassConfig()->setOptimizationPasses([]);
         $container->getCompilerPassConfig()->setRemovingPasses([]);
+        $container->getCompilerPassConfig()->setAfterRemovingPasses([]);
 
         return $container;
     }
diff --git a/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/TwigExtensionTest.php b/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/TwigExtensionTest.php
@@ -266,6 +266,7 @@ public function testRuntimeLoader()
         $container->register('foo', '%foo%')->addTag('twig.runtime');
         $container->addCompilerPass(new RuntimeLoaderPass(), PassConfig::TYPE_BEFORE_REMOVING);
         $container->getCompilerPassConfig()->setRemovingPasses([]);
+        $container->getCompilerPassConfig()->setAfterRemovingPasses([]);
         $container->compile();
 
         $loader = $container->getDefinition('twig.runtime_loader');
@@ -327,6 +328,7 @@ private function compileContainer(ContainerBuilder $container)
     {
         $container->getCompilerPassConfig()->setOptimizationPasses([]);
         $container->getCompilerPassConfig()->setRemovingPasses([]);
+        $container->getCompilerPassConfig()->setAfterRemovingPasses([]);
         $container->compile();
     }
 

Original file line number	Diff line number	Diff line change
`@@ -52,6 +52,7 @@ private function compileContainer(ContainerBuilder $container)`
`52`	`52`	`{`
`53`	`53`	`$container->getCompilerPassConfig()->setOptimizationPasses([]);`
`54`	`54`	`$container->getCompilerPassConfig()->setRemovingPasses([]);`
	`55`	`+ $container->getCompilerPassConfig()->setAfterRemovingPasses([]);`
`55`	`56`	`$container->compile();`
`56`	`57`	`}`
`57`	`58`	`}`
Original file line number	Diff line number	Diff line change
`@@ -321,6 +321,7 @@ protected function getRawContainer()`
`321`	`321`
`322`	`322`	`$container->getCompilerPassConfig()->setOptimizationPasses([]);`
`323`	`323`	`$container->getCompilerPassConfig()->setRemovingPasses([]);`
	`324`	`+ $container->getCompilerPassConfig()->setAfterRemovingPasses([]);`
`324`	`325`
`325`	`326`	`return $container;`
`326`	`327`	`}`
Original file line number	Diff line number	Diff line change
`@@ -266,6 +266,7 @@ public function testRuntimeLoader()`
`266`	`266`	`$container->register('foo', '%foo%')->addTag('twig.runtime');`
`267`	`267`	`$container->addCompilerPass(new RuntimeLoaderPass(), PassConfig::TYPE_BEFORE_REMOVING);`
`268`	`268`	`$container->getCompilerPassConfig()->setRemovingPasses([]);`
	`269`	`+ $container->getCompilerPassConfig()->setAfterRemovingPasses([]);`
`269`	`270`	`$container->compile();`
`270`	`271`
`271`	`272`	`$loader = $container->getDefinition('twig.runtime_loader');`
`@@ -327,6 +328,7 @@ private function compileContainer(ContainerBuilder $container)`
`327`	`328`	`{`
`328`	`329`	`$container->getCompilerPassConfig()->setOptimizationPasses([]);`
`329`	`330`	`$container->getCompilerPassConfig()->setRemovingPasses([]);`
	`331`	`+ $container->getCompilerPassConfig()->setAfterRemovingPasses([]);`
`330`	`332`	`$container->compile();`
`331`	`333`	`}`
`332`	`334`