Merge pull request #4586 from nanasess/fix-testcase

Fix testcase to session_regenerate_id()
EC-CUBE · Jun 26, 2020 · d66ebf7 · d66ebf7
2 parents a7ff5a5 + 97ec984
commit d66ebf7
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 10 deletions.
diff --git a/tests/Eccube/Tests/Session/Storage/Handler/SameSiteNoneCompatSessionHandlerTest.php b/tests/Eccube/Tests/Session/Storage/Handler/SameSiteNoneCompatSessionHandlerTest.php
@@ -101,16 +101,7 @@ public function provideSession()
                 // TODO Mock が動作しないためスキップ
                 continue;
             }
-            if ($name == 'regenerate') {
-                // XXX PHP7.4.5-7.4.7, 7.3.17-7.3.19 のバグでエラーになるためスキップ
-                // see https://github.com/symfony/symfony/pull/36485#issuecomment-615928699
-                if (PHP_VERSION_ID === 70405) continue;
-                if (PHP_VERSION_ID === 70406) continue;
-                if (PHP_VERSION_ID === 70407) continue;
-                if (PHP_VERSION_ID === 70317) continue;
-                if (PHP_VERSION_ID === 70318) continue;
-                if (PHP_VERSION_ID === 70319) continue;
-            }
+
             foreach ($userAgents as $user_agent => $shouldSendSameSiteNone) {
                 yield [$name, $user_agent, $shouldSendSameSiteNone];
             }

diff --git a/tests/Fixtures/session/regenerate.expected b/tests/Fixtures/session/regenerate.expected
@@ -11,6 +11,7 @@ validateId
 read
 doRead: abc|i:123;
 read
+doRead: abc|i:123;
 
 write
 doWrite: abc|i:123;

diff --git a/tests/Fixtures/session/regenerate.samesite-compat.expected b/tests/Fixtures/session/regenerate.samesite-compat.expected
@@ -11,6 +11,7 @@ validateId
 read
 doRead: abc|i:123;
 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
@@ -11,6 +11,7 @@ validateId
 read
 doRead: abc|i:123;
 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
@@ -11,6 +11,7 @@ validateId
 read
 doRead: abc|i:123;
 read
+doRead: abc|i:123;
 
 write
 doWrite: abc|i:123;