[FrameworkBundle] WebTestCase KernelBrowser::getContainer null return type

Simperfit · nicolas-grekas · commit 046984e3335d · 2019-09-27T12:05:31.000+02:00
diff --git a/Test/KernelTestCase.php b/Test/KernelTestCase.php
@@ -127,11 +127,15 @@ protected static function createKernel(array $options = [])
     protected static function ensureKernelShutdown()
     {
         if (null !== static::$kernel) {
-            $container = static::$kernel->getContainer();
-            static::$kernel->shutdown();
-            static::$booted = false;
-            if ($container instanceof ResetInterface) {
-                $container->reset();
+            $isBooted = (new \ReflectionClass(static::$kernel))->getProperty('booted');
+            $isBooted->setAccessible(true);
+            if ($isBooted->getValue(static::$kernel)) {
+                $container = static::$kernel->getContainer();
+                static::$kernel->shutdown();
+                static::$booted = false;
+                if ($container instanceof ResetInterface) {
+                    $container->reset();
+                }
             }
         }
         static::$container = null;
diff --git a/Tests/Functional/app/AppKernel.php b/Tests/Functional/app/AppKernel.php
@@ -14,6 +14,7 @@
 use Psr\Log\NullLogger;
 use Symfony\Component\Config\Loader\LoaderInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\Filesystem\Filesystem;
 use Symfony\Component\HttpKernel\Kernel;
 
@@ -96,4 +97,13 @@ protected function getKernelParameters(): array
 
         return $parameters;
     }
+
+    public function getContainer(): ContainerInterface
+    {
+        if (!$this->booted) {
+            throw new \LogicException('Cannot access the container on a non-booted kernel. Did you forget to boot it?');
+        }
+
+        return parent::getContainer();
+    }
 }
