Skip to content

Commit 90f99ff

Browse files
authored
Merge pull request #173 from kenjis/refactor-remove-SESSION
refactor: remove $_SESSION
2 parents 033ce7e + b6f10b8 commit 90f99ff

File tree

2 files changed

+8
-6
lines changed

2 files changed

+8
-6
lines changed

src/Authentication/Authenticators/Session.php

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -655,15 +655,17 @@ public function logout(): bool
655655

656656
// Destroy the session data - but ensure a session is still
657657
// available for flash messages, etc.
658-
if (isset($_SESSION)) {
659-
foreach (array_keys($_SESSION) as $key) {
660-
$_SESSION[$key] = null;
661-
unset($_SESSION[$key]);
658+
/** @var \CodeIgniter\Session\Session $session */
659+
$session = session();
660+
$sessionData = $session->get();
661+
if (isset($sessionData)) {
662+
foreach (array_keys($sessionData) as $key) {
663+
$session->remove($key);
662664
}
663665
}
664666

665667
// Regenerate the session ID for a touch of added safety.
666-
session()->regenerate(true);
668+
$session->regenerate(true);
667669

668670
// Take care of any remember-me functionality
669671
$this->rememberModel->purgeRememberTokens($this->user);

src/Entities/User.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ class User extends Entity
4747
/**
4848
* Returns the first identity of the given $type for this user.
4949
*
50-
* @param string $type 'email_2fa'|'email_activate'|'email_password'
50+
* @param string $type 'email_2fa'|'email_activate'|'email_password'|'magic-link'
5151
*/
5252
public function getIdentity(string $type): ?UserIdentity
5353
{

0 commit comments

Comments
 (0)