From 7c41c5a9bad27e05bf10565a99fb105f66cb9a5a Mon Sep 17 00:00:00 2001
From: Fabien Potencier <fabien@potencier.org>
Date: Wed, 26 Feb 2025 12:00:50 +0100
Subject: [PATCH 1/4] Bump Symfony version to 6.4.20

---
 Kernel.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Kernel.php b/Kernel.php
index 087a393071..db24c8077c 100644
--- a/Kernel.php
+++ b/Kernel.php
@@ -76,12 +76,12 @@ abstract class Kernel implements KernelInterface, RebootableInterface, Terminabl
      */
     private static array $freshCache = [];
 
-    public const VERSION = '6.4.19';
-    public const VERSION_ID = 60419;
+    public const VERSION = '6.4.20-DEV';
+    public const VERSION_ID = 60420;
     public const MAJOR_VERSION = 6;
     public const MINOR_VERSION = 4;
-    public const RELEASE_VERSION = 19;
-    public const EXTRA_VERSION = '';
+    public const RELEASE_VERSION = 20;
+    public const EXTRA_VERSION = 'DEV';
 
     public const END_OF_MAINTENANCE = '11/2026';
     public const END_OF_LIFE = '11/2027';

From 1e97a511ab74fb05ff009f004fe5cf81f1083211 Mon Sep 17 00:00:00 2001
From: fritzmg <fmg@inspiredminds.at>
Date: Fri, 14 Mar 2025 13:48:09 +0000
Subject: [PATCH 2/4] Only remove E_WARNING from error level

---
 Kernel.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Kernel.php b/Kernel.php
index db24c8077c..ccc51981eb 100644
--- a/Kernel.php
+++ b/Kernel.php
@@ -407,7 +407,8 @@ protected function initializeContainer()
         $cachePath = $cache->getPath();
 
         // Silence E_WARNING to ignore "include" failures - don't use "@" to prevent silencing fatal errors
-        $errorLevel = error_reporting(\E_ALL ^ \E_WARNING);
+        $errorLevel = error_reporting();
+        error_reporting($errorLevel & ~\E_WARNING);
 
         try {
             if (is_file($cachePath) && \is_object($this->container = include $cachePath)

From 714764ff46f622ae80f451fedaeeb81e1db7d05b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gr=C3=A9goire=20Pineau?= <lyrixx@lyrixx.info>
Date: Fri, 21 Mar 2025 13:12:06 +0100
Subject: [PATCH 3/4] [HttpKernel] Fix TraceableEventDispatcher when the
 StopWatch service has been reset

---
 Debug/TraceableEventDispatcher.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/Debug/TraceableEventDispatcher.php b/Debug/TraceableEventDispatcher.php
index d31ce75816..f3101d5b14 100644
--- a/Debug/TraceableEventDispatcher.php
+++ b/Debug/TraceableEventDispatcher.php
@@ -66,7 +66,11 @@ protected function afterDispatch(string $eventName, object $event): void
                 if (null === $sectionId) {
                     break;
                 }
-                $this->stopwatch->stopSection($sectionId);
+                try {
+                    $this->stopwatch->stopSection($sectionId);
+                } catch (\LogicException) {
+                    // The stop watch service might have been reset in the meantime
+                }
                 break;
             case KernelEvents::TERMINATE:
                 // In the special case described in the `preDispatch` method above, the `$token` section

From 6be6db31bc74693ce5516e1fd5e5ff1171005e37 Mon Sep 17 00:00:00 2001
From: Fabien Potencier <fabien@potencier.org>
Date: Fri, 28 Mar 2025 14:27:10 +0100
Subject: [PATCH 4/4] Update VERSION for 6.4.20

---
 Kernel.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Kernel.php b/Kernel.php
index ccc51981eb..49f3b698ac 100644
--- a/Kernel.php
+++ b/Kernel.php
@@ -76,12 +76,12 @@ abstract class Kernel implements KernelInterface, RebootableInterface, Terminabl
      */
     private static array $freshCache = [];
 
-    public const VERSION = '6.4.20-DEV';
+    public const VERSION = '6.4.20';
     public const VERSION_ID = 60420;
     public const MAJOR_VERSION = 6;
     public const MINOR_VERSION = 4;
     public const RELEASE_VERSION = 20;
-    public const EXTRA_VERSION = 'DEV';
+    public const EXTRA_VERSION = '';
 
     public const END_OF_MAINTENANCE = '11/2026';
     public const END_OF_LIFE = '11/2027';