From 00af48d9d20af1ce51c8ad42fe354fafc9ceb8a3 Mon Sep 17 00:00:00 2001
From: VirtualTam <virtualtam@flibidi.net>
Date: Mon, 3 Dec 2018 00:16:10 +0100
Subject: namespacing: \Shaarli\Http\Base64Url

Signed-off-by: VirtualTam <virtualtam@flibidi.net>
---
 application/Base64Url.php      | 35 -----------------------------------
 application/api/ApiUtils.php   |  6 +++---
 application/http/Base64Url.php | 35 +++++++++++++++++++++++++++++++++++
 composer.json                  |  1 +
 tests/api/ApiUtilsTest.php     |  2 +-
 5 files changed, 40 insertions(+), 39 deletions(-)
 delete mode 100644 application/Base64Url.php
 create mode 100644 application/http/Base64Url.php

diff --git a/application/Base64Url.php b/application/Base64Url.php
deleted file mode 100644
index 54d0fcd5..00000000
--- a/application/Base64Url.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-
-namespace Shaarli;
-
-/**
- * URL-safe Base64 operations
- *
- * @see https://en.wikipedia.org/wiki/Base64#URL_applications
- */
-class Base64Url
-{
-    /**
-     * Base64Url-encodes data
-     *
-     * @param string $data Data to encode
-     *
-     * @return string Base64Url-encoded data
-     */
-    public static function encode($data)
-    {
-        return rtrim(strtr(base64_encode($data), '+/', '-_'), '=');
-    }
-
-    /**
-     * Decodes Base64Url-encoded data
-     *
-     * @param string $data Data to decode
-     *
-     * @return string Decoded data
-     */
-    public static function decode($data)
-    {
-        return base64_decode(str_pad(strtr($data, '-_', '+/'), strlen($data) % 4, '=', STR_PAD_RIGHT));
-    }
-}
diff --git a/application/api/ApiUtils.php b/application/api/ApiUtils.php
index fc5ecaf1..e51b73e1 100644
--- a/application/api/ApiUtils.php
+++ b/application/api/ApiUtils.php
@@ -1,7 +1,7 @@
 <?php
 namespace Shaarli\Api;
 
-use Shaarli\Base64Url;
+use Shaarli\Http\Base64Url;
 use Shaarli\Api\Exceptions\ApiAuthorizationException;
 
 /**
@@ -12,7 +12,7 @@ class ApiUtils
     /**
      * Validates a JWT token authenticity.
      *
-     * @param string $token JWT token extracted from the headers.
+     * @param string $token  JWT token extracted from the headers.
      * @param string $secret API secret set in the settings.
      *
      * @throws ApiAuthorizationException the token is not valid.
@@ -50,7 +50,7 @@ class ApiUtils
     /**
      * Format a Link for the REST API.
      *
-     * @param array $link Link data read from the datastore.
+     * @param array  $link     Link data read from the datastore.
      * @param string $indexUrl Shaarli's index URL (used for relative URL).
      *
      * @return array Link data formatted for the REST API.
diff --git a/application/http/Base64Url.php b/application/http/Base64Url.php
new file mode 100644
index 00000000..33fa7c1f
--- /dev/null
+++ b/application/http/Base64Url.php
@@ -0,0 +1,35 @@
+<?php
+
+namespace Shaarli\Http;
+
+/**
+ * URL-safe Base64 operations
+ *
+ * @see https://en.wikipedia.org/wiki/Base64#URL_applications
+ */
+class Base64Url
+{
+    /**
+     * Base64Url-encodes data
+     *
+     * @param string $data Data to encode
+     *
+     * @return string Base64Url-encoded data
+     */
+    public static function encode($data)
+    {
+        return rtrim(strtr(base64_encode($data), '+/', '-_'), '=');
+    }
+
+    /**
+     * Decodes Base64Url-encoded data
+     *
+     * @param string $data Data to decode
+     *
+     * @return string Decoded data
+     */
+    public static function decode($data)
+    {
+        return base64_decode(str_pad(strtr($data, '-_', '+/'), strlen($data) % 4, '=', STR_PAD_RIGHT));
+    }
+}
diff --git a/composer.json b/composer.json
index 7c9cbf3d..8a3d1636 100644
--- a/composer.json
+++ b/composer.json
@@ -38,6 +38,7 @@
             "Shaarli\\Config\\Exception\\": "application/config/exception",
             "Shaarli\\Exceptions\\": "application/exceptions",
             "Shaarli\\Feed\\": "application/feed",
+            "Shaarli\\Http\\": "application/http",
             "Shaarli\\Security\\": "application/security"
         }
     }
diff --git a/tests/api/ApiUtilsTest.php b/tests/api/ApiUtilsTest.php
index df4e189a..a1b623d8 100644
--- a/tests/api/ApiUtilsTest.php
+++ b/tests/api/ApiUtilsTest.php
@@ -2,7 +2,7 @@
 
 namespace Shaarli\Api;
 
-use Shaarli\Base64Url;
+use Shaarli\Http\Base64Url;
 
 /**
  * Class ApiUtilsTest
-- 
cgit v1.2.3