diff options
author | VirtualTam <virtualtam@flibidi.net> | 2018-04-27 22:12:22 +0200 |
---|---|---|
committer | VirtualTam <virtualtam@flibidi.net> | 2018-06-02 16:46:06 +0200 |
commit | fab87c2696b9d6a26310f1bfc024b018ca5184fe (patch) | |
tree | 383d361b4ae14b8105fdef339435c83ed3da60b6 | |
parent | 68dcaccfa46649addc66674b627a83064798bbc0 (diff) | |
download | Shaarli-fab87c2696b9d6a26310f1bfc024b018ca5184fe.tar.gz Shaarli-fab87c2696b9d6a26310f1bfc024b018ca5184fe.tar.zst Shaarli-fab87c2696b9d6a26310f1bfc024b018ca5184fe.zip |
Move LoginManager and SessionManager to the Security namespace
Signed-off-by: VirtualTam <virtualtam@flibidi.net>
-rw-r--r-- | application/security/LoginManager.php (renamed from application/LoginManager.php) | 2 | ||||
-rw-r--r-- | application/security/SessionManager.php (renamed from application/SessionManager.php) | 2 | ||||
-rw-r--r-- | composer.json | 3 | ||||
-rw-r--r-- | index.php | 4 | ||||
-rw-r--r-- | tests/security/LoginManagerTest.php (renamed from tests/LoginManagerTest.php) | 2 | ||||
-rw-r--r-- | tests/security/SessionManagerTest.php (renamed from tests/SessionManagerTest.php) | 2 |
6 files changed, 8 insertions, 7 deletions
diff --git a/application/LoginManager.php b/application/security/LoginManager.php index 27d06705..e7b9b21e 100644 --- a/application/LoginManager.php +++ b/application/security/LoginManager.php | |||
@@ -1,5 +1,5 @@ | |||
1 | <?php | 1 | <?php |
2 | namespace Shaarli; | 2 | namespace Shaarli\Security; |
3 | 3 | ||
4 | use Shaarli\Config\ConfigManager; | 4 | use Shaarli\Config\ConfigManager; |
5 | 5 | ||
diff --git a/application/SessionManager.php b/application/security/SessionManager.php index 63eeb8aa..6f004b24 100644 --- a/application/SessionManager.php +++ b/application/security/SessionManager.php | |||
@@ -1,5 +1,5 @@ | |||
1 | <?php | 1 | <?php |
2 | namespace Shaarli; | 2 | namespace Shaarli\Security; |
3 | 3 | ||
4 | use Shaarli\Config\ConfigManager; | 4 | use Shaarli\Config\ConfigManager; |
5 | 5 | ||
diff --git a/composer.json b/composer.json index 15e082f8..0d4c623c 100644 --- a/composer.json +++ b/composer.json | |||
@@ -36,7 +36,8 @@ | |||
36 | "Shaarli\\Api\\Controllers\\": "application/api/controllers", | 36 | "Shaarli\\Api\\Controllers\\": "application/api/controllers", |
37 | "Shaarli\\Api\\Exceptions\\": "application/api/exceptions", | 37 | "Shaarli\\Api\\Exceptions\\": "application/api/exceptions", |
38 | "Shaarli\\Config\\": "application/config/", | 38 | "Shaarli\\Config\\": "application/config/", |
39 | "Shaarli\\Config\\Exception\\": "application/config/exception" | 39 | "Shaarli\\Config\\Exception\\": "application/config/exception", |
40 | "Shaarli\\Security\\": "application/security" | ||
40 | } | 41 | } |
41 | } | 42 | } |
42 | } | 43 | } |
@@ -78,8 +78,8 @@ require_once 'application/Updater.php'; | |||
78 | use \Shaarli\Languages; | 78 | use \Shaarli\Languages; |
79 | use \Shaarli\ThemeUtils; | 79 | use \Shaarli\ThemeUtils; |
80 | use \Shaarli\Config\ConfigManager; | 80 | use \Shaarli\Config\ConfigManager; |
81 | use \Shaarli\LoginManager; | 81 | use \Shaarli\Security\LoginManager; |
82 | use \Shaarli\SessionManager; | 82 | use \Shaarli\Security\SessionManager; |
83 | 83 | ||
84 | // Ensure the PHP version is supported | 84 | // Ensure the PHP version is supported |
85 | try { | 85 | try { |
diff --git a/tests/LoginManagerTest.php b/tests/security/LoginManagerTest.php index 27ca0db5..b957abe3 100644 --- a/tests/LoginManagerTest.php +++ b/tests/security/LoginManagerTest.php | |||
@@ -1,5 +1,5 @@ | |||
1 | <?php | 1 | <?php |
2 | namespace Shaarli; | 2 | namespace Shaarli\Security; |
3 | 3 | ||
4 | require_once 'tests/utils/FakeConfigManager.php'; | 4 | require_once 'tests/utils/FakeConfigManager.php'; |
5 | use \PHPUnit\Framework\TestCase; | 5 | use \PHPUnit\Framework\TestCase; |
diff --git a/tests/SessionManagerTest.php b/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'; | |||
5 | require_once 'tests/utils/ReferenceSessionIdHashes.php'; | 5 | require_once 'tests/utils/ReferenceSessionIdHashes.php'; |
6 | ReferenceSessionIdHashes::genAllHashes(); | 6 | ReferenceSessionIdHashes::genAllHashes(); |
7 | 7 | ||
8 | use \Shaarli\SessionManager; | 8 | use \Shaarli\Security\SessionManager; |
9 | use \PHPUnit\Framework\TestCase; | 9 | use \PHPUnit\Framework\TestCase; |
10 | 10 | ||
11 | 11 | ||