From a2fbf66d75430e6ceb4e8d1dc07ea001a604509c Mon Sep 17 00:00:00 2001 From: Nicolas Grekas Date: Thu, 30 Jun 2022 16:35:46 +0200 Subject: [PATCH 1/2] [Messenger] fix test --- .../Messenger/Tests/Retry/MultiplierRetryStrategyTest.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Symfony/Component/Messenger/Tests/Retry/MultiplierRetryStrategyTest.php b/src/Symfony/Component/Messenger/Tests/Retry/MultiplierRetryStrategyTest.php index 68dd87e83e9a7..e2fdb4b2a82f3 100644 --- a/src/Symfony/Component/Messenger/Tests/Retry/MultiplierRetryStrategyTest.php +++ b/src/Symfony/Component/Messenger/Tests/Retry/MultiplierRetryStrategyTest.php @@ -86,7 +86,7 @@ public function getWaitTimeTests(): iterable // Float delay yield [1000, 1.5555, 5000, 0, 1000]; - yield [1000, 1.5555, 5000, 1, 1555]; - yield [1000, 1.5555, 5000, 2, 2419]; + yield [1000, 1.5555, 5000, 1, 1556]; + yield [1000, 1.5555, 5000, 2, 2420]; } } From 84879504db8ec960a8f7ef381a9baf4981e4c671 Mon Sep 17 00:00:00 2001 From: BrokenSourceCode <59090546+BrokenSourceCode@users.noreply.github.com> Date: Mon, 27 Jun 2022 18:05:24 +0200 Subject: [PATCH 2/2] [HttpFoundation] Prevent PHP Warning: Session ID is too long or contains illegal characters --- .../HttpFoundation/Session/Storage/NativeSessionStorage.php | 2 +- .../Tests/Session/Storage/NativeSessionStorageTest.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/NativeSessionStorage.php b/src/Symfony/Component/HttpFoundation/Session/Storage/NativeSessionStorage.php index 629af455f17db..9fb09c0181dfa 100644 --- a/src/Symfony/Component/HttpFoundation/Session/Storage/NativeSessionStorage.php +++ b/src/Symfony/Component/HttpFoundation/Session/Storage/NativeSessionStorage.php @@ -153,7 +153,7 @@ public function start() } $sessionId = $_COOKIE[session_name()] ?? null; - if ($sessionId && $this->saveHandler instanceof AbstractProxy && 'files' === $this->saveHandler->getSaveHandlerName() && !preg_match('/^[a-zA-Z0-9,-]{22,}$/', $sessionId)) { + if ($sessionId && $this->saveHandler instanceof AbstractProxy && 'files' === $this->saveHandler->getSaveHandlerName() && !preg_match('/^[a-zA-Z0-9,-]{22,250}$/', $sessionId)) { // the session ID in the header is invalid, create a new one session_id(session_create_id()); } diff --git a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/NativeSessionStorageTest.php b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/NativeSessionStorageTest.php index 3ed7ce4e04653..87fb26a667d50 100644 --- a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/NativeSessionStorageTest.php +++ b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/NativeSessionStorageTest.php @@ -302,7 +302,7 @@ public function testRegenerateInvalidSessionIdForNativeFileSessionHandler() $started = $storage->start(); $this->assertTrue($started); - $this->assertMatchesRegularExpression('/^[a-zA-Z0-9,-]{22,}$/', session_id()); + $this->assertMatchesRegularExpression('/^[a-zA-Z0-9,-]{22,250}$/', session_id()); $storage->save(); $_COOKIE[session_name()] = '&~['; @@ -311,7 +311,7 @@ public function testRegenerateInvalidSessionIdForNativeFileSessionHandler() $started = $storage->start(); $this->assertTrue($started); - $this->assertMatchesRegularExpression('/^[a-zA-Z0-9,-]{22,}$/', session_id()); + $this->assertMatchesRegularExpression('/^[a-zA-Z0-9,-]{22,250}$/', session_id()); $storage->save(); $_COOKIE[session_name()] = '&~[';