Replace Puli with composer-locator

Author: mnapoli

.gitignore

@@ -1,3 +1,2 @@
 /vendor/
 /composer.lock
-/.puli/

composer.json

@@ -16,17 +16,12 @@
         }
     },
     "require": {
-        "php": "^5.5|^7.0",
+        "php": "^7.0",
         "php-di/php-di": "^5.2",
         "doctrine/cache": "^1.4",
-        "puli/repository": "^1.0.0-beta8",
-        "puli/discovery": "^1.0.0-beta8",
-        "puli/composer-plugin": "^1.0.0-beta8"
+        "mindplay/composer-locator": "^2.1"
     },
     "require-dev": {
-        "phpunit/phpunit": "^4.8",
-        "puli/cli": "^1.0"
-    },
-    "minimum-stability": "beta",
-    "prefer-stable": true
+        "phpunit/phpunit": "^5.0"
+    }
 }

puli.json

@@ -2,14 +2,11 @@
 
 namespace DI\Kernel;
 
+use ComposerLocator;
 use DI\Cache\ArrayCache;
 use DI\Container;
 use DI\ContainerBuilder;
 use Doctrine\Common\Cache\Cache;
-use Interop\Container\ContainerInterface;
-use Puli\Discovery\Api\Discovery;
-use Puli\Repository\Api\Resource\FilesystemResource;
-use Puli\Repository\Api\ResourceRepository;
 
 /**
  * Application kernel.
@@ -19,11 +16,9 @@
 class Kernel
 {
     /**
-     * If null, defaults to the constant PULI_FACTORY_CLASS defined by Puli.
-     *
-     * @var string|null
+     * @var string
      */
-    public static $puliFactoryClass;
+    public static $locatorClass = 'ComposerLocator';
 
     /**
      * @var string[]
@@ -44,7 +39,7 @@ class Kernel
      * @param array  $modules     The name of the modules to load.
      * @param string $environment Environment of the application (prod, dev, test, ...).
      */
-    public function __construct(array $modules = [], $environment = 'prod')
+    public function __construct(array $modules = [], string $environment = 'prod')
     {
         $this->modules = $modules;
         $this->environment = $environment;
@@ -65,43 +60,19 @@ public function addConfig(array $config)
     }
 
     /**
-     * Configure and create a container using all configuration files registered under
-     * the `php-di/configuration` binding type in Puli.
-     *
-     * @return Container
+     * Configure and create a container using all configuration files found in included modules.
      */
-    public function createContainer()
+    public function createContainer() : Container
     {
-        if (!self::$puliFactoryClass && !defined('PULI_FACTORY_CLASS')) {
-            throw new \RuntimeException('Puli is not installed');
-        }
-
-        // Create Puli objects
-        $factoryClass = self::$puliFactoryClass ?: PULI_FACTORY_CLASS;
-        $puli = new $factoryClass();
-        /** @var ResourceRepository $repository */
-        $repository = $puli->createRepository();
-
         $containerBuilder = new ContainerBuilder();
 
         $cache = $this->getContainerCache();
         if ($cache) {
             $containerBuilder->setDefinitionCache($cache);
         }
 
-        // Puli objects
-        $containerBuilder->addDefinitions([
-            'puli.factory' => $puli,
-            ResourceRepository::class => $repository,
-            Discovery::class => function (ContainerInterface $c) {
-                $puli = $c->get('puli.factory');
-
-                return $puli->createDiscovery($c->get(ResourceRepository::class));
-            },
-        ]);
-
         foreach ($this->modules as $module) {
-            $this->loadModule($containerBuilder, $repository, $module);
+            $this->loadModule($containerBuilder, $module);
         }
 
         if (!empty($this->config)) {
@@ -130,22 +101,20 @@ protected function configureContainerBuilder(ContainerBuilder $containerBuilder)
     {
     }
 
-    private function loadModule(ContainerBuilder $builder, ResourceRepository $resources, $module)
+    private function loadModule(ContainerBuilder $builder, string $module)
     {
+        $locatorClass = self::$locatorClass;
+        $path = $locatorClass::getPath($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());
-            }
+        foreach (glob($path.'/res/config/*.php') as $file) {
+            $builder->addDefinitions($file);
         }
 
         // Load the environment-specific config if it exists
-        $envConfig = '/'.$module.'/config/env/'.$this->environment.'.php';
-        if ($resources->contains($envConfig)) {
-            $resource = $resources->get($envConfig);
-            if ($resource instanceof FilesystemResource) {
-                $builder->addDefinitions($resource->getFilesystemPath());
-            }
+        $envConfig = $path.'/res/config/env/'.$this->environment.'.php';
+        if (file_exists($envConfig)) {
+            $builder->addDefinitions($envConfig);
         }
     }
 }