Add sub namespace for plugins

3 files changed, 11 insertions, 10 deletions

diff --git a/app/Core/PluginBase.php b/app/Core/Plugin/Base.php
index 457afa03..580d41ad 100644
--- a/app/Core/PluginBase.php
+++ b/app/Core/Plugin/Base.php
@@ -1,14 +1,14 @@
 <?php
 
-namespace Core;
+namespace Core\Plugin;
 
 /**
  * Plugin Base class
  *
- * @package  core
+ * @package  plugin
  * @author   Frederic Guillot
  */
-abstract class PluginBase extends Base
+abstract class Base extends \Core\Base
 {
     /**
      * Method called for each request
diff --git a/app/Core/PluginLoader.php b/app/Core/Plugin/Loader.php
index c7c254f7..ffead9f6 100644
--- a/app/Core/PluginLoader.php
+++ b/app/Core/Plugin/Loader.php
@@ -1,17 +1,18 @@
 <?php
 
-namespace Core;
+namespace Core\Plugin;
 
 use DirectoryIterator;
 use PDOException;
+use Core\Tool;
 
 /**
  * Plugin Loader
  *
- * @package  core
+ * @package  plugin
  * @author   Frederic Guillot
  */
-class PluginLoader extends Base
+class Loader extends \Core\Base
 {
     /**
      * Schema version table for plugins
@@ -27,8 +28,8 @@ class PluginLoader extends Base
      */
     public function scan()
     {
-        if (file_exists(__DIR__.'/../../plugins')) {
-            $dir = new DirectoryIterator(__DIR__.'/../../plugins');
+        if (file_exists(__DIR__.'/../../../plugins')) {
+            $dir = new DirectoryIterator(__DIR__.'/../../../plugins');
 
             foreach ($dir as $fileinfo) {
                 if (! $fileinfo->isDot() && $fileinfo->isDir()) {
@@ -63,7 +64,7 @@ class PluginLoader extends Base
      */
     public function loadSchema($plugin)
     {
-        $filename = __DIR__.'/../../plugins/'.$plugin.'/Schema/'.ucfirst(DB_DRIVER).'.php';
+        $filename = __DIR__.'/../../../plugins/'.$plugin.'/Schema/'.ucfirst(DB_DRIVER).'.php';
 
         if (file_exists($filename)) {
             require($filename);
diff --git a/app/common.php b/app/common.php
index ea38ab36..dcd571bc 100644
--- a/app/common.php
+++ b/app/common.php
@@ -33,5 +33,5 @@ if (ENABLE_URL_REWRITE) {
     require __DIR__.'/routes.php';
 }
 
-$plugin = new Core\PluginLoader($container);
+$plugin = new Core\Plugin\Loader($container);
 $plugin->scan();