Move LoginManager and SessionManager to the Security namespace

Signed-off-by: VirtualTam <virtualtam@flibidi.net>

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 27d067051f8c9980e9257a4eddcb9e566fb364ab..e7b9b21ef5c80d63919cfa304cd75d00daa0b2d7 100644 (file)
--- 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 63eeb8aa68ae32bd446f0ce91853c3e3cda130c0..6f004b248c28d0310c6d85b0d3721b6562b24c3e 100644 (file)
--- 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 15e082f8195159b92ef4e36091678718b779f0c0..0d4c623c8b181bc2aa5a7433de4a40290b6b3420 100644 (file)
--- 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 30bfc1701c6bf09ec79f2c8497963af7b5cd5811..139812d742d19fc69d3382f637fcf7f47a6f4ec6 100644 (file)
--- 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 27ca0db5730b812baf0b20f96232c5c95501c638..b957abe3fcc7f1c25ae436b5e36c47e3a7aaf8a5 100644 (file)
--- 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 aa75962a4994929155c8da5ee2e48e85bb07fc18..e4e1cfbc82d291cf927164725d4e370f338bb468 100644 (file)
--- 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;