From fab87c2696b9d6a26310f1bfc024b018ca5184fe Mon Sep 17 00:00:00 2001
From: VirtualTam <virtualtam@flibidi.net>
Date: Fri, 27 Apr 2018 22:12:22 +0200
Subject: [PATCH] Move LoginManager and SessionManager to the Security
 namespace

Signed-off-by: VirtualTam <virtualtam@flibidi.net>
---
 application/{ => security}/LoginManager.php   | 2 +-
 application/{ => security}/SessionManager.php | 2 +-
 composer.json                                 | 3 ++-
 index.php                                     | 4 ++--
 tests/{ => security}/LoginManagerTest.php     | 2 +-
 tests/{ => security}/SessionManagerTest.php   | 2 +-
 6 files changed, 8 insertions(+), 7 deletions(-)
 rename application/{ => security}/LoginManager.php (99%)
 rename application/{ => security}/SessionManager.php (99%)
 rename tests/{ => security}/LoginManagerTest.php (99%)
 rename tests/{ => security}/SessionManagerTest.php (99%)

diff --git a/application/LoginManager.php b/application/security/LoginManager.php
similarity index 99%
rename from application/LoginManager.php
rename to application/security/LoginManager.php
index 27d06705..e7b9b21e 100644
--- a/application/LoginManager.php
+++ b/application/security/LoginManager.php
@@ -1,5 +1,5 @@
 <?php
-namespace Shaarli;
+namespace Shaarli\Security;
 
 use Shaarli\Config\ConfigManager;
 
diff --git a/application/SessionManager.php b/application/security/SessionManager.php
similarity index 99%
rename from application/SessionManager.php
rename to application/security/SessionManager.php
index 63eeb8aa..6f004b24 100644
--- a/application/SessionManager.php
+++ b/application/security/SessionManager.php
@@ -1,5 +1,5 @@
 <?php
-namespace Shaarli;
+namespace Shaarli\Security;
 
 use Shaarli\Config\ConfigManager;
 
diff --git a/composer.json b/composer.json
index 15e082f8..0d4c623c 100644
--- a/composer.json
+++ b/composer.json
@@ -36,7 +36,8 @@
             "Shaarli\\Api\\Controllers\\": "application/api/controllers",
             "Shaarli\\Api\\Exceptions\\": "application/api/exceptions",
             "Shaarli\\Config\\": "application/config/",
-            "Shaarli\\Config\\Exception\\": "application/config/exception"
+            "Shaarli\\Config\\Exception\\": "application/config/exception",
+            "Shaarli\\Security\\": "application/security"
         }
     }
 }
diff --git a/index.php b/index.php
index 30bfc170..139812d7 100644
--- a/index.php
+++ b/index.php
@@ -78,8 +78,8 @@ require_once 'application/Updater.php';
 use \Shaarli\Languages;
 use \Shaarli\ThemeUtils;
 use \Shaarli\Config\ConfigManager;
-use \Shaarli\LoginManager;
-use \Shaarli\SessionManager;
+use \Shaarli\Security\LoginManager;
+use \Shaarli\Security\SessionManager;
 
 // Ensure the PHP version is supported
 try {
diff --git a/tests/LoginManagerTest.php b/tests/security/LoginManagerTest.php
similarity index 99%
rename from tests/LoginManagerTest.php
rename to tests/security/LoginManagerTest.php
index 27ca0db5..b957abe3 100644
--- a/tests/LoginManagerTest.php
+++ b/tests/security/LoginManagerTest.php
@@ -1,5 +1,5 @@
 <?php
-namespace Shaarli;
+namespace Shaarli\Security;
 
 require_once 'tests/utils/FakeConfigManager.php';
 use \PHPUnit\Framework\TestCase;
diff --git a/tests/SessionManagerTest.php b/tests/security/SessionManagerTest.php
similarity index 99%
rename from tests/SessionManagerTest.php
rename to tests/security/SessionManagerTest.php
index aa75962a..e4e1cfbc 100644
--- a/tests/SessionManagerTest.php
+++ b/tests/security/SessionManagerTest.php
@@ -5,7 +5,7 @@ require_once 'tests/utils/FakeConfigManager.php';
 require_once 'tests/utils/ReferenceSessionIdHashes.php';
 ReferenceSessionIdHashes::genAllHashes();
 
-use \Shaarli\SessionManager;
+use \Shaarli\Security\SessionManager;
 use \PHPUnit\Framework\TestCase;
 
 
-- 
2.41.0