Merge pull request #338 from SerheyDolgushev/fix_sign_null_cookie

fix: Added support for cookies with null value
nelmio · Mar 8, 2024 · b9b68b4 · b9b68b4
2 parents 9ae9fab + f5418bf
commit b9b68b4
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 deletions.
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -25,10 +25,6 @@ parameters:
 			count: 1
 			path: src/EventListener/FlexibleSslListener.php
 
-		-
-			message: "#^Parameter \\#1 \\$value of method Nelmio\\\\SecurityBundle\\\\Signer\\:\\:getSignedValue\\(\\) expects string, string\\|null given\\.$#"
-			count: 1
-			path: src/EventListener/SignedCookieListener.php
 
 		-
 			message: "#^Method Nelmio\\\\SecurityBundle\\\\UserAgent\\\\UAFamilyParser\\\\PsrCacheUAFamilyParser\\:\\:getUaFamily\\(\\) should return string but returns mixed\\.$#"

diff --git a/src/EventListener/SignedCookieListener.php b/src/EventListener/SignedCookieListener.php
@@ -74,7 +74,7 @@ public function onKernelResponse(ResponseEvent $e): void
                 $response->headers->removeCookie($cookie->getName(), $cookie->getPath(), $cookie->getDomain());
                 $signedCookie = new Cookie(
                     $cookie->getName(),
-                    $this->signer->getSignedValue($cookie->getValue()),
+                    $this->signer->getSignedValue((string) $cookie->getValue()),
                     $cookie->getExpiresTime(),
                     $cookie->getPath(),
                     $cookie->getDomain(),

diff --git a/tests/Listener/SignedCookieListenerTest.php b/tests/Listener/SignedCookieListenerTest.php
@@ -63,6 +63,7 @@ public function provideCookieReading(): array
             [['foo'], ['foo' => 'bar'], []],
             [['foo'], ['foo' => 'bar.ca3756f81d3728a023bdc8a622c0906f373b795e'], ['foo' => 'bar']],
             [['*'], ['foo' => 'bar.ca3756f81d3728a023bdc8a622c0906f373b795e'], ['foo' => 'bar']],
+            [['*'], ['foo' => '.25af6174a0fcecc4d346680a72b7ce644b9a88e8'], ['foo' => '']],
         ];
     }
 
@@ -101,6 +102,7 @@ public function provideCookieWriting(): array
             [[], ['foo' => 'bar'], ['foo' => 'bar']],
             [['foo'], ['foo' => 'bar'], ['foo' => 'bar.ca3756f81d3728a023bdc8a622c0906f373b795e']],
             [['*'], ['foo' => 'bar'], ['foo' => 'bar.ca3756f81d3728a023bdc8a622c0906f373b795e']],
+            [['*'], ['foo' => null], ['foo' => '.25af6174a0fcecc4d346680a72b7ce644b9a88e8']],
         ];
     }