Merge pull request #5862 from nanasess/fix-session-test

SameSiteNoneCompatSessionHandlerTest を修正
EC-CUBE · Nov 14, 2022 · 98ddf37 · 98ddf37
2 parents b36f749 + 81b6edf
commit 98ddf37
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 7 deletions.
diff --git a/tests/Fixtures/session/common.php b/tests/Fixtures/session/common.php
@@ -74,10 +74,12 @@
 class MockSessionHandler extends \SessionHandler
 {
     private $data;
+    private $sessionId;
 
-    public function __construct($data = null)
+    public function __construct($data = '', $sessionId = null)
     {
         $this->data = $data;
+        $this->sessionId = $sessionId;
     }
 
     public function getData()
@@ -173,21 +175,29 @@ public function gc($maxLifetime)
 
     protected function doRead($sessionId)
     {
+        if (isset($this->sessionId) && $sessionId !== $this->sessionId) {
+            echo __FUNCTION__ . ": invalid sessionId\n";
+
+            return '';
+        }
         echo __FUNCTION__.': ', $this->data, "\n";
+        $this->sessionId = $sessionId;
 
         return $this->data;
     }
 
     protected function doWrite($sessionId, $data)
     {
         echo __FUNCTION__.': ', $data, "\n";
+        $this->sessionId = $sessionId;
 
         return true;
     }
 
     protected function doDestroy($sessionId)
     {
         echo __FUNCTION__, "\n";
+        $this->sessionId = $sessionId;
 
         return true;
     }

diff --git a/tests/Fixtures/session/regenerate.expected b/tests/Fixtures/session/regenerate.expected
@@ -9,9 +9,8 @@ close
 open
 validateId
 read
-doRead: abc|i:123;
+doRead: invalid sessionId
 read
-doRead: abc|i:123;
 
 write
 doWrite: abc|i:123;

diff --git a/tests/Fixtures/session/regenerate.samesite.expected b/tests/Fixtures/session/regenerate.samesite.expected
@@ -9,9 +9,8 @@ close
 open
 validateId
 read
-doRead: abc|i:123;
+doRead: invalid sessionId
 read
-doRead: abc|i:123;
 
 write
 doWrite: abc|i:123;

diff --git a/tests/Fixtures/session/regenerate.secure.expected b/tests/Fixtures/session/regenerate.secure.expected
@@ -9,9 +9,8 @@ close
 open
 validateId
 read
-doRead: abc|i:123;
+doRead: invalid sessionId
 read
-doRead: abc|i:123;
 
 write
 doWrite: abc|i:123;