Refactoring Core class structures ...
This commit is contained in:
@@ -21,8 +21,10 @@
|
||||
|
||||
namespace Friendica\Core\Session\Handler;
|
||||
|
||||
use Friendica\Core\Cache\ICache;
|
||||
use Friendica\Core\Cache\Capability\ICanCache;
|
||||
use Friendica\Core\Cache\Exception\CachePersistenceException;
|
||||
use Friendica\Core\Session;
|
||||
use Psr\Log\LoggerInterface;
|
||||
use SessionHandlerInterface;
|
||||
|
||||
/**
|
||||
@@ -30,29 +32,37 @@ use SessionHandlerInterface;
|
||||
*/
|
||||
class Cache implements SessionHandlerInterface
|
||||
{
|
||||
/** @var ICache */
|
||||
/** @var ICanCache */
|
||||
private $cache;
|
||||
/** @var LoggerInterface */
|
||||
private $logger;
|
||||
|
||||
public function __construct(ICache $cache)
|
||||
public function __construct(ICanCache $cache, LoggerInterface $logger)
|
||||
{
|
||||
$this->cache = $cache;
|
||||
$this->cache = $cache;
|
||||
$this->logger = $logger;
|
||||
}
|
||||
|
||||
public function open($save_path, $session_name)
|
||||
public function open($path, $name): bool
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
public function read($session_id)
|
||||
public function read($id)
|
||||
{
|
||||
if (empty($session_id)) {
|
||||
if (empty($id)) {
|
||||
return '';
|
||||
}
|
||||
|
||||
$data = $this->cache->get('session:' . $session_id);
|
||||
if (!empty($data)) {
|
||||
Session::$exists = true;
|
||||
return $data;
|
||||
try {
|
||||
$data = $this->cache->get('session:' . $id);
|
||||
if (!empty($data)) {
|
||||
Session::$exists = true;
|
||||
return $data;
|
||||
}
|
||||
} catch (CachePersistenceException $exception) {
|
||||
$this->logger->warning('Cannot read session.'. ['id' => $id, 'exception' => $exception]);
|
||||
return '';
|
||||
}
|
||||
|
||||
return '';
|
||||
@@ -65,36 +75,45 @@ class Cache implements SessionHandlerInterface
|
||||
* on the case. Uses the Session::expire for existing session, 5 minutes
|
||||
* for newly created session.
|
||||
*
|
||||
* @param string $session_id Session ID with format: [a-z0-9]{26}
|
||||
* @param string $session_data Serialized session data
|
||||
* @param string $id Session ID with format: [a-z0-9]{26}
|
||||
* @param string $data Serialized session data
|
||||
*
|
||||
* @return boolean Returns false if parameters are missing, true otherwise
|
||||
* @throws \Exception
|
||||
* @return bool Returns false if parameters are missing, true otherwise
|
||||
*/
|
||||
public function write($session_id, $session_data)
|
||||
public function write($id, $data): bool
|
||||
{
|
||||
if (!$session_id) {
|
||||
if (!$id) {
|
||||
return false;
|
||||
}
|
||||
|
||||
if (!$session_data) {
|
||||
return $this->destroy($session_id);
|
||||
if (!$data) {
|
||||
return $this->destroy($id);
|
||||
}
|
||||
|
||||
return $this->cache->set('session:' . $session_id, $session_data, Session::$expire);
|
||||
try {
|
||||
return $this->cache->set('session:' . $id, $data, Session::$expire);
|
||||
} catch (CachePersistenceException $exception) {
|
||||
$this->logger->warning('Cannot write session', ['id' => $id, 'exception' => $exception]);
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
public function close()
|
||||
public function close(): bool
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
public function destroy($id)
|
||||
public function destroy($id): bool
|
||||
{
|
||||
return $this->cache->delete('session:' . $id);
|
||||
try {
|
||||
return $this->cache->delete('session:' . $id);
|
||||
} catch (CachePersistenceException $exception) {
|
||||
$this->logger->warning('Cannot destroy session', ['id' => $id, 'exception' => $exception]);
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
public function gc($maxlifetime)
|
||||
public function gc($max_lifetime): bool
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user