From e6cd773f5a8bd757c9362524cfeb3f7cb7fa81c9 Mon Sep 17 00:00:00 2001
From: ArthurHoaro <arthur@hoa.ro>
Date: Wed, 8 Mar 2017 19:59:00 +0100
Subject: [PATCH] Fix blocking namespace issue

---
 application/config/ConfigPlugin.php             | 17 ++---------------
 .../exception/PluginConfigOrderException.php    | 17 +++++++++++++++++
 composer.json                                   |  3 ++-
 index.php                                       |  1 +
 tests/config/ConfigPluginTest.php               |  6 ++----
 5 files changed, 24 insertions(+), 20 deletions(-)
 create mode 100644 application/config/exception/PluginConfigOrderException.php

diff --git a/application/config/ConfigPlugin.php b/application/config/ConfigPlugin.php
index 61a594d3..b3d9752b 100644
--- 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
new file mode 100644
index 00000000..f9d68750
--- /dev/null
+++ 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
index 70b87bb9..57851e53 100644
--- 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
index 064f43ca..3c2bb1d2 100644
--- a/index.php
+++ b/index.php
@@ -62,6 +62,7 @@ require_once __DIR__ . '/vendor/autoload.php';
 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
index 22ab927b..deb02c9e 100644
--- 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 @@ class ConfigPluginTest extends \PHPUnit_Framework_TestCase
     /**
      * Test save_plugin_config with invalid data.
      *
-     * @expectedException Shaarli\Config\PluginConfigOrderException
+     * @expectedException Shaarli\Config\Exception\PluginConfigOrderException
      */
     public function testSavePluginConfigInvalid()
     {
-- 
2.41.0