From 8fc88171ee96df00230c3f0d594f7bd2b915dcd2 Mon Sep 17 00:00:00 2001
From: Alejandro Celaya <alejandro@alejandrocelaya.com>
Date: Tue, 19 Jul 2016 17:27:55 +0200
Subject: [PATCH] Moved AuthenticationException to Rest module

---
 composer.json                                       |  6 ++++--
 module/Rest/src/Action/AuthenticateMiddleware.php   |  2 +-
 .../Rest/src}/Exception/AuthenticationException.php |  4 +++-
 module/Rest/src/Service/RestTokenService.php        |  2 +-
 .../Rest/src/Service/RestTokenServiceInterface.php  |  2 +-
 module/Rest/src/Util/RestUtils.php                  | 13 +++++++------
 6 files changed, 17 insertions(+), 12 deletions(-)
 rename {src => module/Rest/src}/Exception/AuthenticationException.php (74%)

diff --git a/composer.json b/composer.json
index 91f340c1..a64197a6 100644
--- a/composer.json
+++ b/composer.json
@@ -40,7 +40,8 @@
             "Acelaya\\UrlShortener\\": "src",
             "Shlinkio\\Shlink\\CLI\\": "module/CLI/src",
             "Shlinkio\\Shlink\\Rest\\": "module/Rest/src",
-            "Shlinkio\\Shlink\\Core\\": "module/Core/src"
+            "Shlinkio\\Shlink\\Core\\": "module/Core/src",
+            "Shlinkio\\Shlink\\Common\\": "module/Common/src"
         }
     },
     "autoload-dev": {
@@ -48,7 +49,8 @@
             "AcelayaTest\\UrlShortener\\": "tests",
             "ShlinkioTest\\Shlink\\CLI\\": "module/CLI/test",
             "ShlinkioTest\\Shlink\\Rest\\": "module/Rest/test",
-            "ShlinkioTest\\Shlink\\Core\\": "module/Core/test"
+            "ShlinkioTest\\Shlink\\Core\\": "module/Core/test",
+            "ShlinkioTest\\Shlink\\Common\\": "module/Common/test"
         }
     },
     "scripts": {
diff --git a/module/Rest/src/Action/AuthenticateMiddleware.php b/module/Rest/src/Action/AuthenticateMiddleware.php
index 97b6ad9f..cbea1360 100644
--- a/module/Rest/src/Action/AuthenticateMiddleware.php
+++ b/module/Rest/src/Action/AuthenticateMiddleware.php
@@ -1,10 +1,10 @@
 <?php
 namespace Shlinkio\Shlink\Rest\Action;
 
-use Acelaya\UrlShortener\Exception\AuthenticationException;
 use Acelaya\ZsmAnnotatedServices\Annotation\Inject;
 use Psr\Http\Message\ResponseInterface as Response;
 use Psr\Http\Message\ServerRequestInterface as Request;
+use Shlinkio\Shlink\Rest\Exception\AuthenticationException;
 use Shlinkio\Shlink\Rest\Service\RestTokenService;
 use Shlinkio\Shlink\Rest\Service\RestTokenServiceInterface;
 use Shlinkio\Shlink\Rest\Util\RestUtils;
diff --git a/src/Exception/AuthenticationException.php b/module/Rest/src/Exception/AuthenticationException.php
similarity index 74%
rename from src/Exception/AuthenticationException.php
rename to module/Rest/src/Exception/AuthenticationException.php
index 0876be75..51644fc3 100644
--- a/src/Exception/AuthenticationException.php
+++ b/module/Rest/src/Exception/AuthenticationException.php
@@ -1,5 +1,7 @@
 <?php
-namespace Acelaya\UrlShortener\Exception;
+namespace Shlinkio\Shlink\Rest\Exception;
+
+use Acelaya\UrlShortener\Exception\ExceptionInterface;
 
 class AuthenticationException extends \RuntimeException implements ExceptionInterface
 {
diff --git a/module/Rest/src/Service/RestTokenService.php b/module/Rest/src/Service/RestTokenService.php
index 6f34896b..07fc495a 100644
--- a/module/Rest/src/Service/RestTokenService.php
+++ b/module/Rest/src/Service/RestTokenService.php
@@ -2,10 +2,10 @@
 namespace Shlinkio\Shlink\Rest\Service;
 
 use Acelaya\UrlShortener\Entity\RestToken;
-use Acelaya\UrlShortener\Exception\AuthenticationException;
 use Acelaya\UrlShortener\Exception\InvalidArgumentException;
 use Acelaya\ZsmAnnotatedServices\Annotation\Inject;
 use Doctrine\ORM\EntityManagerInterface;
+use Shlinkio\Shlink\Rest\Exception\AuthenticationException;
 
 class RestTokenService implements RestTokenServiceInterface
 {
diff --git a/module/Rest/src/Service/RestTokenServiceInterface.php b/module/Rest/src/Service/RestTokenServiceInterface.php
index 3cf7847e..184a265b 100644
--- a/module/Rest/src/Service/RestTokenServiceInterface.php
+++ b/module/Rest/src/Service/RestTokenServiceInterface.php
@@ -2,8 +2,8 @@
 namespace Shlinkio\Shlink\Rest\Service;
 
 use Acelaya\UrlShortener\Entity\RestToken;
-use Acelaya\UrlShortener\Exception\AuthenticationException;
 use Acelaya\UrlShortener\Exception\InvalidArgumentException;
+use Shlinkio\Shlink\Rest\Exception\AuthenticationException;
 
 interface RestTokenServiceInterface
 {
diff --git a/module/Rest/src/Util/RestUtils.php b/module/Rest/src/Util/RestUtils.php
index d6707980..720d683d 100644
--- a/module/Rest/src/Util/RestUtils.php
+++ b/module/Rest/src/Util/RestUtils.php
@@ -1,7 +1,8 @@
 <?php
 namespace Shlinkio\Shlink\Rest\Util;
 
-use Acelaya\UrlShortener\Exception;
+use Acelaya\UrlShortener\Exception as Core;
+use Shlinkio\Shlink\Rest\Exception as Rest;
 
 class RestUtils
 {
@@ -12,16 +13,16 @@ class RestUtils
     const INVALID_AUTH_TOKEN_ERROR = 'INVALID_AUTH_TOKEN_ERROR';
     const UNKNOWN_ERROR = 'UNKNOWN_ERROR';
 
-    public static function getRestErrorCodeFromException(Exception\ExceptionInterface $e)
+    public static function getRestErrorCodeFromException(Core\ExceptionInterface $e)
     {
         switch (true) {
-            case $e instanceof Exception\InvalidShortCodeException:
+            case $e instanceof Core\InvalidShortCodeException:
                 return self::INVALID_SHORTCODE_ERROR;
-            case $e instanceof Exception\InvalidUrlException:
+            case $e instanceof Core\InvalidUrlException:
                 return self::INVALID_URL_ERROR;
-            case $e instanceof Exception\InvalidArgumentException:
+            case $e instanceof Core\InvalidArgumentException:
                 return self::INVALID_ARGUMENT_ERROR;
-            case $e instanceof Exception\AuthenticationException:
+            case $e instanceof Rest\AuthenticationException:
                 return self::INVALID_CREDENTIALS_ERROR;
             default:
                 return self::UNKNOWN_ERROR;