Merge branch '5.4' into 6.0

* 5.4:
  Fix merge
  [FrameworkBundle] Fix resetting container between tests

Author: nicolas-grekas

KernelBrowser.php

@@ -22,7 +22,6 @@
 use Symfony\Component\HttpKernel\KernelInterface;
 use Symfony\Component\HttpKernel\Profiler\Profile as HttpProfile;
 use Symfony\Component\Security\Core\User\UserInterface;
-use Symfony\Contracts\Service\ResetInterface;
 
 /**
  * Simulates a browser and makes requests to a Kernel object.
@@ -157,12 +156,8 @@ protected function doRequest(object $request): Response
         // avoid shutting down the Kernel if no request has been performed yet
         // WebTestCase::createClient() boots the Kernel but do not handle a request
         if ($this->hasPerformedRequest && $this->reboot) {
-            $container = $this->kernel->getContainer();
+            $this->kernel->boot();
             $this->kernel->shutdown();
-
-            if ($container instanceof ResetInterface) {
-                $container->reset();
-            }
         } else {
             $this->hasPerformedRequest = true;
         }

Test/KernelTestCase.php

@@ -15,7 +15,6 @@
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\DependencyInjection\Exception\ServiceNotFoundException;
 use Symfony\Component\HttpKernel\KernelInterface;
-use Symfony\Contracts\Service\ResetInterface;
 
 /**
  * KernelTestCase is the base class for tests needing a Kernel.
@@ -35,8 +34,6 @@ abstract class KernelTestCase extends TestCase
 
     protected static $booted = false;
 
-    private static ?ContainerInterface $kernelContainer = null;
-
     protected function tearDown(): void
     {
         static::ensureKernelShutdown();
@@ -69,12 +66,11 @@ protected static function bootKernel(array $options = []): KernelInterface
     {
         static::ensureKernelShutdown();
 
-        static::$kernel = static::createKernel($options);
-        static::$kernel->boot();
+        $kernel = static::createKernel($options);
+        $kernel->boot();
+        self::$kernel = $kernel;
         static::$booted = true;
 
-        self::$kernelContainer = static::$kernel->getContainer();
-
         return static::$kernel;
     }
 
@@ -93,7 +89,7 @@ protected static function getContainer(): ContainerInterface
         }
 
         try {
-            return self::$kernelContainer->get('test.service_container');
+            return self::$kernel->getContainer()->get('test.service_container');
         } catch (ServiceNotFoundException $e) {
             throw new \LogicException('Could not find service "test.service_container". Try updating the "framework.test" config to "true".', 0, $e);
         }
@@ -142,14 +138,9 @@ protected static function createKernel(array $options = []): KernelInterface
     protected static function ensureKernelShutdown()
     {
         if (null !== static::$kernel) {
+            static::$kernel->boot();
             static::$kernel->shutdown();
             static::$booted = false;
         }
-
-        if (self::$kernelContainer instanceof ResetInterface) {
-            self::$kernelContainer->reset();
-        }
-
-        self::$kernelContainer = null;
     }
 }

Tests/KernelBrowserTest.php

@@ -51,6 +51,16 @@ public function testEnableRebootKernel()
         $client->request('GET', '/');
     }
 
+    public function testRequestAfterKernelShutdownAndPerformedRequest()
+    {
+        $this->expectNotToPerformAssertions();
+
+        $client = static::createClient(['test_case' => 'TestServiceContainer']);
+        $client->request('GET', '/');
+        static::ensureKernelShutdown();
+        $client->request('GET', '/');
+    }
+
     private function getKernelMock()
     {
         $mock = $this->getMockBuilder($this->getKernelClass())