[FrameworkBundle] Fix getting the container from a non-booted kernel in KernelBrowser

fancyweb · fancyweb · commit 70e07cea7b92 · 2022-03-01T11:34:19.000+01:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/Client.php b/src/Symfony/Bundle/FrameworkBundle/Client.php
@@ -117,7 +117,12 @@ protected function doRequest($request)
         // 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();
+            try {
+                $container = $this->kernel->getContainer();
+            } catch (\LogicException $e) {
+                $container = null;
+            }
+
             $this->kernel->shutdown();
 
             if ($container instanceof ResetInterface) {
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/KernelBrowserTest.php b/src/Symfony/Bundle/FrameworkBundle/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())
