From 2bda799b9ae74456a440b249022c4729d9aa6ab0 Mon Sep 17 00:00:00 2001 From: Frederic Guillot Date: Thu, 14 Apr 2016 22:09:48 -0400 Subject: Allow plugins loading from another location --- app/Core/Plugin/Loader.php | 6 +++++- composer.json | 1 - 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/app/Core/Plugin/Loader.php b/app/Core/Plugin/Loader.php index 775673de..0b009f75 100644 --- a/app/Core/Plugin/Loader.php +++ b/app/Core/Plugin/Loader.php @@ -2,6 +2,7 @@ namespace Kanboard\Core\Plugin; +use Composer\Autoload\ClassLoader; use DirectoryIterator; use PDOException; use LogicException; @@ -39,6 +40,10 @@ class Loader extends \Kanboard\Core\Base public function scan() { if (file_exists(PLUGINS_DIR)) { + $loader = new ClassLoader(); + $loader->addPsr4('Kanboard\Plugin\\', PLUGINS_DIR); + $loader->register(); + $dir = new DirectoryIterator(PLUGINS_DIR); foreach ($dir as $fileinfo) { @@ -69,7 +74,6 @@ class Loader extends \Kanboard\Core\Base $instance = new $class($this->container); Tool::buildDic($this->container, $instance->getClasses()); - Tool::buildDICHelpers($this->container, $instance->getHelpers()); $instance->initialize(); diff --git a/composer.json b/composer.json index 5dd9a4cf..7224f1ef 100644 --- a/composer.json +++ b/composer.json @@ -41,7 +41,6 @@ "autoload" : { "classmap" : ["app/"], "psr-4" : { - "Kanboard\\Plugin\\": "plugins/", "Kanboard\\" : "app/" }, "files" : [ -- cgit v1.2.3