[MessageTrait] Fix withAddedHeader() with array $value (#4)

Author: siwinski

src/MessageTrait.php

@@ -91,9 +91,18 @@ public function withAddedHeader($header, $value)
             return $this->withHeader($header, $value);
         }
 
+        $header = trim($header);
+        $name = strtolower($header);
+
+        $value = (array) $value;
+        foreach ($value as &$v) {
+            $v = trim($v);
+        }
+
         $new = clone $this;
-        $new->headers[strtolower($header)][] = $value;
-        $new->headerLines[$header][] = $value;
+        $new->headers[$name] = array_merge($new->headers[$name], $value);
+        $new->headerLines[$header] = array_merge($new->headerLines[$header], $value);
+
         return $new;
     }
 

tests/ResponseTest.php

@@ -120,6 +120,14 @@ public function testNewInstanceWhenAddingHeader()
         $this->assertEquals('Bar, Baz', $r2->getHeaderLine('foo'));
     }
 
+    public function testNewInstanceWhenAddingHeaderArray()
+    {
+        $r = new Response(200, array('Foo' => 'Bar'));
+        $r2 = $r->withAddedHeader('Foo', array('Baz', 'Qux'));
+        $this->assertNotSame($r, $r2);
+        $this->assertEquals(array('Bar', 'Baz', 'Qux'), $r2->getHeader('foo'));
+    }
+
     public function testNewInstanceWhenAddingHeaderThatWasNotThereBefore()
     {
         $r = new Response(200, array('Foo' => 'Bar'));
@@ -142,5 +150,5 @@ public function testBodyConsistent()
         $r = new Response(200, array(), '0');
         $this->assertEquals('0', (string)$r->getBody());
     }
-    
+
 }