Moved error handler classes from Expressive namespace to ErrorHandler namespace

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 [

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' => [

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;
 

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,

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;

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;

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;

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;

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;
 

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 [
 

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;