From df52bab204931df04d84ae26180b45aa59450b04 Mon Sep 17 00:00:00 2001
From: Maarten <maarten@vrijssel.nl>
Date: Tue, 24 Dec 2019 00:39:09 +0100
Subject: [PATCH] Fix Exceptions namespaces

---
 .../Exceptions/ClassNotFoundException.php          |  2 +-
 .../Exceptions/Exceptions/HttpException.php        |  5 +++++
 .../Exceptions/InvalidArgumentException.php        |  2 +-
 .../Exceptions/MalformedUrlException.php           |  2 +-
 .../Exceptions/NotFoundHttpException.php           |  5 +++++
 .../Exceptions/Exceptions/SecurityException.php    |  2 +-
 .../Exceptions/TokenMismatchException.php          |  2 +-
 src/Runtime/Factory/BootstrapFactory.php           |  2 +-
 src/Runtime/Http/Input/InputFile.php               |  2 +-
 src/Runtime/Http/Input/InputHandler.php            |  2 +-
 src/Runtime/Http/Middleware/BaseCsrfVerifier.php   |  4 ++--
 src/Runtime/Http/Request.php                       |  2 +-
 src/Runtime/Http/Response.php                      |  2 +-
 src/Runtime/Http/Security/CookieTokenProvider.php  |  2 +-
 src/Runtime/Http/Url.php                           |  2 +-
 src/Runtime/Router/ClassLoader/ClassLoader.php     |  2 +-
 src/Runtime/Router/Exceptions/HttpException.php    |  8 --------
 .../Router/Exceptions/NotFoundHttpException.php    |  8 --------
 src/Runtime/Router/Route.php                       | 10 +++++-----
 src/Runtime/Router/Route/IRoute.php                |  2 +-
 src/Runtime/Router/Route/LoadableRoute.php         |  2 +-
 src/Runtime/Router/Route/Route.php                 |  2 +-
 src/Runtime/Router/Router.php                      | 14 +++++++-------
 23 files changed, 40 insertions(+), 46 deletions(-)
 create mode 100644 src/Runtime/Exceptions/Exceptions/HttpException.php
 create mode 100644 src/Runtime/Exceptions/Exceptions/NotFoundHttpException.php
 delete mode 100644 src/Runtime/Router/Exceptions/HttpException.php
 delete mode 100644 src/Runtime/Router/Exceptions/NotFoundHttpException.php

diff --git a/src/Runtime/Exceptions/Exceptions/ClassNotFoundException.php b/src/Runtime/Exceptions/Exceptions/ClassNotFoundException.php
index 7a65b73..f39442c 100644
--- a/src/Runtime/Exceptions/Exceptions/ClassNotFoundException.php
+++ b/src/Runtime/Exceptions/Exceptions/ClassNotFoundException.php
@@ -1,5 +1,5 @@
 <?php
 
-namespace Runtime\Exceptions;
+namespace Runtime\Exceptions\Exceptions;
 
 class ClassNotFoundException extends \BadMethodCallException {}
\ No newline at end of file
diff --git a/src/Runtime/Exceptions/Exceptions/HttpException.php b/src/Runtime/Exceptions/Exceptions/HttpException.php
new file mode 100644
index 0000000..8018159
--- /dev/null
+++ b/src/Runtime/Exceptions/Exceptions/HttpException.php
@@ -0,0 +1,5 @@
+<?php
+
+namespace Runtime\Exceptions\Exceptions;
+
+class HttpException extends \Exception {}
\ No newline at end of file
diff --git a/src/Runtime/Exceptions/Exceptions/InvalidArgumentException.php b/src/Runtime/Exceptions/Exceptions/InvalidArgumentException.php
index a1cda13..a6f41f2 100644
--- a/src/Runtime/Exceptions/Exceptions/InvalidArgumentException.php
+++ b/src/Runtime/Exceptions/Exceptions/InvalidArgumentException.php
@@ -1,5 +1,5 @@
 <?php
 
-namespace Runtime\Exceptions;
+namespace Runtime\Exceptions\Exceptions;
 
 class InvalidArgumentException extends \InvalidArgumentException {}
\ No newline at end of file
diff --git a/src/Runtime/Exceptions/Exceptions/MalformedUrlException.php b/src/Runtime/Exceptions/Exceptions/MalformedUrlException.php
index fb1f4d1..746a085 100644
--- a/src/Runtime/Exceptions/Exceptions/MalformedUrlException.php
+++ b/src/Runtime/Exceptions/Exceptions/MalformedUrlException.php
@@ -1,5 +1,5 @@
 <?php
 
-namespace Runtime\Exceptions;
+namespace Runtime\Exceptions\Exceptions;
 
 class MalformedUrlException extends \Exception {}
