Require a module list to be given, drop the auto-loading of config using Puli bindings

Author: mnapoli

src/Kernel.php

@@ -6,11 +6,9 @@
 use DI\Container;
 use DI\ContainerBuilder;
 use Doctrine\Common\Cache\Cache;
-use Puli\Discovery\Api\Binding\Binding;
 use Puli\Discovery\Api\Discovery;
-use Puli\Discovery\Binding\ResourceBinding;
+use Puli\Repository\Api\Resource\FilesystemResource;
 use Puli\Repository\Api\ResourceRepository;
-use Puli\Repository\Resource\FileResource;
 
 /**
  * Application kernel.
@@ -19,23 +17,24 @@
  */
 class Kernel
 {
-    /**
-     * Name of the binding for PHP-DI configuration files in Puli.
-     *
-     * @see http://docs.puli.io/en/latest/discovery/introduction.html
-     */
-    const PULI_BINDING_NAME = 'php-di/configuration';
-
     /**
      * If null, defaults to the constant PULI_FACTORY_CLASS defined by Puli.
      *
      * @var string|null
      */
     private $puliFactoryClass;
 
-    public function setPuliFactoryClass($class)
+    /**
+     * @var string[]
+     */
+    private $modules;
+
+    /**
+     * @param array $modules The name of the modules to load.
+     */
+    public function __construct(array $modules = [])
     {
-        $this->puliFactoryClass = $class;
+        $this->modules = $modules;
     }
 
     /**
@@ -55,8 +54,6 @@ public function createContainer()
         $factory = new $factoryClass();
         /** @var ResourceRepository $repository */
         $repository = $factory->createRepository();
-        /** @var Discovery $discovery */
-        $discovery = $factory->createDiscovery($repository);
 
         $containerBuilder = new ContainerBuilder();
 
@@ -65,32 +62,31 @@ public function createContainer()
             $containerBuilder->setDefinitionCache($cache);
         }
 
-        // Discover and load all configuration files registered under `php-di/configuration` in Puli
-        $bindings = $discovery->findBindings(self::PULI_BINDING_NAME);
-        $bindings = array_filter($bindings, function (Binding $binding) {
-            return $binding instanceof ResourceBinding;
-        });
-        /** @var ResourceBinding[] $bindings */
-        foreach ($bindings as $binding) {
-            foreach ($binding->getResources() as $resource) {
-                if (!$resource instanceof FileResource) {
-                    throw new \RuntimeException(sprintf('Cannot load "%s": only file resources are supported', $resource->getName()));
-                }
-                $containerBuilder->addDefinitions($resource->getFilesystemPath());
-            }
-        }
-
         // Puli objects
         $containerBuilder->addDefinitions([
             ResourceRepository::class => $repository,
-            Discovery::class => $discovery,
+            Discovery::class => function () use ($factory, $repository) {
+                return $factory->createDiscovery($repository);
+            },
         ]);
 
+        foreach ($this->modules as $module) {
+            $this->loadModule($containerBuilder, $repository, $module);
+        }
+
         $this->configureContainerBuilder($containerBuilder);
 
         return $containerBuilder->build();
     }
 
+    /**
+     * @param string $class
+     */
+    public function setPuliFactoryClass($class)
+    {
+        $this->puliFactoryClass = $class;
+    }
+
     /**
      * Override this method to configure the cache to use for container definitions.
      *
@@ -107,4 +103,14 @@ protected function getContainerCache()
     protected function configureContainerBuilder(ContainerBuilder $containerBuilder)
     {
     }
+
+    private function loadModule(ContainerBuilder $builder, ResourceRepository $resources, $module)
+    {
+        // Load all config files in the config/ directory
+        foreach ($resources->find('/' . $module . '/config/*.php') as $resource) {
+            if ($resource instanceof FilesystemResource) {
+                $builder->addDefinitions($resource->getFilesystemPath());
+            }
+        }
+    }
 }

tests/KernelTest.php

@@ -5,8 +5,6 @@
 use DI\Kernel\Kernel;
 use DI\Kernel\Test\Fixture\PuliFactoryClass;
 use Puli\Discovery\Api\Discovery;
-use Puli\Discovery\Api\Type\BindingType;
-use Puli\Discovery\Binding\ResourceBinding;
 use Puli\Discovery\InMemoryDiscovery;
 use Puli\Repository\Api\ResourceRepository;
 use Puli\Repository\InMemoryRepository;
@@ -58,26 +56,16 @@ public function registers_puli_discovery()
     /**
      * @test
      */
-    public function registers_module_configuration_files()
+    public function loads_module_configs()
     {
-        $this->createPuliResource('/blog/config.php', __DIR__.'/Fixture/config.php');
-        $this->bindPuliResource('/blog/config.php', Kernel::PULI_BINDING_NAME);
+        PuliFactoryClass::$repository->add('/blog/config/config.php', new FileResource(__DIR__.'/Fixture/config.php'));
 
+        $this->kernel = new Kernel([
+            'blog',
+        ]);
+        $this->kernel->setPuliFactoryClass(PuliFactoryClass::class);
         $container = $this->kernel->createContainer();
-        $this->assertEquals('bar', $container->get('foo'));
-    }
 
-    private function createPuliResource($path, $file)
-    {
-        PuliFactoryClass::$repository->add($path, new FileResource($file));
-    }
-
-    private function bindPuliResource($path, $bindingName)
-    {
-        PuliFactoryClass::$discovery->addBindingType(new BindingType($bindingName));
-
-        $binding = new ResourceBinding($path, $bindingName);
-        $binding->setRepository(PuliFactoryClass::$repository);
-        PuliFactoryClass::$discovery->addBinding($binding);
+        $this->assertEquals('bar', $container->get('foo'));
     }
 }