From 55f954f50f1688e3413906b382103c8fa4359b40 Mon Sep 17 00:00:00 2001
From: Alejandro Celaya <alejandro@alejandrocelaya.com>
Date: Tue, 19 Jul 2016 17:07:59 +0200
Subject: [PATCH] Created Rest module

---
 .../autoload/middleware-pipeline.global.php   | 10 -----
 config/autoload/routes.global.php             | 33 ----------------
 config/autoload/services.global.php           |  7 ----
 config/config.php                             |  4 +-
 module/CLI/src/Config/ConfigProvider.php      | 13 -------
 module/CLI/src/ConfigProvider.php             | 13 +++++++
 .../config/middleware-pipeline.global.php     | 16 ++++++++
 .../Rest/config/rest.config.php               |  0
 module/Rest/config/routes.global.php          | 39 +++++++++++++++++++
 module/Rest/config/services.global.php        | 22 +++++++++++
 .../src/Action}/AbstractRestMiddleware.php    |  2 +-
 .../src/Action}/AuthenticateMiddleware.php    |  8 ++--
 .../src/Action}/CreateShortcodeMiddleware.php |  4 +-
 .../Rest/src/Action}/GetVisitsMiddleware.php  |  4 +-
 .../src/Action}/ListShortcodesMiddleware.php  |  5 +--
 .../Rest/src/Action}/ResolveUrlMiddleware.php |  4 +-
 module/Rest/src/ConfigProvider.php            | 13 +++++++
 .../CheckAuthenticationMiddleware.php         |  8 ++--
 .../src}/Middleware/CrossDomainMiddleware.php |  2 +-
 .../Rest/src}/Service/RestTokenService.php    |  2 +-
 .../Service/RestTokenServiceInterface.php     |  2 +-
 {src => module/Rest/src}/Util/RestUtils.php   |  2 +-
 22 files changed, 127 insertions(+), 86 deletions(-)
 delete mode 100644 module/CLI/src/Config/ConfigProvider.php
 create mode 100644 module/CLI/src/ConfigProvider.php
 create mode 100644 module/Rest/config/middleware-pipeline.global.php
 rename config/autoload/rest.global.php => module/Rest/config/rest.config.php (100%)
 create mode 100644 module/Rest/config/routes.global.php
 create mode 100644 module/Rest/config/services.global.php
 rename {src/Middleware/Rest => module/Rest/src/Action}/AbstractRestMiddleware.php (97%)
 rename {src/Middleware/Rest => module/Rest/src/Action}/AuthenticateMiddleware.php (89%)
 rename {src/Middleware/Rest => module/Rest/src/Action}/CreateShortcodeMiddleware.php (96%)
 rename {src/Middleware/Rest => module/Rest/src/Action}/GetVisitsMiddleware.php (95%)
 rename {src/Middleware/Rest => module/Rest/src/Action}/ListShortcodesMiddleware.php (93%)
 rename {src/Middleware/Rest => module/Rest/src/Action}/ResolveUrlMiddleware.php (95%)
 create mode 100644 module/Rest/src/ConfigProvider.php
 rename {src => module/Rest/src}/Middleware/CheckAuthenticationMiddleware.php (94%)
 rename {src => module/Rest/src}/Middleware/CrossDomainMiddleware.php (97%)
 rename {src => module/Rest/src}/Service/RestTokenService.php (98%)
 rename {src => module/Rest/src}/Service/RestTokenServiceInterface.php (95%)
 rename {src => module/Rest/src}/Util/RestUtils.php (96%)

diff --git a/config/autoload/middleware-pipeline.global.php b/config/autoload/middleware-pipeline.global.php
index fc6f85f0..ca116a95 100644
--- a/config/autoload/middleware-pipeline.global.php
+++ b/config/autoload/middleware-pipeline.global.php
@@ -1,5 +1,4 @@
 <?php
-use Acelaya\UrlShortener\Middleware;
 use Zend\Expressive\Container\ApplicationFactory;
 use Zend\Expressive\Helper;
 
@@ -20,15 +19,6 @@ return [
             'priority' => 10,
         ],
 
