Skip to content

Commit

Permalink
Merge pull request #2 from doganoo/session
Browse files Browse the repository at this point in the history
session improvement
  • Loading branch information
doganoo committed Oct 18, 2020
2 parents ca23ccc + 21cceff commit 449dfdd
Showing 1 changed file with 10 additions and 2 deletions.
12 changes: 10 additions & 2 deletions src/HTTP/Session.php
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,15 @@ public function remove(string $index): void {
* @return string|null
*/
public function get(string $index, $default = null): ?string {
return $_SESSION[$index] ?? $default;
if (isset($_SESSION[$index])) {
return $_SESSION[$index];
}

if (null === $default) {
return null;
}

return $default;
}

/**
Expand All @@ -91,7 +99,7 @@ public function regenerateSessionId(bool $deleteOldSession = true): bool {
* @return bool
*/
public function isStarted(): bool {
return false === (session_id() === '' || !isset ($_SESSION));
return session_status() === PHP_SESSION_ACTIVE;
}

/**
Expand Down

0 comments on commit 449dfdd

Please sign in to comment.