Ensure congruence with the flow in the Symfony KernelTestCase

Author: TavoNiievez

src/Codeception/Lib/Connector/Symfony.php

@@ -31,7 +31,7 @@ public function __construct(
         parent::__construct($kernel);
         $this->followRedirects();
         $this->container = $this->getContainer();
-        $this->rebootKernel(); // Ensure the profiler exists
+        $this->rebootKernel();
     }
 
     /** @param Request $request */
@@ -47,7 +47,7 @@ protected function doRequest(object $request): Response
     }
 
     /**
-     * Reboot kernel
+     * Reboots the kernel.
      *
      * Services from the list of persistent services
      * are updated from service container before kernel shutdown
@@ -64,8 +64,7 @@ public function rebootKernel(): void
         }
 
         $this->persistDoctrineConnections();
-        $this->kernel->boot();
-        $this->kernel->shutdown();
+        $this->ensureKernelShutdown();
         $this->kernel->boot();
         $this->container = $this->getContainer();
 
@@ -82,6 +81,18 @@ public function rebootKernel(): void
         }
     }
 
+    protected function ensureKernelShutdown(): void
+    {
+        $this->kernel->boot();
+        $container = $this->kernel->getContainer();
+
+        if ($container->has('services_resetter')) {
+            $container->get('services_resetter');
+        }
+
+        $this->kernel->shutdown();
+    }
+
     private function getContainer(): ?ContainerInterface
     {
         /** @var ContainerInterface $container */
@@ -120,7 +131,9 @@ private function persistDoctrineConnections(): void
         }
 
         $reflectedContainer = new ReflectionClass($publicContainer);
-        $reflectionTarget = $reflectedContainer->hasProperty('parameters') ? $publicContainer : $publicContainer->getParameterBag();
+        $reflectionTarget = $reflectedContainer->hasProperty('parameters')
+            ? $publicContainer
+            : $publicContainer->getParameterBag();
 
         $reflectedParameters = new ReflectionProperty($reflectionTarget, 'parameters');
         $reflectedParameters->setAccessible(true);