symfony
diff --git a/‎src/Symfony/Component/HttpFoundation/HeaderBag.php
Lines changed: 7 additions & 6 deletions b/‎src/Symfony/Component/HttpFoundation/HeaderBag.php
Lines changed: 7 additions & 6 deletions
diff --git a/‎src/Symfony/Component/HttpFoundation/Request.php
Lines changed: 1 addition & 1 deletion b/‎src/Symfony/Component/HttpFoundation/Request.php
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/Symfony/Component/HttpFoundation/ResponseHeaderBag.php
Lines changed: 4 additions & 4 deletions b/‎src/Symfony/Component/HttpFoundation/ResponseHeaderBag.php
Lines changed: 4 additions & 4 deletions
diff --git a/‎src/Symfony/Component/HttpFoundation/ServerBag.php
Lines changed: 1 addition & 4 deletions b/‎src/Symfony/Component/HttpFoundation/ServerBag.php
Lines changed: 1 addition & 4 deletions
@@ -18,6 +18,9 @@
  */
 class HeaderBag implements \IteratorAggregate, \Countable
 {
+    protected const UPPER = '_ABCDEFGHIJKLMNOPQRSTUVWXYZ';
+    protected const LOWER = '-abcdefghijklmnopqrstuvwxyz';
+
     protected $headers = [];
     protected $cacheControl = [];
 
@@ -62,9 +65,7 @@ public function __toString()
     public function all(/*string $key = null*/)
     {
         if (1 <= \func_num_args() && null !== $key = func_get_arg(0)) {
-            $key = str_replace('_', '-', strtolower($key));
-
-            return $this->headers[$key] ?? [];
+            return $this->headers[strtr($key, self::UPPER, self::LOWER)] ?? [];
         }
 
         return $this->headers;
@@ -138,7 +139,7 @@ public function get($key, $default = null)
      */
     public function set($key, $values, $replace = true)
     {
-        $key = str_replace('_', '-', strtolower($key));
+        $key = strtr($key, self::UPPER, self::LOWER);
 
         if (\is_array($values)) {
             $values = array_values($values);
@@ -170,7 +171,7 @@ public function set($key, $values, $replace = true)
      */
     public function has($key)
     {
-        return \array_key_exists(str_replace('_', '-', strtolower($key)), $this->all());
+        return \array_key_exists(strtr($key, self::UPPER, self::LOWER), $this->all());
     }
 
     /**
@@ -193,7 +194,7 @@ public function contains($key, $value)
      */
     public function remove($key)
     {
-        $key = str_replace('_', '-', strtolower($key));
+        $key = strtr($key, self::UPPER, self::LOWER);
 
         unset($this->headers[$key]);
 
 
@@ -541,7 +541,7 @@ public function overrideGlobals()
 
         foreach ($this->headers->all() as $key => $value) {
             $key = strtoupper(str_replace('-', '_', $key));
-            if (\in_array($key, ['CONTENT_TYPE', 'CONTENT_LENGTH'])) {
+            if (\in_array($key, ['CONTENT_TYPE', 'CONTENT_LENGTH', 'CONTENT_MD5'], true)) {
                 $_SERVER[$key] = implode(', ', $value);
             } else {
                 $_SERVER['HTTP_'.$key] = implode(', ', $value);
 
@@ -51,7 +51,7 @@ public function allPreserveCase()
     {
         $headers = [];
         foreach ($this->all() as $name => $value) {
-            $headers[isset($this->headerNames[$name]) ? $this->headerNames[$name] : $name] = $value;
+            $headers[$this->headerNames[$name] ?? $name] = $value;
         }
 
         return $headers;
@@ -95,7 +95,7 @@ public function all(/*string $key = null*/)
         $headers = parent::all();
 
         if (1 <= \func_num_args() && null !== $key = func_get_arg(0)) {
-            $key = str_replace('_', '-', strtolower($key));
+            $key = strtr($key, self::UPPER, self::LOWER);
 
             return 'set-cookie' !== $key ? $headers[$key] ?? [] : array_map('strval', $this->getCookies());
         }
@@ -112,7 +112,7 @@ public function all(/*string $key = null*/)
      */
     public function set($key, $values, $replace = true)
     {
-        $uniqueKey = str_replace('_', '-', strtolower($key));
+        $uniqueKey = strtr($key, self::UPPER, self::LOWER);
 
         if ('set-cookie' === $uniqueKey) {
             if ($replace) {
@@ -143,7 +143,7 @@ public function set($key, $values, $replace = true)
      */
     public function remove($key)
     {
-        $uniqueKey = str_replace('_', '-', strtolower($key));
+        $uniqueKey = strtr($key, self::UPPER, self::LOWER);
         unset($this->headerNames[$uniqueKey]);
 
         if ('set-cookie' === $uniqueKey) {
 
@@ -28,13 +28,10 @@ class ServerBag extends ParameterBag
     public function getHeaders()
     {
         $headers = [];
-        $contentHeaders = ['CONTENT_LENGTH' => true, 'CONTENT_MD5' => true, 'CONTENT_TYPE' => true];
         foreach ($this->parameters as $key => $value) {
             if (0 === strpos($key, 'HTTP_')) {
                 $headers[substr($key, 5)] = $value;
-            }
-            // CONTENT_* are not prefixed with HTTP_
-            elseif (isset($contentHeaders[$key])) {
+            } elseif (\in_array($key, ['CONTENT_TYPE', 'CONTENT_LENGTH', 'CONTENT_MD5'], true)) {
                 $headers[$key] = $value;
             }
         }
Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,9 @@`
`18`	`18`	`*/`
`19`	`19`	`class HeaderBag implements \IteratorAggregate, \Countable`
`20`	`20`	`{`
	`21`	`+ protected const UPPER = '_ABCDEFGHIJKLMNOPQRSTUVWXYZ';`
	`22`	`+ protected const LOWER = '-abcdefghijklmnopqrstuvwxyz';`
	`23`	`+`
`21`	`24`	`protected $headers = [];`
`22`	`25`	`protected $cacheControl = [];`
`23`	`26`
`@@ -62,9 +65,7 @@ public function __toString()`
`62`	`65`	`public function all(/string $key = null/)`
`63`	`66`	`{`
`64`	`67`	`if (1 <= \func_num_args() && null !== $key = func_get_arg(0)) {`
`65`		`- $key = str_replace('_', '-', strtolower($key));`
`66`		`-`
`67`		`- return $this->headers[$key] ?? [];`
	`68`	`+ return $this->headers[strtr($key, self::UPPER, self::LOWER)] ?? [];`
`68`	`69`	`}`
`69`	`70`
`70`	`71`	`return $this->headers;`
`@@ -138,7 +139,7 @@ public function get($key, $default = null)`
`138`	`139`	`*/`
`139`	`140`	`public function set($key, $values, $replace = true)`
`140`	`141`	`{`
`141`		`- $key = str_replace('_', '-', strtolower($key));`
	`142`	`+ $key = strtr($key, self::UPPER, self::LOWER);`
`142`	`143`
`143`	`144`	`if (\is_array($values)) {`
`144`	`145`	`$values = array_values($values);`
`@@ -170,7 +171,7 @@ public function set($key, $values, $replace = true)`
`170`	`171`	`*/`
`171`	`172`	`public function has($key)`
`172`	`173`	`{`
`173`		`- return \array_key_exists(str_replace('_', '-', strtolower($key)), $this->all());`
	`174`	`+ return \array_key_exists(strtr($key, self::UPPER, self::LOWER), $this->all());`
`174`	`175`	`}`
`175`	`176`
`176`	`177`	`/**`
`@@ -193,7 +194,7 @@ public function contains($key, $value)`
`193`	`194`	`*/`
`194`	`195`	`public function remove($key)`
`195`	`196`	`{`
`196`		`- $key = str_replace('_', '-', strtolower($key));`
	`197`	`+ $key = strtr($key, self::UPPER, self::LOWER);`
`197`	`198`
`198`	`199`	`unset($this->headers[$key]);`
`199`	`200`
Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ public function allPreserveCase()`
`51`	`51`	`{`
`52`	`52`	`$headers = [];`
`53`	`53`	`foreach ($this->all() as $name => $value) {`
`54`		`- $headers[isset($this->headerNames[$name]) ? $this->headerNames[$name] : $name] = $value;`
	`54`	`+ $headers[$this->headerNames[$name] ?? $name] = $value;`
`55`	`55`	`}`
`56`	`56`
`57`	`57`	`return $headers;`
`@@ -95,7 +95,7 @@ public function all(/string $key = null/)`
`95`	`95`	`$headers = parent::all();`
`96`	`96`
`97`	`97`	`if (1 <= \func_num_args() && null !== $key = func_get_arg(0)) {`
`98`		`- $key = str_replace('_', '-', strtolower($key));`
	`98`	`+ $key = strtr($key, self::UPPER, self::LOWER);`
`99`	`99`
`100`	`100`	`return 'set-cookie' !== $key ? $headers[$key] ?? [] : array_map('strval', $this->getCookies());`
`101`	`101`	`}`
`@@ -112,7 +112,7 @@ public function all(/string $key = null/)`
`112`	`112`	`*/`
`113`	`113`	`public function set($key, $values, $replace = true)`
`114`	`114`	`{`
`115`		`- $uniqueKey = str_replace('_', '-', strtolower($key));`
	`115`	`+ $uniqueKey = strtr($key, self::UPPER, self::LOWER);`
`116`	`116`
`117`	`117`	`if ('set-cookie' === $uniqueKey) {`
`118`	`118`	`if ($replace) {`
`@@ -143,7 +143,7 @@ public function set($key, $values, $replace = true)`
`143`	`143`	`*/`
`144`	`144`	`public function remove($key)`
`145`	`145`	`{`
`146`		`- $uniqueKey = str_replace('_', '-', strtolower($key));`
	`146`	`+ $uniqueKey = strtr($key, self::UPPER, self::LOWER);`
`147`	`147`	`unset($this->headerNames[$uniqueKey]);`
`148`	`148`
`149`	`149`	`if ('set-cookie' === $uniqueKey) {`
Original file line number	Diff line number	Diff line change
`@@ -28,13 +28,10 @@ class ServerBag extends ParameterBag`
`28`	`28`	`public function getHeaders()`
`29`	`29`	`{`
`30`	`30`	`$headers = [];`
`31`		`- $contentHeaders = ['CONTENT_LENGTH' => true, 'CONTENT_MD5' => true, 'CONTENT_TYPE' => true];`
`32`	`31`	`foreach ($this->parameters as $key => $value) {`
`33`	`32`	`if (0 === strpos($key, 'HTTP_')) {`
`34`	`33`	`$headers[substr($key, 5)] = $value;`
`35`		`- }`
`36`		`- // CONTENT_* are not prefixed with HTTP_`
`37`		`- elseif (isset($contentHeaders[$key])) {`
	`34`	`+ } elseif (\in_array($key, ['CONTENT_TYPE', 'CONTENT_LENGTH', 'CONTENT_MD5'], true)) {`
`38`	`35`	`$headers[$key] = $value;`
`39`	`36`	`}`
`40`	`37`	`}`