Fix blocking namespace issue

shaarli · Mar 8, 2017 · e6cd773 · e6cd773
1 parent 7c26f66
commit e6cd773
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 20 deletions.
diff --git a/application/config/ConfigPlugin.php b/application/config/ConfigPlugin.php
@@ -1,5 +1,6 @@
 <?php
-namespace Shaarli\Config;
+
+use Shaarli\Config\Exception\PluginConfigOrderException;
 
 /**
  * Plugin configuration helper functions.
@@ -110,17 +111,3 @@ function load_plugin_parameter_values($plugins, $conf)
 
     return $out;
 }
-
-/**
- * Exception used if an error occur while saving plugin configuration.
- */
-class PluginConfigOrderException extends \Exception
-{
-    /**
-     * Construct exception.
-     */
-    public function __construct()
-    {
-        $this->message = 'An error occurred while trying to save plugins loading order.';
-    }
-}
diff --git a/application/config/exception/PluginConfigOrderException.php b/application/config/exception/PluginConfigOrderException.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace Shaarli\Config\Exception;
+
+/**
+ * Exception used if an error occur while saving plugin configuration.
+ */
+class PluginConfigOrderException extends \Exception
+{
+    /**
+     * Construct exception.
+     */
+    public function __construct()
+    {
+        $this->message = 'An error occurred while trying to save plugins loading order.';
+    }
+}
diff --git a/composer.json b/composer.json
@@ -29,7 +29,8 @@
             "Shaarli\\Api\\": "application/api/",
             "Shaarli\\Api\\Controllers\\": "application/api/controllers",
             "Shaarli\\Api\\Exceptions\\": "application/api/exceptions",
-            "Shaarli\\Config\\": "application/config/"
+            "Shaarli\\Config\\": "application/config/",
+            "Shaarli\\Config\\Exception\\": "application/config/exception"
         }
     }
 }
diff --git a/index.php b/index.php
@@ -62,6 +62,7 @@
 require_once 'application/ApplicationUtils.php';
 require_once 'application/Cache.php';
 require_once 'application/CachedPage.php';
+require_once 'application/config/ConfigPlugin.php';
 require_once 'application/FeedBuilder.php';
 require_once 'application/FileUtils.php';
 require_once 'application/HttpUtils.php';

diff --git a/tests/config/ConfigPluginTest.php b/tests/config/ConfigPluginTest.php
@@ -1,9 +1,7 @@
 <?php
 namespace Shaarli\Config;
 
-/**
- * Config' tests
- */
+use Shaarli\Config\Exception\PluginConfigOrderException;
 
 require_once 'application/config/ConfigPlugin.php';
 
@@ -41,7 +39,7 @@ public function testSavePluginConfigValid()
     /**
      * Test save_plugin_config with invalid data.
      *
-     * @expectedException Shaarli\Config\PluginConfigOrderException
+     * @expectedException Shaarli\Config\Exception\PluginConfigOrderException
      */
     public function testSavePluginConfigInvalid()
     {