Merge pull request #48 from omarkdev/fix/#40-clear-meta-data

Clear metadata even if session key didn't exist
laminas · Feb 15, 2022 · 888c6a3 · 888c6a3
2 parents fc538bb + 30cbb47
commit 888c6a3
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 8 deletions.
diff --git a/src/Storage/AbstractSessionArrayStorage.php b/src/Storage/AbstractSessionArrayStorage.php
@@ -436,16 +436,9 @@ public function clear($key = null)
             return $this;
         }
 
-        if (! isset($_SESSION[$key])) {
-            return $this;
-        }
-
-        // Clear key data
         unset($_SESSION[$key]);
-
-        // Clear key metadata
         $this->setMetadata($key, null)
-             ->unlock($key);
+            ->unlock($key);
 
         return $this;
     }

diff --git a/test/SessionArrayStorageTest.php b/test/SessionArrayStorageTest.php
@@ -14,6 +14,9 @@
  */
 class SessionArrayStorageTest extends TestCase
 {
+    /** @var SessionArrayStorage */
+    private $storage;
+
     protected function setUp(): void
     {
         $_SESSION      = [];
@@ -200,4 +203,20 @@ public function testGetArrayCopyFromContainer(): void
         $container->baz = 'qux';
         self::assertSame(['foo' => 'bar', 'baz' => 'qux'], $container->getArrayCopy());
     }
+
+    public function testClearMetaDataIfDontExistInSession(): void
+    {
+        $this->storage->setMetadata('foo', 'bar');
+        $this->storage->clear('foo');
+
+        self::assertFalse($this->storage->getMetaData('foo'));
+    }
+
+    public function testClearRemoveFromSession(): void
+    {
+        $this->storage->foo = 'bar';
+        $this->storage->clear('foo');
+
+        self::assertArrayNotHasKey('foo', $_SESSION);
+    }
 }