From e345c2bbfe3410ad1660aa2ed30a9f348219a9bd Mon Sep 17 00:00:00 2001
From: Alejandro Celaya <alejandro@alejandrocelaya.com>
Date: Sat, 30 Jul 2016 13:51:52 +0200
Subject: [PATCH] Moved error handler classes from Expressive namespace to
 ErrorHandler namespace

---
 config/autoload/errorhandler.local.php.dist                | 2 +-
 config/autoload/services.global.php                        | 7 +------
 module/Common/config/error-handler.config.php              | 2 +-
 module/Common/config/services.config.php                   | 4 ++++
 .../ContentBasedErrorHandler.php                           | 2 +-
 .../{Expressive => ErrorHandler}/ErrorHandlerInterface.php | 2 +-
 .../{Expressive => ErrorHandler}/ErrorHandlerManager.php   | 2 +-
 .../ErrorHandlerManagerFactory.php                         | 2 +-
 .../ErrorHandlerManagerInterface.php                       | 2 +-
 module/Rest/config/error-handler.config.php                | 2 +-
 .../src/{Expressive => ErrorHandler}/JsonErrorHandler.php  | 4 ++--
 11 files changed, 15 insertions(+), 16 deletions(-)
 rename module/Common/src/{Expressive => ErrorHandler}/ContentBasedErrorHandler.php (98%)
 rename module/Common/src/{Expressive => ErrorHandler}/ErrorHandlerInterface.php (89%)
 rename module/Common/src/{Expressive => ErrorHandler}/ErrorHandlerManager.php (92%)
 rename module/Common/src/{Expressive => ErrorHandler}/ErrorHandlerManagerFactory.php (95%)
 rename module/Common/src/{Expressive => ErrorHandler}/ErrorHandlerManagerInterface.php (72%)
 rename module/Rest/src/{Expressive => ErrorHandler}/JsonErrorHandler.php (92%)

diff --git a/config/autoload/errorhandler.local.php.dist b/config/autoload/errorhandler.local.php.dist
index d6de56d7..c65493f2 100644
--- a/config/autoload/errorhandler.local.php.dist
+++ b/config/autoload/errorhandler.local.php.dist
@@ -1,6 +1,6 @@
 <?php
 
