Merge branch '2019.03-RC'

[friendica.git] / src / Core / Session / CacheSessionHandler.php

diff --git a/src/Core/Session/CacheSessionHandler.php b/src/Core/Session/CacheSessionHandler.php
index 463fd33d3eff0d40de528b1446d64a892f9bef7d..c0a5896f4247a0f90330496df9c0f38ad305b9ca 100644 (file)
--- a/src/Core/Session/CacheSessionHandler.php
+++ b/src/Core/Session/CacheSessionHandler.php
@@ -4,16 +4,14 @@ namespace Friendica\Core\Session;
 
 use Friendica\BaseObject;
 use Friendica\Core\Cache;
+use Friendica\Core\Logger;
 use Friendica\Core\Session;
 use SessionHandlerInterface;
 
-require_once 'boot.php';
-require_once 'include/text.php';
-
 /**
  * SessionHandler using Friendica Cache
  *
- * @author Hypolite Petovan <mrpetovan@gmail.com>
+ * @author Hypolite Petovan <hypolite@mrpetovan.com>
  */
 class CacheSessionHandler extends BaseObject implements SessionHandlerInterface
 {
@@ -24,7 +22,7 @@ class CacheSessionHandler extends BaseObject implements SessionHandlerInterface
 
        public function read($session_id)
        {
-               if (!x($session_id)) {
+               if (empty($session_id)) {
                        return '';
                }
 
@@ -33,7 +31,7 @@ class CacheSessionHandler extends BaseObject implements SessionHandlerInterface
                        Session::$exists = true;
                        return $data;
                }
-               logger("no data for session $session_id", LOGGER_TRACE);
+               Logger::log("no data for session $session_id", Logger::TRACE);
                return '';
        }
 
@@ -47,6 +45,7 @@ class CacheSessionHandler extends BaseObject implements SessionHandlerInterface
         * @param  string $session_id   Session ID with format: [a-z0-9]{26}
         * @param  string $session_data Serialized session data
         * @return boolean Returns false if parameters are missing, true otherwise
+        * @throws \Exception
         */
        public function write($session_id, $session_data)
        {
@@ -58,9 +57,9 @@ class CacheSessionHandler extends BaseObject implements SessionHandlerInterface
                        return true;
                }
 
-               Cache::set('session:' . $session_id, $session_data, Session::$expire);
+               $return = Cache::set('session:' . $session_id, $session_data, Session::$expire);
 
-               return true;
+               return $return;
        }
 
        public function close()
@@ -70,8 +69,9 @@ class CacheSessionHandler extends BaseObject implements SessionHandlerInterface
 
        public function destroy($id)
        {
-               Cache::delete('session:' . $id);
-               return true;
+               $return = Cache::delete('session:' . $id);
+
+               return $return;
        }
 
        public function gc($maxlifetime)