\ No newline at end of file
diff --git a/src/Runtime/Exceptions/Exceptions/NotFoundHttpException.php b/src/Runtime/Exceptions/Exceptions/NotFoundHttpException.php
new file mode 100644
index 0000000..410c823
--- /dev/null
+++ b/src/Runtime/Exceptions/Exceptions/NotFoundHttpException.php
@@ -0,0 +1,5 @@
+<?php
+
+namespace Runtime\Exceptions\Exceptions;
+
+class NotFoundHttpException extends HttpException {}
\ No newline at end of file
diff --git a/src/Runtime/Exceptions/Exceptions/SecurityException.php b/src/Runtime/Exceptions/Exceptions/SecurityException.php
index 711d6b1..fbe4dcb 100644
--- a/src/Runtime/Exceptions/Exceptions/SecurityException.php
+++ b/src/Runtime/Exceptions/Exceptions/SecurityException.php
@@ -1,5 +1,5 @@
 <?php
 
-namespace Runtime\Exceptions;
+namespace Runtime\Exceptions\Exceptions;
 
 class SecurityException extends \Exception {}
\ No newline at end of file
diff --git a/src/Runtime/Exceptions/Exceptions/TokenMismatchException.php b/src/Runtime/Exceptions/Exceptions/TokenMismatchException.php
index 5aa55e9..3837654 100644
--- a/src/Runtime/Exceptions/Exceptions/TokenMismatchException.php
+++ b/src/Runtime/Exceptions/Exceptions/TokenMismatchException.php
@@ -1,5 +1,5 @@
 <?php
 
-namespace Runtime\Exceptions;
+namespace Runtime\Exceptions\Exceptions;
 
 class TokenMismatchException extends \Exception {}
\ No newline at end of file
diff --git a/src/Runtime/Factory/BootstrapFactory.php b/src/Runtime/Factory/BootstrapFactory.php
index eb7d1a0..208ac20 100644
--- a/src/Runtime/Factory/BootstrapFactory.php
+++ b/src/Runtime/Factory/BootstrapFactory.php
@@ -2,7 +2,7 @@
 
 namespace Runtime\Factory;
 
-use Runtime\Exceptions\ClassNotFoundException;
+use Runtime\Exceptions\Exceptions\ClassNotFoundException;
 use Runtime\Http\View\ViewEngine;
 use Runtime\Router\Route;
 use Runtime\Exceptions\ExceptionHandler;
diff --git a/src/Runtime/Http/Input/InputFile.php b/src/Runtime/Http/Input/InputFile.php
index 1c05d71..b37a14a 100644
--- a/src/Runtime/Http/Input/InputFile.php
+++ b/src/Runtime/Http/Input/InputFile.php
@@ -2,7 +2,7 @@
 
 namespace Runtime\Http\Input;
 
