Replace typed callable with factory object

Author: pamil

src/ServiceContainer/DefaultLoaderFactory.php

@@ -0,0 +1,40 @@
+<?php
+
+/*
+ * This file is part of the ServiceContainerExtension package.
+ *
+ * (c) FriendsOfBehat
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace FriendsOfBehat\ServiceContainerExtension\ServiceContainer;
+
+use Symfony\Component\Config\FileLocator;
+use Symfony\Component\Config\Loader\DelegatingLoader;
+use Symfony\Component\Config\Loader\LoaderResolver;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Loader\PhpFileLoader;
+use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
+use Symfony\Component\DependencyInjection\Loader\YamlFileLoader;
+
+/**
+ * @author Kamil Kokot <kamil.kokot@lakion.com>
+ */
+final class DefaultLoaderFactory implements LoaderFactory
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function createLoader(ContainerBuilder $container, array $config)
+    {
+        $fileLocator = new FileLocator($container->getParameter('paths.base'));
+
+        return new DelegatingLoader(new LoaderResolver([
+            new XmlFileLoader($container, $fileLocator),
+            new YamlFileLoader($container, $fileLocator),
+            new PhpFileLoader($container, $fileLocator),
+        ]));
+    }
+}

src/ServiceContainer/LoaderFactory.php

@@ -0,0 +1,29 @@
+<?php
+
+/*
+ * This file is part of the ServiceContainerExtension package.
+ *
+ * (c) FriendsOfBehat
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace FriendsOfBehat\ServiceContainerExtension\ServiceContainer;
+
+use Symfony\Component\Config\Loader\LoaderInterface;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+
+/**
+ * @author Kamil Kokot <kamil.kokot@lakion.com>
+ */
+interface LoaderFactory
+{
+    /**
+     * @param ContainerBuilder $container
+     * @param array $config
+     *
+     * @return LoaderInterface
+     */
+    public function createLoader(ContainerBuilder $container, array $config);
+}

src/ServiceContainer/ServiceContainerExtension.php

@@ -29,31 +29,23 @@
 final class ServiceContainerExtension implements Extension
 {
     /**
-     * @var callable<ContainerBuilder, array>:LoaderInterface
+     * @var LoaderFactory
      */
-    private $loaderCallable;
+    private $loaderFactory;
 
     public function __construct()
     {
-        $this->loaderCallable = function (ContainerBuilder $container, array $config) {
-            $fileLocator = new FileLocator($container->getParameter('paths.base'));
-
-            return new DelegatingLoader(new LoaderResolver([
-                new XmlFileLoader($container, $fileLocator),
-                new YamlFileLoader($container, $fileLocator),
-                new PhpFileLoader($container, $fileLocator),
-            ]));
-        };
+        $this->loaderFactory = new DefaultLoaderFactory();
     }
 
     /**
      * @api
      *
-     * @param callable<ContainerBuilder, array>:LoaderInterface $loaderCallable
+     * @param LoaderFactory $loaderFactory
      */
-    public function setLoaderCallable(callable $loaderCallable)
+    public function setLoaderCallable(LoaderFactory $loaderFactory)
     {
-        $this->loaderCallable = $loaderCallable;
+        $this->loaderFactory = $loaderFactory;
     }
 
     /**
@@ -98,10 +90,7 @@ public function configure(ArrayNodeDefinition $builder)
      */
     public function load(ContainerBuilder $container, array $config)
     {
-        $loaderCallable = $this->loaderCallable;
-
-        /** @var LoaderInterface $loader */
-        $loader = $loaderCallable($container, $config);
+        $loader = $this->loaderFactory->createLoader($container, $config);
 
         foreach ($config['imports'] as $file) {
             $loader->load($file);