Refactor before fixing CI

Author: yoanm

features/bootstrap/AbstractContext.php

@@ -6,6 +6,7 @@
 use DemoApp\DefaultKernel;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\Routing\Loader\Configurator\RoutingConfigurator;
 
 class AbstractContext implements Context
 {
@@ -23,6 +24,15 @@ public function jsonDecode($encodedData)
         return $decoded;
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    protected function configureRoutes(RoutingConfigurator $routes)
+    {
+        $confDir = $this->getConfigDir();
+        $routes->import($confDir.'/routes'.self::CONFIG_EXTS, 'glob');
+    }
+
     /**
      * @param string $uri
      * @param string $httpMethod

features/demo_app/src/AbstractKernel.php

@@ -2,7 +2,9 @@
 namespace DemoApp;
 
 use Symfony\Bundle\FrameworkBundle\Kernel\MicroKernelTrait;
+use Symfony\Component\Config\Loader\LoaderInterface;
 use Symfony\Component\DependencyInjection\Container;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\HttpKernel\Kernel as BaseHttpKernel;
 
 abstract class AbstractKernel extends BaseHttpKernel
@@ -13,14 +15,26 @@ abstract class AbstractKernel extends BaseHttpKernel
     /** @var string|null */
     private $customCacheDir = null;
 
+    public function registerBundles(): iterable
+    {
+        /** @noinspection PhpIncludeInspection */
+        $contents = require $this->getConfigDir().'/bundles.php';
+        foreach ($contents as $class => $envs) {
+            if (isset($envs['all']) || isset($envs[$this->environment])) {
+                yield new $class();
+            }
+        }
+    }
+
+
     /**
      * {@inheritdoc}
      */
     public function getCacheDir()
     {
         // Use a specific cache for each kernels
         if (null === $this->customCacheDir) {
-            $this->customCacheDir = $this->getProjectDir().'/var/cache/'.$this->environment.'/'.$this->getConfigDirectory();
+            $this->customCacheDir = $this->getProjectDir().'/var/cache/'.$this->environment.'/'.$this->getConfigDirectoryName();
         }
 
         return $this->customCacheDir;
@@ -41,6 +55,17 @@ public function getProjectDir()
     {
         return realpath(__DIR__.'/../');
     }
+    
+    /**
+     * {@inheritdoc}
+     */
+    protected function configureContainer(ContainerBuilder $container, LoaderInterface $loader)
+    {
+        $container->setParameter('container.dumper.inline_class_loader', true);
+        $confDir = $this->getConfigDir();
+        $loader->load($confDir.'/config'.self::CONFIG_EXTS, 'glob');
+        $loader->load($confDir.'/services'.self::CONFIG_EXTS, 'glob');
+    }
 
     /**
      * Gets the container class.
@@ -50,8 +75,9 @@ public function getProjectDir()
     protected function getContainerClass()
     {
         // In order to avoid collisions between kernels use a dedicated name
-        return parent::getContainerClass().Container::camelize($this->getConfigDirectory());
+        return parent::getContainerClass().Container::camelize($this->getConfigDirectoryName());
     }
 
-    abstract public function getConfigDirectory() : string;
+    abstract public function getConfigDirectoryName() : string;
+    abstract public function getConfigDir(): string;
 }

features/demo_app/src/DefaultKernel.php

@@ -3,46 +3,20 @@
 
 use Symfony\Component\Config\Loader\LoaderInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\Routing\RouteCollectionBuilder;
+use Symfony\Component\Routing\Loader\Configurator\RoutingConfigurator;
 
 class DefaultKernel extends AbstractKernel
 {
-    public function registerBundles(): iterable
-    {
-        /** @noinspection PhpIncludeInspection */
-        $contents = require $this->getProjectDir().'/'.$this->getConfigDirectory().'/bundles.php';
-        foreach ($contents as $class => $envs) {
-            if (isset($envs['all']) || isset($envs[$this->environment])) {
-                yield new $class();
-            }
-        }
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function configureContainer(ContainerBuilder $container, LoaderInterface $loader)
-    {
-        $container->setParameter('container.dumper.inline_class_loader', true);
-        $confDir = $this->getProjectDir().'/'.$this->getConfigDirectory();
-        $loader->load($confDir.'/config'.self::CONFIG_EXTS, 'glob');
-        $loader->load($confDir.'/services'.self::CONFIG_EXTS, 'glob');
-    }
-
     /**
      * {@inheritdoc}
      */
-    protected function configureRoutes(RouteCollectionBuilder $routes)
+    public function getConfigDirectoryName() : string
     {
-        $confDir = $this->getProjectDir().'/'.$this->getConfigDirectory();
-        $routes->import($confDir.'/routes'.self::CONFIG_EXTS, '/', 'glob');
+        return 'default_config';
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getConfigDirectory() : string
+    public function getConfigDir(): string
     {
-        return 'default_config';
+        return $this->getProjectDir().'/'.$this->getConfigDirectoryName();
     }
 }

features/demo_app/src/KernelWithMappingCollectorListener.php

@@ -3,46 +3,20 @@
 
 use Symfony\Component\Config\Loader\LoaderInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\Routing\RouteCollectionBuilder;
+use Symfony\Component\Routing\Loader\Configurator\RoutingConfigurator;
 
 class KernelWithMappingCollectorListener extends AbstractKernel
 {
-    public function registerBundles(): iterable
-    {
-        /** @noinspection PhpIncludeInspection */
-        $contents = require $this->getProjectDir().'/'.$this->getConfigDirectory().'/bundles.php';
-        foreach ($contents as $class => $envs) {
-            if (isset($envs['all']) || isset($envs[$this->environment])) {
-                yield new $class();
-            }
-        }
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function configureContainer(ContainerBuilder $container, LoaderInterface $loader)
-    {
-        $container->setParameter('container.dumper.inline_class_loader', true);
-        $confDir = $this->getProjectDir().'/'.$this->getConfigDirectory();
-        $loader->load($confDir.'/config'.self::CONFIG_EXTS, 'glob');
-        $loader->load($confDir.'/services'.self::CONFIG_EXTS, 'glob');
-    }
-
     /**
      * {@inheritdoc}
      */
-    protected function configureRoutes(RouteCollectionBuilder $routes)
+    public function getConfigDirectoryName() : string
     {
-        $confDir = $this->getProjectDir().'/'.$this->getConfigDirectory();
-        $routes->import($confDir.'/routes'.self::CONFIG_EXTS, '/', 'glob');
+        return 'mapping_collector_config';
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getConfigDirectory() : string
+    public function getConfigDir(): string
     {
-        return 'mapping_collector_config';
+        return $this->getProjectDir().'/'.$this->getConfigDirectoryName();
     }
 }