-use Runtime\Exceptions\InvalidArgumentException;
+use Runtime\Exceptions\Exceptions\InvalidArgumentException;
 
 class InputFile implements IInputItem
 {
diff --git a/src/Runtime/Http/Input/InputHandler.php b/src/Runtime/Http/Input/InputHandler.php
index 55e9b8c..da8cb95 100644
--- a/src/Runtime/Http/Input/InputHandler.php
+++ b/src/Runtime/Http/Input/InputHandler.php
@@ -2,7 +2,7 @@
 
 namespace Runtime\Http\Input;
 
-use Runtime\Exceptions\InvalidArgumentException;
+use Runtime\Exceptions\Exceptions\InvalidArgumentException;
 use Runtime\Http\Request;
 
 class InputHandler
diff --git a/src/Runtime/Http/Middleware/BaseCsrfVerifier.php b/src/Runtime/Http/Middleware/BaseCsrfVerifier.php
index e69b0b3..eded487 100644
--- a/src/Runtime/Http/Middleware/BaseCsrfVerifier.php
+++ b/src/Runtime/Http/Middleware/BaseCsrfVerifier.php
@@ -2,7 +2,7 @@
 
 namespace Runtime\Http\Middleware;
 
-use Runtime\Exceptions\TokenMismatchException;
+use Runtime\Exceptions\Exceptions\TokenMismatchException;
 use Runtime\Http\Request;
 use Runtime\Http\Security\CookieTokenProvider;
 use Runtime\Http\Security\ITokenProvider;
@@ -17,7 +17,7 @@ class BaseCsrfVerifier implements IMiddleware
 
     /**
      * BaseCsrfVerifier constructor.
-     * @throws \Runtime\Exceptions\SecurityException
+     * @throws \Runtime\Exceptions\Exceptions\SecurityException
      */
     public function __construct()
     {
diff --git a/src/Runtime/Http/Request.php b/src/Runtime/Http/Request.php
index c341517..b3bf252 100644
--- a/src/Runtime/Http/Request.php
+++ b/src/Runtime/Http/Request.php
@@ -2,7 +2,7 @@
 
 namespace Runtime\Http;
 
-use Runtime\Exceptions\MalformedUrlException;
+use Runtime\Exceptions\Exceptions\MalformedUrlException;
 use Runtime\Http\Input\InputHandler;
 use Runtime\Router\Route\ILoadableRoute;
 use Runtime\Router\Route\RouteUrl;
diff --git a/src/Runtime/Http/Response.php b/src/Runtime/Http/Response.php
index a569430..4c93215 100644
--- a/src/Runtime/Http/Response.php
+++ b/src/Runtime/Http/Response.php
@@ -2,7 +2,7 @@
 
 namespace Runtime\Http;
 
-use Runtime\Exceptions\InvalidArgumentException;
+use Runtime\Exceptions\Exceptions\InvalidArgumentException;
 
 class Response
 {
diff --git a/src/Runtime/Http/Security/CookieTokenProvider.php b/src/Runtime/Http/Security/CookieTokenProvider.php
index 7d8deaa..cfa32b6 100644
--- a/src/Runtime/Http/Security/CookieTokenProvider.php
+++ b/src/Runtime/Http/Security/CookieTokenProvider.php
@@ -2,7 +2,7 @@
 
 namespace Runtime\Http\Security;
 
-use Runtime\Exceptions\SecurityException;
+use Runtime\Exceptions\Exceptions\SecurityException;
 
 class CookieTokenProvider implements ITokenProvider
 {
diff --git a/src/Runtime/Http/Url.php b/src/Runtime/Http/Url.php
index ec4eca9..9e7f4d7 100644
--- a/src/Runtime/Http/Url.php
+++ b/src/Runtime/Http/Url.php
@@ -2,7 +2,7 @@
 
 namespace Runtime\Http;
 
-use Runtime\Exceptions\MalformedUrlException;
+use Runtime\Exceptions\Exceptions\MalformedUrlException;
 
 class Url implements \JsonSerializable
 {
diff --git a/src/Runtime/Router/ClassLoader/ClassLoader.php b/src/Runtime/Router/ClassLoader/ClassLoader.php
index 1280083..dbd2388 100644
--- a/src/Runtime/Router/ClassLoader/ClassLoader.php
+++ b/src/Runtime/Router/ClassLoader/ClassLoader.php
@@ -3,7 +3,7 @@
 namespace Runtime\Router\ClassLoader;
 
 use DI\Container;
-use Runtime\Router\Exceptions\NotFoundHttpException;
+use Runtime\Exceptions\Exceptions\NotFoundHttpException;
 
 class ClassLoader implements IClassLoader
 {
diff --git a/src/Runtime/Router/Exceptions/HttpException.php b/src/Runtime/Router/Exceptions/HttpException.php
deleted file mode 100644
index 5c90154..0000000
--- a/src/Runtime/Router/Exceptions/HttpException.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-namespace Runtime\Router\Exceptions;
-
-class HttpException extends \Exception
-{
-
-}
\ No newline at end of file
diff --git a/src/Runtime/Router/Exceptions/NotFoundHttpException.php b/src/Runtime/Router/Exceptions/NotFoundHttpException.php
deleted file mode 100644
index 476da0a..0000000
--- a/src/Runtime/Router/Exceptions/NotFoundHttpException.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-namespace Runtime\Router\Exceptions;
-
-class NotFoundHttpException extends HttpException
-{
-
-}
\ No newline at end of file
diff --git a/src/Runtime/Router/Route.php b/src/Runtime/Router/Route.php
index 0a6867b..b27a87f 100644
--- a/src/Runtime/Router/Route.php
+++ b/src/Runtime/Router/Route.php
@@ -12,14 +12,14 @@ namespace Runtime\Router;
 
 use DI\Container;
 use Runtime\Exceptions\ExceptionHandler;
-use Runtime\Exceptions\InvalidArgumentException;
-use Runtime\Exceptions\MalformedUrlException;
+use Runtime\Exceptions\Exceptions\InvalidArgumentException;
+use Runtime\Exceptions\Exceptions\MalformedUrlException;
 use Runtime\Http\Middleware\BaseCsrfVerifier;
 use Runtime\Http\Request;
 use Runtime\Http\Response;
 use Runtime\Http\Url;
 use Runtime\Router\ClassLoader\IClassLoader;
-use Runtime\Router\Exceptions\HttpException;
+use Runtime\Exceptions\Exceptions\HttpException;
 use Runtime\Router\Handlers\CallbackExceptionHandler;
 use Runtime\Router\Handlers\IEventHandler;
 use Runtime\Router\Route\IGroupRoute;
@@ -54,8 +54,8 @@ class Route
     /**
      * Start routing
      *
-     * @throws \Runtime\Router\Exceptions\NotFoundHttpException
-     * @throws \Runtime\Exceptions\TokenMismatchException
+     * @throws \Runtime\Exceptions\Exceptions\NotFoundHttpException
+     * @throws \Runtime\Exceptions\Exceptions\TokenMismatchException
      * @throws HttpException
      * @throws \Exception
      */
diff --git a/src/Runtime/Router/Route/IRoute.php b/src/Runtime/Router/Route/IRoute.php
index b0f6794..e2d99c6 100644
--- a/src/Runtime/Router/Route/IRoute.php
+++ b/src/Runtime/Router/Route/IRoute.php
@@ -23,7 +23,7 @@ interface IRoute
      * @param Request $request
      * @param Router $router
      * @return string
-     * @throws \Runtime\Router\Exceptions\NotFoundHttpException
+     * @throws \Runtime\Exceptions\Exceptions\NotFoundHttpException
      */
     public function renderRoute(Request $request, Router $router): ?string;
 
diff --git a/src/Runtime/Router/Route/LoadableRoute.php b/src/Runtime/Router/Route/LoadableRoute.php
index bffa4d9..83f33a6 100644
--- a/src/Runtime/Router/Route/LoadableRoute.php
+++ b/src/Runtime/Router/Route/LoadableRoute.php
@@ -4,7 +4,7 @@ namespace Runtime\Router\Route;
 
 use Runtime\Http\Middleware\IMiddleware;
 use Runtime\Http\Request;
-use Runtime\Router\Exceptions\HttpException;
+use Runtime\Exceptions\Exceptions\HttpException;
 use Runtime\Router\Router;
 
 abstract class LoadableRoute extends Route implements ILoadableRoute
diff --git a/src/Runtime/Router/Route/Route.php b/src/Runtime/Router/Route/Route.php
index a855de8..8e176f3 100644
--- a/src/Runtime/Router/Route/Route.php
+++ b/src/Runtime/Router/Route/Route.php
@@ -4,7 +4,7 @@ namespace Runtime\Router\Route;
 
 use Runtime\Http\Middleware\IMiddleware;
 use Runtime\Http\Request;
-use Runtime\Router\Exceptions\NotFoundHttpException;
+use Runtime\Exceptions\Exceptions\NotFoundHttpException;
 use Runtime\Router\Router;
 
 abstract class Route implements IRoute
diff --git a/src/Runtime/Router/Router.php b/src/Runtime/Router/Router.php
index 9ca968a..11949da 100644
--- a/src/Runtime/Router/Router.php
+++ b/src/Runtime/Router/Router.php
@@ -2,15 +2,15 @@
 
 namespace Runtime\Router;
 
-use Runtime\Exceptions\InvalidArgumentException;
-use Runtime\Exceptions\MalformedUrlException;
+use Runtime\Exceptions\Exceptions\InvalidArgumentException;
+use Runtime\Exceptions\Exceptions\MalformedUrlException;
 use Runtime\Http\Middleware\BaseCsrfVerifier;
 use Runtime\Http\Request;
 use Runtime\Http\Url;
 use Runtime\Router\ClassLoader\ClassLoader;
 use Runtime\Router\ClassLoader\IClassLoader;
-use Runtime\Router\Exceptions\HttpException;
-use Runtime\Router\Exceptions\NotFoundHttpException;
+use Runtime\Exceptions\Exceptions\HttpException;
+use Runtime\Exceptions\Exceptions\NotFoundHttpException;
 use Runtime\Router\Handlers\EventHandler;
 use Runtime\Router\Handlers\IEventHandler;
 use Runtime\Router\Handlers\IExceptionHandler;
@@ -305,8 +305,8 @@ class Router
      * Start the routing
      *
      * @return string|null
-     * @throws \Runtime\Router\Exceptions\NotFoundHttpException
-     * @throws \Runtime\Exceptions\TokenMismatchException
+     * @throws \Runtime\Exceptions\Exceptions\NotFoundHttpException
+     * @throws \Runtime\Exceptions\Exceptions\TokenMismatchException
      * @throws HttpException
      * @throws \Exception
      */
@@ -625,7 +625,7 @@ class Router
      * @param array|null $getParams
      * @return Url
      * @throws InvalidArgumentException
-     * @throws \Runtime\Exceptions\MalformedUrlException
+     * @throws \Runtime\Exceptions\Exceptions\MalformedUrlException
      */
     public function getUrl(?string $name = null, $parameters = null, ?array $getParams = null): Url
     {