Merge branch 'develop' of https://github.com/friendica/friendica into develop

[friendica.git] / src / Core / Session / Handler / Cache.php

diff --git a/src/Core/Session/Handler/Cache.php b/src/Core/Session/Handler/Cache.php
index ecd266adbf8822f4d5f7246e091b90aae8b139e9..8bf7f9364b8c4e22f29b0b1a406c5618c69e4796 100644 (file)
--- a/src/Core/Session/Handler/Cache.php
+++ b/src/Core/Session/Handler/Cache.php
@@ -1,4 +1,23 @@
 <?php
+/**
+ * @copyright Copyright (C) 2010-2021, the Friendica project
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
 
 namespace Friendica\Core\Session\Handler;
 
@@ -9,10 +28,8 @@ use SessionHandlerInterface;
 
 /**
  * SessionHandler using Friendica Cache
- *
- * @author Hypolite Petovan <hypolite@mrpetovan.com>
  */
-final class Cache implements SessionHandlerInterface
+class Cache implements SessionHandlerInterface
 {
        /** @var ICache */
        private $cache;
@@ -51,7 +68,7 @@ final class Cache implements SessionHandlerInterface
        }
 
        /**
-        * @brief Standard PHP session write callback
+        * Standard PHP session write callback
         *
         * This callback updates the stored session data and/or the expiration depending
         * on the case. Uses the Session::expire for existing session, 5 minutes
@@ -70,7 +87,7 @@ final class Cache implements SessionHandlerInterface
                }
 
                if (!$session_data) {
-                       return true;
+                       return $this->destroy($session_id);
                }
 
                return $this->cache->set('session:' . $session_id, $session_data, Session::$expire);