[FrameworkBundle] Dont reset the test container but the real one instead

Author: nicolas-grekas

CHANGELOG.md

@@ -10,7 +10,7 @@ CHANGELOG
  * Deprecated the `controller_name_converter` and `resolve_controller_name_subscriber` services
  * The `ControllerResolver` and `DelegatingLoader` classes have been marked as `final`
  * Added support for configuring chained cache pools
- * Deprecated booting the kernel before running `WebTestCase::createClient()`
+ * Deprecated calling `WebTestCase::createClient()` while a kernel has been booted, ensure the kernel is shut down before calling the method
  * Deprecated `routing.loader.service`, use `routing.loader.container` instead.
  * Not tagging service route loaders with `routing.route_loader` has been deprecated.
  * Overriding the methods `KernelTestCase::tearDown()` and `WebTestCase::tearDown()` without the `void` return-type is deprecated.

Test/KernelTestCase.php

@@ -37,7 +37,9 @@ abstract class KernelTestCase extends TestCase
      */
     protected static $container;
 
-    protected static $booted;
+    protected static $booted = false;
+
+    private static $kernelContainer;
 
     private function doTearDown()
     {
@@ -76,7 +78,7 @@ protected static function bootKernel(array $options = [])
         static::$kernel->boot();
         static::$booted = true;
 
-        $container = static::$kernel->getContainer();
+        self::$kernelContainer = $container = static::$kernel->getContainer();
         static::$container = $container->has('test.service_container') ? $container->get('test.service_container') : $container;
 
         return static::$kernel;
@@ -127,17 +129,14 @@ protected static function createKernel(array $options = [])
     protected static function ensureKernelShutdown()
     {
         if (null !== static::$kernel) {
-            $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::$kernel->shutdown();
+            static::$booted = false;
+        }
+
+        if (self::$kernelContainer instanceof ResetInterface) {
+            self::$kernelContainer->reset();
         }
-        static::$container = null;
+
+        static::$container = self::$kernelContainer = null;
     }
 }

Test/TestContainer.php

@@ -119,7 +119,7 @@ public function initialized($id): bool
      */
     public function reset()
     {
-        $this->getPublicContainer()->reset();
+        // ignore the call
     }
 
     /**

Test/WebTestCase.php

@@ -41,8 +41,8 @@ private function doTearDown()
      */
     protected static function createClient(array $options = [], array $server = [])
     {
-        if (true === static::$booted) {
-            @trigger_error(sprintf('Booting the kernel before calling %s() is deprecated and will throw in Symfony 5.0, the kernel should only be booted once.', __METHOD__), E_USER_DEPRECATED);
+        if (static::$booted) {
+            @trigger_error(sprintf('Calling "%s()" while a kernel has been booted is deprecated since Symfony 4.4 and will throw in 5.0, ensure the kernel is shut down before calling the method.', __METHOD__), E_USER_DEPRECATED);
         }
 
         $kernel = static::bootKernel($options);

Tests/Functional/app/AppKernel.php

@@ -100,7 +100,7 @@ protected function getKernelParameters(): array
 
     public function getContainer(): ContainerInterface
     {
-        if (!$this->booted) {
+        if (!$this->container) {
             throw new \LogicException('Cannot access the container on a non-booted kernel. Did you forget to boot it?');
         }