bug #48628 [HttpFoundation] Fix dumping array cookies (nicolas-grekas)

nicolas-grekas · nicolas-grekas · commit f115d7a07bd9 · 2022-12-13T18:14:56.000+01:00
This PR was merged into the 5.4 branch. Discussion ---------- [HttpFoundation] Fix dumping array cookies | Q | A | ------------- | --- | Branch? | 5.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | Fix #48327 | License | MIT | Doc PR | - See https://www.php.net/manual/en/function.setcookie.php#refsect1-function.setcookie-notes Commits ------- 3cf4401 [HttpFoundation] Fix dumping array cookies
diff --git a/src/Symfony/Component/HttpFoundation/Request.php b/src/Symfony/Component/HttpFoundation/Request.php
@@ -522,10 +522,10 @@ public function __toString()
         $cookies = [];
 
         foreach ($this->cookies as $k => $v) {
-            $cookies[] = $k.'='.$v;
+            $cookies[] = \is_array($v) ? http_build_query([$k => $v], '', '; ', \PHP_QUERY_RFC3986) : "$k=$v";
         }
 
-        if (!empty($cookies)) {
+        if ($cookies) {
             $cookieHeader = 'Cookie: '.implode('; ', $cookies)."\r\n";
         }
 
diff --git a/src/Symfony/Component/HttpFoundation/Tests/RequestTest.php b/src/Symfony/Component/HttpFoundation/Tests/RequestTest.php
@@ -1702,6 +1702,12 @@ public function testToString()
         $asString = (string) $request;
 
         $this->assertStringContainsString('Cookie: Foo=Bar; Another=Cookie', $asString);
+
+        $request->cookies->set('foo.bar', [1, 2]);
+
+        $asString = (string) $request;
+
+        $this->assertStringContainsString('foo.bar%5B0%5D=1; foo.bar%5B1%5D=2', $asString);
     }
 
     public function testIsMethod()

Original file line number	Diff line number	Diff line change
`@@ -522,10 +522,10 @@ public function __toString()`
`522`	`522`	`$cookies = [];`
`523`	`523`
`524`	`524`	`foreach ($this->cookies as $k => $v) {`
`525`		`- $cookies[] = $k.'='.$v;`
	`525`	`+ $cookies[] = \is_array($v) ? http_build_query([$k => $v], '', '; ', \PHP_QUERY_RFC3986) : "$k=$v";`
`526`	`526`	`}`
`527`	`527`
`528`		`- if (!empty($cookies)) {`
	`528`	`+ if ($cookies) {`
`529`	`529`	`$cookieHeader = 'Cookie: '.implode('; ', $cookies)."\r\n";`
`530`	`530`	`}`
`531`	`531`