fix merge

nicolas-grekas · nicolas-grekas · commit 0fd8e354cef6 · 2019-08-26T10:55:16.000+02:00
diff --git a/Tests/Command/CacheClearCommand/Fixture/TestAppKernel.php b/Tests/Command/CacheClearCommand/Fixture/TestAppKernel.php
@@ -36,6 +36,13 @@ public function registerContainerConfiguration(LoaderInterface $loader)
         $loader->load(__DIR__.\DIRECTORY_SEPARATOR.'config.yml');
     }
 
+    public function setAnnotatedClassCache(array $annotatedClasses)
+    {
+        $annotatedClasses = array_diff($annotatedClasses, ['Symfony\Bundle\WebProfilerBundle\Controller\ExceptionController', 'Symfony\Bundle\TwigBundle\Controller\ExceptionController']);
+
+        parent::setAnnotatedClassCache($annotatedClasses);
+    }
+
     protected function build(ContainerBuilder $container)
     {
         $container->register('logger', NullLogger::class);

Original file line number	Diff line number	Diff line change
`@@ -36,6 +36,13 @@ public function registerContainerConfiguration(LoaderInterface $loader)`
`36`	`36`	`$loader->load(__DIR__.\DIRECTORY_SEPARATOR.'config.yml');`
`37`	`37`	`}`
`38`	`38`
	`39`	`+ public function setAnnotatedClassCache(array $annotatedClasses)`
	`40`	`+ {`
	`41`	`+ $annotatedClasses = array_diff($annotatedClasses, ['Symfony\Bundle\WebProfilerBundle\Controller\ExceptionController', 'Symfony\Bundle\TwigBundle\Controller\ExceptionController']);`
	`42`	`+`
	`43`	`+ parent::setAnnotatedClassCache($annotatedClasses);`
	`44`	`+ }`
	`45`	`+`
`39`	`46`	`protected function build(ContainerBuilder $container)`
`40`	`47`	`{`
`41`	`48`	`$container->register('logger', NullLogger::class);`