-        'rest' => [
-            'path' => '/rest',
-            'middleware' => [
-                Middleware\CheckAuthenticationMiddleware::class,
-                Middleware\CrossDomainMiddleware::class,
-            ],
-            'priority' => 5,
-        ],
-
         'post-routing' => [
             'middleware' => [
                 Helper\UrlHelperMiddleware::class,
diff --git a/config/autoload/routes.global.php b/config/autoload/routes.global.php
index 87133f09..40a3d20b 100644
--- a/config/autoload/routes.global.php
+++ b/config/autoload/routes.global.php
@@ -1,6 +1,5 @@
 <?php
 use Acelaya\UrlShortener\Middleware\Routable;
-use Acelaya\UrlShortener\Middleware\Rest;
 
 return [
 
@@ -11,38 +10,6 @@ return [
             'middleware' => Routable\RedirectMiddleware::class,
             'allowed_methods' => ['GET'],
         ],
-
-        // Rest
-        [
-            'name' => 'rest-authenticate',
-            'path' => '/rest/authenticate',
-            'middleware' => Rest\AuthenticateMiddleware::class,
-            'allowed_methods' => ['POST', 'OPTIONS'],
-        ],
-        [
-            'name' => 'rest-create-shortcode',
-            'path' => '/rest/short-codes',
-            'middleware' => Rest\CreateShortcodeMiddleware::class,
-            'allowed_methods' => ['POST', 'OPTIONS'],
-        ],
-        [
-            'name' => 'rest-resolve-url',
-            'path' => '/rest/short-codes/{shortCode}',
-            'middleware' => Rest\ResolveUrlMiddleware::class,
-            'allowed_methods' => ['GET', 'OPTIONS'],
-        ],
-        [
-            'name' => 'rest-list-shortened-url',
-            'path' => '/rest/short-codes',
-            'middleware' => Rest\ListShortcodesMiddleware::class,
-            'allowed_methods' => ['GET'],
-        ],
-        [
-            'name' => 'rest-get-visits',
-            'path' => '/rest/visits/{shortCode}',
-            'middleware' => Rest\GetVisitsMiddleware::class,
-            'allowed_methods' => ['GET', 'OPTIONS'],
-        ],
     ],
 
 ];
diff --git a/config/autoload/services.global.php b/config/autoload/services.global.php
index 3277159e..bbf816d0 100644
--- a/config/autoload/services.global.php
+++ b/config/autoload/services.global.php
@@ -51,13 +51,6 @@ return [
 
             // Middleware
             Middleware\Routable\RedirectMiddleware::class => AnnotatedFactory::class,
-            Middleware\Rest\AuthenticateMiddleware::class => AnnotatedFactory::class,
-            Middleware\Rest\CreateShortcodeMiddleware::class => AnnotatedFactory::class,
-            Middleware\Rest\ResolveUrlMiddleware::class => AnnotatedFactory::class,
-            Middleware\Rest\GetVisitsMiddleware::class => AnnotatedFactory::class,
-            Middleware\Rest\ListShortcodesMiddleware::class => AnnotatedFactory::class,
-            Middleware\CrossDomainMiddleware::class => InvokableFactory::class,
-            Middleware\CheckAuthenticationMiddleware::class => AnnotatedFactory::class,
         ],
         'aliases' => [
             'em' => EntityManager::class,
diff --git a/config/config.php b/config/config.php
index b27d8173..850f5e4f 100644
--- a/config/config.php
+++ b/config/config.php
@@ -1,5 +1,6 @@
 <?php
 use Shlinkio\Shlink\CLI;
+use Shlinkio\Shlink\Rest;
 use Zend\Expressive\ConfigManager\ConfigManager;
 use Zend\Expressive\ConfigManager\ZendConfigProvider;
 
@@ -14,7 +15,8 @@ use Zend\Expressive\ConfigManager\ZendConfigProvider;
 
 return call_user_func(function () {
     $configManager = new ConfigManager([
-        CLI\Config\ConfigProvider::class,
+        CLI\ConfigProvider::class,
+        Rest\ConfigProvider::class,
         new ZendConfigProvider('config/autoload/{{,*.}global,{,*.}local}.php')
     ], 'data/cache/app_config.php');
 
diff --git a/module/CLI/src/Config/ConfigProvider.php b/module/CLI/src/Config/ConfigProvider.php
deleted file mode 100644
index fa269d6c..00000000
--- a/module/CLI/src/Config/ConfigProvider.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-namespace Shlinkio\Shlink\CLI\Config;
-
-use Zend\Config\Factory;
-use Zend\Stdlib\Glob;
-
-class ConfigProvider
-{
-    public function __invoke()
-    {
-        return Factory::fromFiles(Glob::glob(__DIR__ . '/../../config/{,*.}config.php', Glob::GLOB_BRACE));
-    }
-}
diff --git a/module/CLI/src/ConfigProvider.php b/module/CLI/src/ConfigProvider.php
new file mode 100644
index 00000000..a35c98b6
--- /dev/null
+++ b/module/CLI/src/ConfigProvider.php
@@ -0,0 +1,13 @@
+<?php
+namespace Shlinkio\Shlink\CLI;
+
+use Zend\Config\Factory;
+use Zend\Stdlib\Glob;
+
+class ConfigProvider
+{
+    public function __invoke()
+    {
+        return Factory::fromFiles(Glob::glob(__DIR__ . '/../config/{,*.}config.php', Glob::GLOB_BRACE));
+    }
+}
diff --git a/module/Rest/config/middleware-pipeline.global.php b/module/Rest/config/middleware-pipeline.global.php
new file mode 100644
index 00000000..78c20c38
--- /dev/null
+++ b/module/Rest/config/middleware-pipeline.global.php
@@ -0,0 +1,16 @@
+<?php
+use Shlinkio\Shlink\Rest\Middleware;
+
+return [
+
+    'middleware_pipeline' => [
+        'rest' => [
+            'path' => '/rest',
+            'middleware' => [
+                Middleware\CheckAuthenticationMiddleware::class,
+                Middleware\CrossDomainMiddleware::class,
+            ],
+            'priority' => 5,
+        ],
+    ],
+];
diff --git a/config/autoload/rest.global.php b/module/Rest/config/rest.config.php
similarity index 100%
rename from config/autoload/rest.global.php
rename to module/Rest/config/rest.config.php
diff --git a/module/Rest/config/routes.global.php b/module/Rest/config/routes.global.php
new file mode 100644
index 00000000..e8abb6fe
--- /dev/null
+++ b/module/Rest/config/routes.global.php
@@ -0,0 +1,39 @@
+<?php
+use Shlinkio\Shlink\Rest\Action;
+
+return [
+
+    'routes' => [
+        [
+            'name' => 'rest-authenticate',
+            'path' => '/rest/authenticate',
+            'middleware' => Action\AuthenticateMiddleware::class,
+            'allowed_methods' => ['POST', 'OPTIONS'],
+        ],
+        [
+            'name' => 'rest-create-shortcode',
+            'path' => '/rest/short-codes',
+            'middleware' => Action\CreateShortcodeMiddleware::class,
+            'allowed_methods' => ['POST', 'OPTIONS'],
+        ],
+        [
+            'name' => 'rest-resolve-url',
+            'path' => '/rest/short-codes/{shortCode}',
+            'middleware' => Action\ResolveUrlMiddleware::class,
+            'allowed_methods' => ['GET', 'OPTIONS'],
+        ],
+        [
+            'name' => 'rest-lActionist-shortened-url',
+            'path' => '/rest/short-codes',
+            'middleware' => Action\ListShortcodesMiddleware::class,
+            'allowed_methods' => ['GET'],
+        ],
+        [
+            'name' => 'rest-get-visits',
+            'path' => '/rest/visits/{shortCode}',
+            'middleware' => Action\GetVisitsMiddleware::class,
+            'allowed_methods' => ['GET', 'OPTIONS'],
+        ],
+    ],
+
+];
diff --git a/module/Rest/config/services.global.php b/module/Rest/config/services.global.php
new file mode 100644
index 00000000..d0975ec8
--- /dev/null
+++ b/module/Rest/config/services.global.php
@@ -0,0 +1,22 @@
+<?php
+use Acelaya\ZsmAnnotatedServices\Factory\V3\AnnotatedFactory;
+use Shlinkio\Shlink\Rest\Action;
+use Shlinkio\Shlink\Rest\Middleware;
+use Zend\ServiceManager\Factory\InvokableFactory;
+
+return [
+
+    'services' => [
+        'factories' => [
+            Action\AuthenticateMiddleware::class => AnnotatedFactory::class,
+            Action\CreateShortcodeMiddleware::class => AnnotatedFactory::class,
+            Action\ResolveUrlMiddleware::class => AnnotatedFactory::class,
+            Action\GetVisitsMiddleware::class => AnnotatedFactory::class,
+            Action\ListShortcodesMiddleware::class => AnnotatedFactory::class,
+
+            Middleware\CrossDomainMiddleware::class => InvokableFactory::class,
+            Middleware\CheckAuthenticationMiddleware::class => AnnotatedFactory::class,
+        ],
+    ],
+
+];
diff --git a/src/Middleware/Rest/AbstractRestMiddleware.php b/module/Rest/src/Action/AbstractRestMiddleware.php
similarity index 97%
rename from src/Middleware/Rest/AbstractRestMiddleware.php
rename to module/Rest/src/Action/AbstractRestMiddleware.php
index 1168ff60..9ef870f4 100644
--- a/src/Middleware/Rest/AbstractRestMiddleware.php
+++ b/module/Rest/src/Action/AbstractRestMiddleware.php
@@ -1,5 +1,5 @@
 <?php
-namespace Acelaya\UrlShortener\Middleware\Rest;
+namespace Shlinkio\Shlink\Rest\Action;
 
 use Psr\Http\Message\ResponseInterface as Response;
 use Psr\Http\Message\ServerRequestInterface as Request;
diff --git a/src/Middleware/Rest/AuthenticateMiddleware.php b/module/Rest/src/Action/AuthenticateMiddleware.php
similarity index 89%
rename from src/Middleware/Rest/AuthenticateMiddleware.php
rename to module/Rest/src/Action/AuthenticateMiddleware.php
index 88c9df60..97b6ad9f 100644
--- a/src/Middleware/Rest/AuthenticateMiddleware.php
+++ b/module/Rest/src/Action/AuthenticateMiddleware.php
@@ -1,13 +1,13 @@
 <?php
-namespace Acelaya\UrlShortener\Middleware\Rest;
+namespace Shlinkio\Shlink\Rest\Action;
 
 use Acelaya\UrlShortener\Exception\AuthenticationException;
-use Acelaya\UrlShortener\Service\RestTokenService;
-use Acelaya\UrlShortener\Service\RestTokenServiceInterface;
-use Acelaya\UrlShortener\Util\RestUtils;
 use Acelaya\ZsmAnnotatedServices\Annotation\Inject;
 use Psr\Http\Message\ResponseInterface as Response;
 use Psr\Http\Message\ServerRequestInterface as Request;
+use Shlinkio\Shlink\Rest\Service\RestTokenService;
+use Shlinkio\Shlink\Rest\Service\RestTokenServiceInterface;
+use Shlinkio\Shlink\Rest\Util\RestUtils;
 use Zend\Diactoros\Response\JsonResponse;
 
 class AuthenticateMiddleware extends AbstractRestMiddleware
diff --git a/src/Middleware/Rest/CreateShortcodeMiddleware.php b/module/Rest/src/Action/CreateShortcodeMiddleware.php
similarity index 96%
rename from src/Middleware/Rest/CreateShortcodeMiddleware.php
rename to module/Rest/src/Action/CreateShortcodeMiddleware.php
index f5ee3228..823a2b49 100644
--- a/src/Middleware/Rest/CreateShortcodeMiddleware.php
+++ b/module/Rest/src/Action/CreateShortcodeMiddleware.php
@@ -1,13 +1,13 @@
 <?php
-namespace Acelaya\UrlShortener\Middleware\Rest;
+namespace Shlinkio\Shlink\Rest\Action;
 
 use Acelaya\UrlShortener\Exception\InvalidUrlException;
 use Acelaya\UrlShortener\Service\UrlShortener;
 use Acelaya\UrlShortener\Service\UrlShortenerInterface;
-use Acelaya\UrlShortener\Util\RestUtils;
 use Acelaya\ZsmAnnotatedServices\Annotation\Inject;
 use Psr\Http\Message\ResponseInterface as Response;
 use Psr\Http\Message\ServerRequestInterface as Request;
+use Shlinkio\Shlink\Rest\Util\RestUtils;
 use Zend\Diactoros\Response\JsonResponse;
 use Zend\Diactoros\Uri;
 
diff --git a/src/Middleware/Rest/GetVisitsMiddleware.php b/module/Rest/src/Action/GetVisitsMiddleware.php
similarity index 95%
rename from src/Middleware/Rest/GetVisitsMiddleware.php
rename to module/Rest/src/Action/GetVisitsMiddleware.php
index a6ca954e..285b469a 100644
--- a/src/Middleware/Rest/GetVisitsMiddleware.php
+++ b/module/Rest/src/Action/GetVisitsMiddleware.php
@@ -1,13 +1,13 @@
 <?php
-namespace Acelaya\UrlShortener\Middleware\Rest;
+namespace Shlinkio\Shlink\Rest\Action;
 
 use Acelaya\UrlShortener\Exception\InvalidArgumentException;
 use Acelaya\UrlShortener\Service\VisitsTracker;
 use Acelaya\UrlShortener\Service\VisitsTrackerInterface;
-use Acelaya\UrlShortener\Util\RestUtils;
 use Acelaya\ZsmAnnotatedServices\Annotation\Inject;
 use Psr\Http\Message\ResponseInterface as Response;
 use Psr\Http\Message\ServerRequestInterface as Request;
+use Shlinkio\Shlink\Rest\Util\RestUtils;
 use Zend\Diactoros\Response\JsonResponse;
 
 class GetVisitsMiddleware extends AbstractRestMiddleware
diff --git a/src/Middleware/Rest/ListShortcodesMiddleware.php b/module/Rest/src/Action/ListShortcodesMiddleware.php
similarity index 93%
rename from src/Middleware/Rest/ListShortcodesMiddleware.php
rename to module/Rest/src/Action/ListShortcodesMiddleware.php
index 99d82454..158a3860 100644
--- a/src/Middleware/Rest/ListShortcodesMiddleware.php
+++ b/module/Rest/src/Action/ListShortcodesMiddleware.php
@@ -1,15 +1,14 @@
 <?php
-namespace Acelaya\UrlShortener\Middleware\Rest;
+namespace Shlinkio\Shlink\Rest\Action;
 
 use Acelaya\UrlShortener\Paginator\Util\PaginatorUtilsTrait;
 use Acelaya\UrlShortener\Service\ShortUrlService;
 use Acelaya\UrlShortener\Service\ShortUrlServiceInterface;
-use Acelaya\UrlShortener\Util\RestUtils;
 use Acelaya\ZsmAnnotatedServices\Annotation\Inject;
 use Psr\Http\Message\ResponseInterface as Response;
 use Psr\Http\Message\ServerRequestInterface as Request;
+use Shlinkio\Shlink\Rest\Util\RestUtils;
 use Zend\Diactoros\Response\JsonResponse;
-use Zend\Stdlib\ArrayUtils;
 
 class ListShortcodesMiddleware extends AbstractRestMiddleware
 {
diff --git a/src/Middleware/Rest/ResolveUrlMiddleware.php b/module/Rest/src/Action/ResolveUrlMiddleware.php
similarity index 95%
rename from src/Middleware/Rest/ResolveUrlMiddleware.php
rename to module/Rest/src/Action/ResolveUrlMiddleware.php
index 4529e973..8c90e510 100644
--- a/src/Middleware/Rest/ResolveUrlMiddleware.php
+++ b/module/Rest/src/Action/ResolveUrlMiddleware.php
@@ -1,13 +1,13 @@
 <?php
-namespace Acelaya\UrlShortener\Middleware\Rest;
+namespace Shlinkio\Shlink\Rest\Action;
 
 use Acelaya\UrlShortener\Exception\InvalidShortCodeException;
 use Acelaya\UrlShortener\Service\UrlShortener;
 use Acelaya\UrlShortener\Service\UrlShortenerInterface;
-use Acelaya\UrlShortener\Util\RestUtils;
 use Acelaya\ZsmAnnotatedServices\Annotation\Inject;
 use Psr\Http\Message\ResponseInterface as Response;
 use Psr\Http\Message\ServerRequestInterface as Request;
+use Shlinkio\Shlink\Rest\Util\RestUtils;
 use Zend\Diactoros\Response\JsonResponse;
 
 class ResolveUrlMiddleware extends AbstractRestMiddleware
diff --git a/module/Rest/src/ConfigProvider.php b/module/Rest/src/ConfigProvider.php
new file mode 100644
index 00000000..0ad10a94
--- /dev/null
+++ b/module/Rest/src/ConfigProvider.php
@@ -0,0 +1,13 @@
+<?php
+namespace Shlinkio\Shlink\Rest;
+
+use Zend\Config\Factory;
+use Zend\Stdlib\Glob;
+
+class ConfigProvider
+{
+    public function __invoke()
+    {
+        return Factory::fromFiles(Glob::glob(__DIR__ . '/../config/{,*.}config.php', Glob::GLOB_BRACE));
+    }
+}
diff --git a/src/Middleware/CheckAuthenticationMiddleware.php b/module/Rest/src/Middleware/CheckAuthenticationMiddleware.php
similarity index 94%
rename from src/Middleware/CheckAuthenticationMiddleware.php
rename to module/Rest/src/Middleware/CheckAuthenticationMiddleware.php
index 8f7327e7..b8dee44e 100644
--- a/src/Middleware/CheckAuthenticationMiddleware.php
+++ b/module/Rest/src/Middleware/CheckAuthenticationMiddleware.php
@@ -1,13 +1,13 @@
 <?php
-namespace Acelaya\UrlShortener\Middleware;
+namespace Shlinkio\Shlink\Rest\Middleware;
 
 use Acelaya\UrlShortener\Exception\InvalidArgumentException;
-use Acelaya\UrlShortener\Service\RestTokenService;
-use Acelaya\UrlShortener\Service\RestTokenServiceInterface;
-use Acelaya\UrlShortener\Util\RestUtils;
 use Acelaya\ZsmAnnotatedServices\Annotation\Inject;
 use Psr\Http\Message\ResponseInterface as Response;
 use Psr\Http\Message\ServerRequestInterface as Request;
+use Shlinkio\Shlink\Rest\Service\RestTokenService;
+use Shlinkio\Shlink\Rest\Service\RestTokenServiceInterface;
+use Shlinkio\Shlink\Rest\Util\RestUtils;
 use Zend\Diactoros\Response\JsonResponse;
 use Zend\Expressive\Router\RouteResult;
 use Zend\Stratigility\MiddlewareInterface;
diff --git a/src/Middleware/CrossDomainMiddleware.php b/module/Rest/src/Middleware/CrossDomainMiddleware.php
similarity index 97%
rename from src/Middleware/CrossDomainMiddleware.php
rename to module/Rest/src/Middleware/CrossDomainMiddleware.php
index c76d4d73..ed3d333e 100644
--- a/src/Middleware/CrossDomainMiddleware.php
+++ b/module/Rest/src/Middleware/CrossDomainMiddleware.php
@@ -1,5 +1,5 @@
 <?php
-namespace Acelaya\UrlShortener\Middleware;
+namespace Shlinkio\Shlink\Rest\Middleware;
 
 use Psr\Http\Message\ResponseInterface as Response;
 use Psr\Http\Message\ServerRequestInterface as Request;
diff --git a/src/Service/RestTokenService.php b/module/Rest/src/Service/RestTokenService.php
similarity index 98%
rename from src/Service/RestTokenService.php
rename to module/Rest/src/Service/RestTokenService.php
index 26d7f34c..6f34896b 100644
--- a/src/Service/RestTokenService.php
+++ b/module/Rest/src/Service/RestTokenService.php
@@ -1,5 +1,5 @@
 <?php
-namespace Acelaya\UrlShortener\Service;
+namespace Shlinkio\Shlink\Rest\Service;
 
 use Acelaya\UrlShortener\Entity\RestToken;
 use Acelaya\UrlShortener\Exception\AuthenticationException;
diff --git a/src/Service/RestTokenServiceInterface.php b/module/Rest/src/Service/RestTokenServiceInterface.php
similarity index 95%
rename from src/Service/RestTokenServiceInterface.php
rename to module/Rest/src/Service/RestTokenServiceInterface.php
index 0cdec822..3cf7847e 100644
--- a/src/Service/RestTokenServiceInterface.php
+++ b/module/Rest/src/Service/RestTokenServiceInterface.php
@@ -1,5 +1,5 @@
 <?php
-namespace Acelaya\UrlShortener\Service;
+namespace Shlinkio\Shlink\Rest\Service;
 
 use Acelaya\UrlShortener\Entity\RestToken;
 use Acelaya\UrlShortener\Exception\AuthenticationException;
diff --git a/src/Util/RestUtils.php b/module/Rest/src/Util/RestUtils.php
similarity index 96%
rename from src/Util/RestUtils.php
rename to module/Rest/src/Util/RestUtils.php
index f0c37a00..d6707980 100644
--- a/src/Util/RestUtils.php
+++ b/module/Rest/src/Util/RestUtils.php
@@ -1,5 +1,5 @@
 <?php
-namespace Acelaya\UrlShortener\Util;
+namespace Shlinkio\Shlink\Rest\Util;
 
 use Acelaya\UrlShortener\Exception;