-use Shlinkio\Shlink\Common\Expressive\ContentBasedErrorHandler;
+use Shlinkio\Shlink\Common\ErrorHandler\ContentBasedErrorHandler;
 use Zend\Expressive\Container\WhoopsErrorHandlerFactory;
 
 return [
diff --git a/config/autoload/services.global.php b/config/autoload/services.global.php
index 841a389a..44bbbbdd 100644
--- a/config/autoload/services.global.php
+++ b/config/autoload/services.global.php
@@ -1,8 +1,5 @@
 <?php
-use Acelaya\ZsmAnnotatedServices\Factory\V3\AnnotatedFactory;
-use Shlinkio\Shlink\Common\Expressive\ContentBasedErrorHandler;
-use Shlinkio\Shlink\Common\Expressive\ErrorHandlerManager;
-use Shlinkio\Shlink\Common\Expressive\ErrorHandlerManagerFactory;
+use Shlinkio\Shlink\Common\ErrorHandler\ContentBasedErrorHandler;
 use Zend\Expressive;
 use Zend\Expressive\Container;
 use Zend\Expressive\Helper;
@@ -25,8 +22,6 @@ return [
             Router\FastRouteRouter::class => InvokableFactory::class,
 
             // View
-            ContentBasedErrorHandler::class => AnnotatedFactory::class,
-            ErrorHandlerManager::class => ErrorHandlerManagerFactory::class,
             Template\TemplateRendererInterface::class => Twig\TwigRendererFactory::class,
         ],
         'aliases' => [
diff --git a/module/Common/config/error-handler.config.php b/module/Common/config/error-handler.config.php
index a6165fa2..d19b9ac6 100644
--- a/module/Common/config/error-handler.config.php
+++ b/module/Common/config/error-handler.config.php
@@ -1,5 +1,5 @@
 <?php
-use Shlinkio\Shlink\Common\Expressive\ContentBasedErrorHandler;
+use Shlinkio\Shlink\Common\ErrorHandler\ContentBasedErrorHandler;
 use Zend\Expressive\Container\TemplatedErrorHandlerFactory;
 use Zend\Stratigility\FinalHandler;
 
diff --git a/module/Common/config/services.config.php b/module/Common/config/services.config.php
index 42d9dbc5..be062b86 100644
--- a/module/Common/config/services.config.php
+++ b/module/Common/config/services.config.php
@@ -2,6 +2,7 @@
 use Acelaya\ZsmAnnotatedServices\Factory\V3\AnnotatedFactory;
 use Doctrine\Common\Cache\Cache;
 use Doctrine\ORM\EntityManager;
+use Shlinkio\Shlink\Common\ErrorHandler;
 use Shlinkio\Shlink\Common\Factory\CacheFactory;
 use Shlinkio\Shlink\Common\Factory\EntityManagerFactory;
 use Shlinkio\Shlink\Common\Factory\TranslatorFactory;
@@ -22,6 +23,9 @@ return [
             Translator::class => TranslatorFactory::class,
             TranslatorExtension::class => AnnotatedFactory::class,
             LocaleMiddleware::class => AnnotatedFactory::class,
+
+            ErrorHandler\ContentBasedErrorHandler::class => AnnotatedFactory::class,
+            ErrorHandler\ErrorHandlerManager::class => ErrorHandler\ErrorHandlerManagerFactory::class,
         ],
         'aliases' => [
             'em' => EntityManager::class,
diff --git a/module/Common/src/Expressive/ContentBasedErrorHandler.php b/module/Common/src/ErrorHandler/ContentBasedErrorHandler.php
similarity index 98%
rename from module/Common/src/Expressive/ContentBasedErrorHandler.php
rename to module/Common/src/ErrorHandler/ContentBasedErrorHandler.php
index 6f094f69..be19e848 100644
--- a/module/Common/src/Expressive/ContentBasedErrorHandler.php
+++ b/module/Common/src/ErrorHandler/ContentBasedErrorHandler.php
@@ -1,5 +1,5 @@
 <?php
-namespace Shlinkio\Shlink\Common\Expressive;
+namespace Shlinkio\Shlink\Common\ErrorHandler;
 
 use Acelaya\ZsmAnnotatedServices\Annotation\Inject;
 use Psr\Http\Message\ResponseInterface as Response;
diff --git a/module/Common/src/Expressive/ErrorHandlerInterface.php b/module/Common/src/ErrorHandler/ErrorHandlerInterface.php
similarity index 89%
rename from module/Common/src/Expressive/ErrorHandlerInterface.php
rename to module/Common/src/ErrorHandler/ErrorHandlerInterface.php
index 9f0b5803..9676c40a 100644
--- a/module/Common/src/Expressive/ErrorHandlerInterface.php
+++ b/module/Common/src/ErrorHandler/ErrorHandlerInterface.php
@@ -1,5 +1,5 @@
 <?php
-namespace Shlinkio\Shlink\Common\Expressive;
+namespace Shlinkio\Shlink\Common\ErrorHandler;
 
 use Psr\Http\Message\ServerRequestInterface as Request;
 use Psr\Http\Message\ResponseInterface as Response;
diff --git a/module/Common/src/Expressive/ErrorHandlerManager.php b/module/Common/src/ErrorHandler/ErrorHandlerManager.php
similarity index 92%
rename from module/Common/src/Expressive/ErrorHandlerManager.php
rename to module/Common/src/ErrorHandler/ErrorHandlerManager.php
index 5cce0095..1bc66476 100644
--- a/module/Common/src/Expressive/ErrorHandlerManager.php
+++ b/module/Common/src/ErrorHandler/ErrorHandlerManager.php
@@ -1,5 +1,5 @@
 <?php
-namespace Shlinkio\Shlink\Common\Expressive;
+namespace Shlinkio\Shlink\Common\ErrorHandler;
 
 use Zend\ServiceManager\AbstractPluginManager;
 use Zend\ServiceManager\Exception\InvalidServiceException;
diff --git a/module/Common/src/Expressive/ErrorHandlerManagerFactory.php b/module/Common/src/ErrorHandler/ErrorHandlerManagerFactory.php
similarity index 95%
rename from module/Common/src/Expressive/ErrorHandlerManagerFactory.php
rename to module/Common/src/ErrorHandler/ErrorHandlerManagerFactory.php
index e96e1ca3..08a1fd83 100644
--- a/module/Common/src/Expressive/ErrorHandlerManagerFactory.php
+++ b/module/Common/src/ErrorHandler/ErrorHandlerManagerFactory.php
@@ -1,5 +1,5 @@
 <?php
-namespace Shlinkio\Shlink\Common\Expressive;
+namespace Shlinkio\Shlink\Common\ErrorHandler;
 
 use Interop\Container\ContainerInterface;
 use Interop\Container\Exception\ContainerException;
diff --git a/module/Common/src/Expressive/ErrorHandlerManagerInterface.php b/module/Common/src/ErrorHandler/ErrorHandlerManagerInterface.php
similarity index 72%
rename from module/Common/src/Expressive/ErrorHandlerManagerInterface.php
rename to module/Common/src/ErrorHandler/ErrorHandlerManagerInterface.php
index 371cbbf4..323bfe4b 100644
--- a/module/Common/src/Expressive/ErrorHandlerManagerInterface.php
+++ b/module/Common/src/ErrorHandler/ErrorHandlerManagerInterface.php
@@ -1,5 +1,5 @@
 <?php
-namespace Shlinkio\Shlink\Common\Expressive;
+namespace Shlinkio\Shlink\Common\ErrorHandler;
 
 use Interop\Container\ContainerInterface;
 
diff --git a/module/Rest/config/error-handler.config.php b/module/Rest/config/error-handler.config.php
index 4b5b7e75..fef71303 100644
--- a/module/Rest/config/error-handler.config.php
+++ b/module/Rest/config/error-handler.config.php
@@ -1,5 +1,5 @@
 <?php
-use Shlinkio\Shlink\Rest\Expressive\JsonErrorHandler;
+use Shlinkio\Shlink\Rest\ErrorHandler\JsonErrorHandler;
 
 return [
 
diff --git a/module/Rest/src/Expressive/JsonErrorHandler.php b/module/Rest/src/ErrorHandler/JsonErrorHandler.php
similarity index 92%
rename from module/Rest/src/Expressive/JsonErrorHandler.php
rename to module/Rest/src/ErrorHandler/JsonErrorHandler.php
index 9294ec24..248bb6ae 100644
--- a/module/Rest/src/Expressive/JsonErrorHandler.php
+++ b/module/Rest/src/ErrorHandler/JsonErrorHandler.php
@@ -1,9 +1,9 @@
 <?php
-namespace Shlinkio\Shlink\Rest\Expressive;
+namespace Shlinkio\Shlink\Rest\ErrorHandler;
 
 use Psr\Http\Message\ServerRequestInterface as Request;
 use Psr\Http\Message\ResponseInterface as Response;
-use Shlinkio\Shlink\Common\Expressive\ErrorHandlerInterface;
+use Shlinkio\Shlink\Common\ErrorHandler\ErrorHandlerInterface;
 use Zend\Diactoros\Response\JsonResponse;
 use Zend\Expressive\Router\RouteResult;