[HttpFoundation] Always return strings from accept headers

ausi · nicolas-grekas · commit abddada74bb1 · 2022-09-09T18:01:42.000+02:00
diff --git a/src/Symfony/Component/HttpFoundation/Request.php b/src/Symfony/Component/HttpFoundation/Request.php
@@ -1646,7 +1646,8 @@ public function getLanguages()
 
         $languages = AcceptHeader::fromString($this->headers->get('Accept-Language'))->all();
         $this->languages = [];
-        foreach ($languages as $lang => $acceptHeaderItem) {
+        foreach ($languages as $acceptHeaderItem) {
+            $lang = $acceptHeaderItem->getValue();
             if (str_contains($lang, '-')) {
                 $codes = explode('-', $lang);
                 if ('i' === $codes[0]) {
@@ -1684,7 +1685,7 @@ public function getCharsets()
             return $this->charsets;
         }
 
-        return $this->charsets = array_keys(AcceptHeader::fromString($this->headers->get('Accept-Charset'))->all());
+        return $this->charsets = array_map('strval', array_keys(AcceptHeader::fromString($this->headers->get('Accept-Charset'))->all()));
     }
 
     /**
@@ -1698,7 +1699,7 @@ public function getEncodings()
             return $this->encodings;
         }
 
-        return $this->encodings = array_keys(AcceptHeader::fromString($this->headers->get('Accept-Encoding'))->all());
+        return $this->encodings = array_map('strval', array_keys(AcceptHeader::fromString($this->headers->get('Accept-Encoding'))->all()));
     }
 
     /**
@@ -1712,7 +1713,7 @@ public function getAcceptableContentTypes()
             return $this->acceptableContentTypes;
         }
 
-        return $this->acceptableContentTypes = array_keys(AcceptHeader::fromString($this->headers->get('Accept'))->all());
+        return $this->acceptableContentTypes = array_map('strval', array_keys(AcceptHeader::fromString($this->headers->get('Accept'))->all()));
     }
 
     /**
diff --git a/src/Symfony/Component/HttpFoundation/Tests/RequestTest.php b/src/Symfony/Component/HttpFoundation/Tests/RequestTest.php
@@ -1582,6 +1582,20 @@ public function testGetLanguages()
         $this->assertEquals(['zh', 'cherokee'], $request->getLanguages());
     }
 
+    public function testGetAcceptHeadersReturnString()
+    {
+        $request = new Request();
+        $request->headers->set('Accept', '123');
+        $request->headers->set('Accept-Charset', '123');
+        $request->headers->set('Accept-Encoding', '123');
+        $request->headers->set('Accept-Language', '123');
+
+        $this->assertSame(['123'], $request->getAcceptableContentTypes());
+        $this->assertSame(['123'], $request->getCharsets());
+        $this->assertSame(['123'], $request->getEncodings());
+        $this->assertSame(['123'], $request->getLanguages());
+    }
+
     public function testGetRequestFormat()
     {
         $request = new Request();

Original file line number	Diff line number	Diff line change
`@@ -1646,7 +1646,8 @@ public function getLanguages()`
`1646`	`1646`
`1647`	`1647`	`$languages = AcceptHeader::fromString($this->headers->get('Accept-Language'))->all();`
`1648`	`1648`	`$this->languages = [];`
`1649`		`- foreach ($languages as $lang => $acceptHeaderItem) {`
	`1649`	`+ foreach ($languages as $acceptHeaderItem) {`
	`1650`	`+ $lang = $acceptHeaderItem->getValue();`
`1650`	`1651`	`if (str_contains($lang, '-')) {`
`1651`	`1652`	`$codes = explode('-', $lang);`
`1652`	`1653`	`if ('i' === $codes[0]) {`
`@@ -1684,7 +1685,7 @@ public function getCharsets()`
`1684`	`1685`	`return $this->charsets;`
`1685`	`1686`	`}`
`1686`	`1687`
`1687`		`- return $this->charsets = array_keys(AcceptHeader::fromString($this->headers->get('Accept-Charset'))->all());`
	`1688`	`+ return $this->charsets = array_map('strval', array_keys(AcceptHeader::fromString($this->headers->get('Accept-Charset'))->all()));`
`1688`	`1689`	`}`
`1689`	`1690`
`1690`	`1691`	`/**`
`@@ -1698,7 +1699,7 @@ public function getEncodings()`
`1698`	`1699`	`return $this->encodings;`
`1699`	`1700`	`}`
`1700`	`1701`
`1701`		`- return $this->encodings = array_keys(AcceptHeader::fromString($this->headers->get('Accept-Encoding'))->all());`
	`1702`	`+ return $this->encodings = array_map('strval', array_keys(AcceptHeader::fromString($this->headers->get('Accept-Encoding'))->all()));`
`1702`	`1703`	`}`
`1703`	`1704`
`1704`	`1705`	`/**`
`@@ -1712,7 +1713,7 @@ public function getAcceptableContentTypes()`
`1712`	`1713`	`return $this->acceptableContentTypes;`
`1713`	`1714`	`}`
`1714`	`1715`
`1715`		`- return $this->acceptableContentTypes = array_keys(AcceptHeader::fromString($this->headers->get('Accept'))->all());`
	`1716`	`+ return $this->acceptableContentTypes = array_map('strval', array_keys(AcceptHeader::fromString($this->headers->get('Accept'))->all()));`
`1716`	`1717`	`}`
`1717`	`1718`
`1718`	`1719`	`/**`