From 123a6c5ad97eb5cc7050820d5beb65d8e6edddd6 Mon Sep 17 00:00:00 2001
From: Pierre Rudloff <contact@rudloff.pro>
Date: Tue, 20 Oct 2020 23:13:48 +0200
Subject: [PATCH] Move middleware to a subfolder

---
 classes/Controller/FrontController.php            | 2 +-
 classes/{ => Middleware}/CspMiddleware.php        | 3 ++-
 classes/{ => Middleware}/LinkHeaderMiddleware.php | 2 +-
 classes/{ => Middleware}/LocaleMiddleware.php     | 4 +++-
 classes/{ => Middleware}/RouterPathMiddleware.php | 2 +-
 index.php                                         | 8 ++++----
 tests/LocaleMiddlewareTest.php                    | 2 +-
 7 files changed, 13 insertions(+), 10 deletions(-)
 rename classes/{ => Middleware}/CspMiddleware.php (97%)
 rename classes/{ => Middleware}/LinkHeaderMiddleware.php (96%)
 rename classes/{ => Middleware}/LocaleMiddleware.php (96%)
 rename classes/{ => Middleware}/RouterPathMiddleware.php (96%)

diff --git a/classes/Controller/FrontController.php b/classes/Controller/FrontController.php
index f46e326..912fc8d 100644
--- a/classes/Controller/FrontController.php
+++ b/classes/Controller/FrontController.php
@@ -6,11 +6,11 @@
 
 namespace Alltube\Controller;
 
-use Alltube\CspMiddleware;
 use Alltube\Library\Exception\PasswordException;
 use Alltube\Library\Exception\AlltubeLibraryException;
 use Alltube\Library\Exception\WrongPasswordException;
 use Alltube\Locale;
+use Alltube\Middleware\CspMiddleware;
 use Exception;
 use Slim\Http\StatusCode;
 use Symfony\Component\ErrorHandler\ErrorRenderer\HtmlErrorRenderer;
diff --git a/classes/CspMiddleware.php b/classes/Middleware/CspMiddleware.php
similarity index 97%
rename from classes/CspMiddleware.php
rename to classes/Middleware/CspMiddleware.php
index fde3377..d5f24f0 100644
--- a/classes/CspMiddleware.php
+++ b/classes/Middleware/CspMiddleware.php
@@ -1,7 +1,8 @@
 <?php
 
-namespace Alltube;
+namespace Alltube\Middleware;
 
+use Alltube\Config;
 use ParagonIE\CSPBuilder\CSPBuilder;
 use Psr\Container\ContainerInterface;
 use Psr\Http\Message\MessageInterface;
diff --git a/classes/LinkHeaderMiddleware.php b/classes/Middleware/LinkHeaderMiddleware.php
similarity index 96%
rename from classes/LinkHeaderMiddleware.php
rename to classes/Middleware/LinkHeaderMiddleware.php
index 6796f36..e94e5c5 100644
--- a/classes/LinkHeaderMiddleware.php
+++ b/classes/Middleware/LinkHeaderMiddleware.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Alltube;
+namespace Alltube\Middleware;
 
 use Psr\Container\ContainerInterface;
 use Slim\Http\Request;
diff --git a/classes/LocaleMiddleware.php b/classes/Middleware/LocaleMiddleware.php
similarity index 96%
rename from classes/LocaleMiddleware.php
rename to classes/Middleware/LocaleMiddleware.php
index b7395bd..b28f357 100644
--- a/classes/LocaleMiddleware.php
+++ b/classes/Middleware/LocaleMiddleware.php
@@ -4,8 +4,10 @@
  * LocaleMiddleware class.
  */
 
-namespace Alltube;
+namespace Alltube\Middleware;
 
+use Alltube\Locale;
+use Alltube\LocaleManager;
 use Psr\Container\ContainerInterface;
 use Slim\Http\Request;
 use Slim\Http\Response;
diff --git a/classes/RouterPathMiddleware.php b/classes/Middleware/RouterPathMiddleware.php
similarity index 96%
rename from classes/RouterPathMiddleware.php
rename to classes/Middleware/RouterPathMiddleware.php
index 10672ce..a3205b9 100644
--- a/classes/RouterPathMiddleware.php
+++ b/classes/Middleware/RouterPathMiddleware.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Alltube;
+namespace Alltube\Middleware;
 
 use Psr\Container\ContainerInterface;
 use Slim\Http\Request;
diff --git a/index.php b/index.php
index ef6f166..819ee7b 100644
--- a/index.php
+++ b/index.php
@@ -6,13 +6,13 @@ use Alltube\ConfigFactory;
 use Alltube\Controller\DownloadController;
 use Alltube\Controller\FrontController;
 use Alltube\Controller\JsonController;
-use Alltube\CspMiddleware;
 use Alltube\ErrorHandler;
-use Alltube\LinkHeaderMiddleware;
 use Alltube\LocaleManagerFactory;
-use Alltube\LocaleMiddleware;
 use Alltube\LoggerFactory;
-use Alltube\RouterPathMiddleware;
+use Alltube\Middleware\CspMiddleware;
+use Alltube\Middleware\LinkHeaderMiddleware;
+use Alltube\Middleware\LocaleMiddleware;
+use Alltube\Middleware\RouterPathMiddleware;
 use Alltube\ViewFactory;
 use Slim\App;
 use Slim\Container;
diff --git a/tests/LocaleMiddlewareTest.php b/tests/LocaleMiddlewareTest.php
index 1df6f09..fecfc16 100644
--- a/tests/LocaleMiddlewareTest.php
+++ b/tests/LocaleMiddlewareTest.php
@@ -7,7 +7,7 @@
 namespace Alltube\Test;
 
 use Alltube\LocaleManager;
-use Alltube\LocaleMiddleware;
+use Alltube\Middleware\LocaleMiddleware;
 use Slim\Container;
 use Slim\Http\Environment;
 use Slim\Http\Request;