From 6b6c246c723a12e1f1510c5e01706cbf63b19c2c Mon Sep 17 00:00:00 2001
From: Jens Schulze <jenschude@gmail.com>
Date: Tue, 1 Oct 2019 10:34:38 +0200
Subject: [PATCH 1/2] [AnnotationCacheWarmer] add RedirectController to
 annotation cache

This prevents to exclude the RedirectController from the warmed annotation cache which would lead to warnings when trying to use the warmed cache on read only file systems

See #29357
---
 .../Bundle/FrameworkBundle/Resources/config/annotations.xml     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/annotations.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/annotations.xml
index 02104ba260..9403917ff5 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/annotations.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/annotations.xml
@@ -37,7 +37,7 @@
             <argument type="service" id="annotations.reader" />
             <argument>%kernel.cache_dir%/annotations.php</argument>
             <argument type="service" id="cache.annotations" />
-            <argument>#^Symfony\\(?:Component\\HttpKernel\\|Bundle\\FrameworkBundle\\Controller\\(?!AbstractController$|Controller$))#</argument>
+            <argument>#^Symfony\\(?:Component\\HttpKernel\\|Bundle\\FrameworkBundle\\Controller\\(?!.*Controller$))#</argument>
             <argument>%kernel.debug%</argument>
         </service>
 

From 9b5ced20bbaf45b1d64263c3833d25baa49a32ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Sch=C3=A4dlich?= <jan.schaedlich@sensiolabs.de>
Date: Wed, 2 Oct 2019 12:47:49 +0200
Subject: [PATCH 2/2] [FrameworkBundle] Fix wrong returned status code in
 ConfigDebugCommand

---
 .../Bundle/FrameworkBundle/Command/ConfigDebugCommand.php       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/ConfigDebugCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/ConfigDebugCommand.php
index 6aa3fbf9b7..9919e4657d 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Command/ConfigDebugCommand.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Command/ConfigDebugCommand.php
@@ -104,7 +104,7 @@ EOF
         } catch (LogicException $e) {
             $errorIo->error($e->getMessage());
 
-            return;
+            return 1;
         }
 
         $io->title(sprintf('Current configuration for "%s.%s"', $extensionAlias, $path));