Merge branch '3.4' into 4.3

nicolas-grekas · nicolas-grekas · commit d6051b94b425 · 2019-10-02T16:38:26.000+02:00
* 3.4:
  [FrameworkBundle] Fix wrong returned status code in ConfigDebugCommand
  [AnnotationCacheWarmer] add RedirectController to annotation cache
diff --git a/Command/ConfigDebugCommand.php b/Command/ConfigDebugCommand.php
@@ -109,7 +109,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
         } catch (LogicException $e) {
             $errorIo->error($e->getMessage());
 
-            return;
+            return 1;
         }
 
         $io->title(sprintf('Current configuration for "%s.%s"', $extensionAlias, $path));
diff --git a/Resources/config/annotations.xml b/Resources/config/annotations.xml
@@ -36,7 +36,7 @@
         <service id="annotations.cache_warmer" class="Symfony\Bundle\FrameworkBundle\CacheWarmer\AnnotationsCacheWarmer">
             <argument type="service" id="annotations.reader" />
             <argument>%kernel.cache_dir%/annotations.php</argument>
-            <argument>#^Symfony\\(?:Component\\HttpKernel\\|Bundle\\FrameworkBundle\\Controller\\(?!AbstractController$|Controller$))#</argument>
+            <argument>#^Symfony\\(?:Component\\HttpKernel\\|Bundle\\FrameworkBundle\\Controller\\(?!.*Controller$))#</argument>
             <argument>%kernel.debug%</argument>
         </service>
 

Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,7 @@ protected function execute(InputInterface $input, OutputInterface $output)`
`109`	`109`	`} catch (LogicException $e) {`
`110`	`110`	`$errorIo->error($e->getMessage());`
`111`	`111`
`112`		`- return;`
	`112`	`+ return 1;`
`113`	`113`	`}`
`114`	`114`
`115`	`115`	`$io->title(sprintf('Current configuration for "%s.%s"', $extensionAlias, $path));`