Move useConfigFiles method to Container module

Author: enumag

src/Module/Container.php

@@ -15,6 +15,7 @@
 use Nette\Caching\Storages\IJournal;
 use Nette\Caching\Storages\SQLiteJournal;
 use Nette\Configurator;
+use Nette\DI\Container as DIContainer;
 use Nette\DI\MissingServiceException;
 use Nette\Http\Session;
 use Nette\Utils\FileSystem;
@@ -38,6 +39,11 @@ class Container extends Module
      */
     private $path;
 
+    /**
+     * @var array
+     */
+    private $configFiles;
+
     /**
      * @var Container
      */
@@ -78,12 +84,42 @@ public function _after(TestInterface $test)
         }
     }
 
-    public function createContainer(array $configFiles = null)
+    public function useConfigFiles(array $configFiles)
     {
         if ($this->container) {
-            $this->fail('Can\'t create more than one container.');
+            $this->fail('Can\'t set configFiles after the container is created.');
+        }
+        $this->configFiles = $configFiles;
+    }
+
+    /**
+     * @return DIContainer
+     */
+    public function getContainer()
+    {
+        if (!$this->container) {
+            $this->createContainer();
+        }
+
+        return $this->container;
+    }
+
+    /**
+     * @param string $service
+     *
+     * @return object
+     */
+    public function grabService($service)
+    {
+        try {
+            return $this->getContainer()->getByType($service);
+        } catch (MissingServiceException $e) {
+            $this->fail($e->getMessage());
         }
+    }
 
+    private function createContainer()
+    {
         $configurator = new $this->config['configurator']();
 
         if ($this->config['logDir']) {
@@ -99,28 +135,11 @@ public function createContainer(array $configFiles = null)
             $configurator->setDebugMode($this->config['debugMode']);
         }
 
-        $configFiles = is_array($configFiles) ? $configFiles : $this->config['configFiles'];
+        $configFiles = is_array($this->configFiles) ? $this->configFiles : $this->config['configFiles'];
         foreach ($configFiles as $file) {
             $configurator->addConfig($this->path.'/'.$file, false);
         }
 
         $this->container = $configurator->createContainer();
-
-        return $this->container;
     }
-
-    /**
-     * @param string $service
-     *
-     * @return object
-     */
-    public function grabService($service)
-    {
-        try {
-            return call_user_func($this->containerAccessor)->getByType($service);
-        } catch (MissingServiceException $e) {
-            $this->fail($e->getMessage());
-        }
-    }
-
 }

src/Module/Nette.php

@@ -11,11 +11,10 @@
 namespace Arachne\Codeception\Module;
 
 use Arachne\Codeception\Connector\Nette as NetteConnector;
-use Arachne\Codeception\Module\Container as ContainerModule;
 use Codeception\Lib\Framework;
 use Codeception\TestInterface;
-use Nette\DI\Container;
-use Nette\DI\MissingServiceException;
+use Nette\Http\IRequest;
+use Nette\Http\IResponse;
 
 /**
  * @author Jáchym Toušek <enumag@gmail.com>
@@ -26,21 +25,6 @@ class Nette extends Framework
         'followRedirects' => true,
     ];
 
-    /**
-     * @var array
-     */
-    private $configFiles;
-
-    /**
-     * @var Container
-     */
-    private $container;
-
-    /**
-     * @var callable
-     */
-    private $containerAccessor;
-
     /**
      * @var string
      */
@@ -54,30 +38,15 @@ public function _beforeSuite($settings = [])
     public function _before(TestInterface $test)
     {
         $this->configFiles = null;
-        $this->container = null;
-        $this->containerAccessor = function () {
-            if (!$this->container) {
-                $this->container = $this->getModule(ContainerModule::class)->createContainer();
-            }
-
-            return $this->container;
-        };
-
         $this->client = new NetteConnector();
-        $this->client->setContainerAccessor($this->containerAccessor);
+        $this->client->setContainerAccessor(function () {
+            return $this->getModule(Container::class)->getContainer();
+        });
         $this->client->followRedirects($this->config['followRedirects']);
 
         parent::_before($test);
     }
 
-    public function useConfigFiles(array $configFiles)
-    {
-        if ($this->container) {
-            $this->fail('Can\'t set configFiles after the container is created.');
-        }
-        $this->configFiles = $configFiles;
-    }
-
     public function _after(TestInterface $test)
     {
         parent::_after($test);
@@ -94,9 +63,8 @@ public function seeRedirectTo($url)
         if ($this->config['followRedirects']) {
             $this->fail('Method seeRedirectTo only works when followRedirects option is disabled');
         }
-        $container = call_user_func($this->containerAccessor);
-        $request = $container->getByType('Nette\Http\IRequest');
-        $response = $container->getByType('Nette\Http\IResponse');
+        $request = $this->getModule(Container::class)->grabService(IRequest::class);
+        $response = $this->getModule(Container::class)->grabService(IResponse::class);
         if ($response->getHeader('Location') !== $request->getUrl()->getHostUrl().$url && $response->getHeader('Location') !== $url) {
             $this->fail('Couldn\'t confirm redirect target to be "'.$url.'", Location header contains "'.$response->getHeader('Location').'".');
         }