added Plugin\Loader class

Author: mkusher

composer.json

@@ -7,7 +7,7 @@
         }
     ],
     "autoload":{
-        "psr-0":{"":"src/"}
+        "psr-4":{"":"src/"}
     },
     "require": {
         "phine/path": "~1.0",

src/Application/BaseApplication.php

@@ -7,15 +7,15 @@
 use Command\ErrorCommand;
 use DI\Container;
 use DI\ContainerBuilder;
-use Plugin\Package;
+use Plugin\Loader;
 
 abstract class BaseApplication
 {
     public function __construct($noFsIO)
     {
         $this->noFsIO = $noFsIO;
         $this->createContainer();
-        $this->pluginsPackage = $this->container->get(Package::class);
+        $this->pluginsLoader = $this->container->get(Loader::class);
         $this->loadPlugins();
     }
     public function handle($request, $response, $data)
@@ -68,21 +68,7 @@ protected function getRouter()
     }
     protected function loadPlugins()
     {
-        $plugins = $this->pluginsPackage->getPluginsList();
-        foreach ($plugins as $pluginName) {
-            $parts = explode("/", $pluginName);
-            $className = implode("\\", array_map(function ($part) {
-                return ucfirst($part);
-            }, $parts));
-            $className .= "\\Plugin";
-            try {
-                /** @var \Plugin\PluginInterface */
-                $plugin = $this->container->get($className);
-                $plugin->init();
-            } catch (\Exception $e) {
-                printf("Plugin Error: %s\n", $e->getMessage());
-            }
-        }
+        return $this->pluginsLoader->load();
     }
     abstract protected function getCommandName($request);
     protected function createContainer()
@@ -94,8 +80,8 @@ protected function createContainer()
     }
 
     protected $router;
-    /** @var Package */
-    protected $pluginsPackage;
+    /** @var Loader */
+    protected $pluginsLoader;
     static protected $projectsPool = [];
     static protected $currentProject = null;
     /** @var Container */

src/Plugin/Loader.php

@@ -0,0 +1,47 @@
+<?php
+
+namespace Plugin;
+
+use DI\Container;
+
+class Loader
+{
+    public function __construct(Package $package, Container $container)
+    {
+        $this->package = $package;
+        $this->container = $container;
+    }
+    public function load()
+    {
+        $plugins = $this->package->getPluginsList();
+        foreach ($plugins as $pluginName) {
+            $this->loadPlugin($pluginName);
+        }
+    }
+    public function loadPlugin($pluginName)
+    {
+        $parts = explode("/", $pluginName);
+        $className = implode("\\", array_map(function ($part) {
+            return implode("", array_map(
+                function ($part) {
+                    return ucfirst($part);
+                },
+                explode("-", $part)
+            ));
+        }, $parts));
+        $className .= "\\" . $this->pluginClassName;
+        try {
+            /** @var \Plugin\PluginInterface */
+            $plugin = $this->container->get($className);
+            $plugin->init();
+        } catch (\Exception $e) {
+            printf("Plugin Error: %s\n", $e->getMessage());
+        }
+    }
+
+    private $pluginClassName = "Plugin";
+    /** @var Package */
+    private $package;
+    /** @var Container */
+    private $container;
+}