Merge pull request #317 from guzzle/header-values-with-keys

ignore array keys in header values for correct merging
guzzle · Feb 4, 2020 · e193ff3 · e193ff3
2 parents ce6ae06 + e5c1dea
commit e193ff3
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/src/MessageTrait.php b/src/MessageTrait.php
@@ -194,7 +194,7 @@ private function trimHeaderValues(array $values)
             }
 
             return trim((string) $value, " \t");
-        }, $values);
+        }, array_values($values));
     }
 
     private function assertHeader($header)

diff --git a/tests/ResponseTest.php b/tests/ResponseTest.php
@@ -299,6 +299,15 @@ public function testHeaderValuesAreTrimmed()
         }
     }
 
+    public function testWithAddedHeaderArrayValueAndKeys()
+    {
+        $message = (new Response())->withAddedHeader('list', ['foo' => 'one']);
+        $message = $message->withAddedHeader('list', ['foo' => 'two', 'bar' => 'three']);
+
+        $headerLine = $message->getHeaderLine('list');
+        $this->assertSame('one, two, three', $headerLine);
+    }
+
     /**
      * @dataProvider nonIntegerStatusCodeProvider
      * @param mixed $invalidValues