Fix loading of plugins

box.json.dist

@@ -12,7 +12,8 @@
         "config.yaml.dist",
         "Resources/public.key",
         "vendor/autoload.php",
-        "vendor/shopwarelabs/plugin-info/res/plugin-info-schema.json"
+        "vendor/shopwarelabs/plugin-info/res/plugin-info-schema.json",
+        "vendor/symfony/dependency-injection/Loader/schema/dic/services/services-1.0.xsd"
     ],
     "finder": [
         {

composer.json

@@ -12,7 +12,7 @@
         "symfony/process": "~4.4",
         "symfony/dependency-injection": "~4.4",
         "dnoegel/php-xdg-base-dir": "~0.1",
-        "shopwarelabs/plugin-info": "dev-master",
+        "shopwarelabs/plugin-info": "0.1.0",
         "fzaninotto/faker": "^1.9.1",
         "guzzlehttp/guzzle": "^6.5.2",
         "padraic/phar-updater": "^1.0.6"

src/Application/DependencyInjection.php

@@ -110,7 +110,6 @@ public static function createContainer($rootDir): ContainerBuilder
             ->setPublic(true);
 
         $container->register('extension_manager', ExtensionManager::class)
-            ->addArgument(new Reference('autoloader'))
             ->setPublic(true);
 
         $container->register('command_manager', CommandManager::class)

src/Application/ExtensionManager.php

@@ -8,7 +8,6 @@
 
 namespace ShopwareCli\Application;
 
-use Composer\Autoload\ClassLoader;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 
 /**
@@ -32,16 +31,6 @@ class ExtensionManager
      */
     protected $extensions = [];
 
-    /**
-     * @var ClassLoader
-     */
-    private $autoLoader;
-
-    public function __construct(ClassLoader $autoLoader)
-    {
-        $this->autoLoader = $autoLoader;
-    }
-
     /**
      * Read all available plugins
      *
@@ -58,7 +47,7 @@ public function discoverExtensions($extensionDirs): void
                 }
 
                 $vendorName = $vendorPath->getBasename();
-                $this->registerExtensionNamespace($vendorPath->getPathname(), "{$vendorName}\\");
+                $this->registerExtensionAutoloader($vendorPath->getPathname());
                 $this->discoverVendorFolder($vendorPath->getPathname(), $vendorName);
             }
         }
@@ -118,12 +107,9 @@ public function setExtension($name, $class): void
     }
 
     /**
-     * @param string $vendorPath
-     * @param string $vendorName
-     *
      * @throws \RuntimeException
      */
-    private function discoverVendorFolder($vendorPath, $vendorName): void
+    private function discoverVendorFolder(string $vendorPath, string $vendorName): void
     {
         /** @var \DirectoryIterator $extensionPath */
         foreach (new \DirectoryIterator($vendorPath) as $extensionPath) {
@@ -149,15 +135,10 @@ private function isValidExtensionDir(\DirectoryIterator $vendorPath): bool
             && \strpos($vendorPath->getBasename(), '.') !== 0; // skip dot directories e.g. .git
     }
 
-    /**
-     * Register a namespace for given extension path
-     *
-     * @param string $path
-     * @param string $namespace
-     */
-    private function registerExtensionNamespace($path, $namespace): void
+    private function registerExtensionAutoloader(string $path): void
     {
-        $namespace = \rtrim($namespace, '\\') . '\\';
-        $this->autoLoader->addPsr4($namespace, $path);
+        if (\is_file($path . '/vendor/autoload.php')) {
+            require_once $path . '/vendor/autoload.php';
+        }
     }
 }