Merge branch '5.4' into 6.4

* 5.4: [FrameworkBundle] Do not access the container when the kernel is shut down
symfony · Sep 20, 2024 · 6a9665b · 6a9665b
2 parents f40274b + 9ae1957
commit 6a9665b
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/Test/KernelTestCase.php b/Test/KernelTestCase.php
@@ -126,14 +126,15 @@ protected static function ensureKernelShutdown()
         if (null !== static::$kernel) {
             static::$kernel->boot();
             $container = static::$kernel->getContainer();
-            static::$kernel->shutdown();
-            static::$booted = false;
 
             if ($container->has('services_resetter')) {
                 // Instantiate the service because Container::reset() only resets services that have been used
                 $container->get('services_resetter');
             }
 
+            static::$kernel->shutdown();
+            static::$booted = false;
+
             if ($container instanceof ResetInterface) {
                 $container->reset();
             }