Move middleware to a subfolder

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;

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;

classes/Middleware/LinkHeaderMiddleware.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Alltube;
+namespace Alltube\Middleware;
 
 use Psr\Container\ContainerInterface;
 use Slim\Http\Request;

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;

classes/Middleware/RouterPathMiddleware.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Alltube;
+namespace Alltube\Middleware;
 
 use Psr\Container\ContainerInterface;
 use Slim\Http\Request;

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;

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;