merged with 2.1

Author: DavertMik

src/Codeception/Lib/Connector/Symfony.php

@@ -3,63 +3,84 @@
 
 class Symfony extends \Symfony\Component\HttpKernel\Client
 {
-    
     /**
      * @var boolean
      */
-    private static $hasPerformedRequest;
+    private $rebootable = true;
+
+    /**
+     * @var boolean
+     */
+    private $hasPerformedRequest = false;
+
+    /**
+     * @var \Symfony\Component\DependencyInjection\ContainerInterface
+     */
+    private $container = null;
 
     /**
      * @var array
      */
     public $persistentServices = [];
 
     /**
-     * @param Request $request
+     * Constructor.
+     *
+     * @param \Symfony\Component\HttpKernel\Kernel  $kernel     A booted HttpKernel instance
+     * @param array                                 $services   An injected services
+     * @param boolean                               $rebootable
      */
-    protected function doRequest($request)
+    public function __construct(\Symfony\Component\HttpKernel\Kernel $kernel, array $services = [], $rebootable = true)
     {
-        $services = [];
-        if (self::$hasPerformedRequest) {
-            $services = $this->persistServices();
-            $this->kernel = clone $this->kernel;
-        } else {
-            self::$hasPerformedRequest = true;
-        }
-        $this->kernel->boot();
-
-        $container = $this->kernel->getContainer();
-        if ($this->kernel->getContainer()->has('profiler')) {
-            $container->get('profiler')->enable();
-        }
-
-        $this->injectPersistedServices($services);
-
-        return parent::doRequest($request);
+        parent::__construct($kernel);
+        $this->followRedirects(true);
+        $this->rebootable = (boolean)$rebootable;
+        $this->persistentServices = $services;
+        $this->rebootKernel();
     }
 
     /**
-     * @return array
+     * @param \Symfony\Component\HttpFoundation\Request $request
      */
-    protected function persistServices()
+    protected function doRequest($request)
     {
-        $services = [];
-        foreach ($this->persistentServices as $serviceName) {
-            if (!$this->kernel->getContainer()->has($serviceName)) {
-                continue;
+        if ($this->rebootable) {
+            if ($this->hasPerformedRequest) {
+                $this->rebootKernel();
+            } else {
+                $this->hasPerformedRequest = true;
             }
-            $services[$serviceName] = $this->kernel->getContainer()->get($serviceName);
         }
-        return $services;
+        return parent::doRequest($request);
     }
 
     /**
-     * @param array $services
+     * Reboot kernel
+     *
+     * Services from the list of persistent services
+     * are updated from service container before kernel shutdown
+     * and injected into newly initialized container after kernel boot.
      */
-    protected function injectPersistedServices($services)
+    public function rebootKernel()
     {
-        foreach ($services as $serviceName => $service) {
-            $this->kernel->getContainer()->set($serviceName, $service);
+        if ($this->container) {
+            foreach ($this->persistentServices as $serviceName => $service) {
+                if ($this->container->has($serviceName)) {
+                    $this->persistentServices[$serviceName] = $this->container->get($serviceName);
+                }
+            }
+        }
+
+        $this->kernel->shutdown();
+        $this->kernel->boot();
+        $this->container = $this->kernel->getContainer();
+
+        if ($this->container->has('profiler')) {
+            $this->container->get('profiler')->enable();
+        }
+
+        foreach ($this->persistentServices as $serviceName => $service) {
+            $this->container->set($serviceName, $service);
         }
     }
 }