Merge branch 'weierophinney-hotfix/91' into develop

Author: ezimuel

CHANGELOG.md

@@ -48,10 +48,9 @@ All notable changes to this project will be documented in this file, in reverse
 - [#96](https://github.com/zendframework/zend-diactoros/pull/96) updates
   `withPort()` to allow `null` port values (indicating usage of default for
   the given scheme).
-- [#98](https://github.com/zendframework/zend-diactoros/pull/98) updates
-  the default JSON flags used by `JsonResponse` to include
-  `JSON_UNESCAPED_SLASHES`, which still conforms with RFC 4627, and is a more
-  sane default.
+- [#91](https://github.com/zendframework/zend-diactoros/pull/91) fixes the
+  logic of `withUri()` to do a case-insensitive check for an existing `Host`
+  header, replacing it with the new one.
 
 ## 1.1.3 - 2015-08-10
 
@@ -233,7 +232,7 @@ immediately.
 - [#57](https://github.com/zendframework/zend-diactoros/pull/57) fixes the
   behavior of how the `ServerRequestFactory` marshals upload files when they are
   represented as a nested associative array.
-- [#49](https://github.com/zendframework/zend-diactoros/pull/49) provides several 
+- [#49](https://github.com/zendframework/zend-diactoros/pull/49) provides several
   fixes that ensure that Diactoros complies with the PSR-7 specification:
   - `MessageInterface::getHeaderLine()` MUST return a string (that string CAN be
     empty). Previously, Diactoros would return `null`.

src/RequestTrait.php

@@ -249,6 +249,16 @@ public function withUri(UriInterface $uri, $preserveHost = false)
         }
 
         $new->headerNames['host'] = 'Host';
+
+        // Remove an existing host header if present, regardless of current
+        // de-normalization of the header name.
+        // @see https://github.com/zendframework/zend-diactoros/issues/91
+        foreach (array_keys($new->headers) as $header) {
+            if (strtolower($header) === 'host') {
+                unset($new->headers[$header]);
+            }
+        }
+
         $new->headers['Host'] = [$host];
 
         return $new;

test/RequestTest.php

@@ -455,4 +455,46 @@ public function testConstructorRaisesExceptionForHeadersWithCRLFVectors($name, $
         $this->setExpectedException('InvalidArgumentException');
         $request = new Request(null, null, 'php://memory', [$name =>  $value]);
     }
+
+    public function hostHeaderKeys()
+    {
+        return [
+            'lowercase'            => ['host'],
+            'mixed-4'              => ['hosT'],
+            'mixed-3-4'            => ['hoST'],
+            'reverse-titlecase'    => ['hOST'],
+            'uppercase'            => ['HOST'],
+            'mixed-1-2-3'          => ['HOSt'],
+            'mixed-1-2'            => ['HOst'],
+            'titlecase'            => ['Host'],
+            'mixed-1-4'            => ['HosT'],
+            'mixed-1-2-4'          => ['HOsT'],
+            'mixed-1-3-4'          => ['HoST'],
+            'mixed-1-3'            => ['HoSt'],
+            'mixed-2-3'            => ['hOSt'],
+            'mixed-2-4'            => ['hOsT'],
+            'mixed-2'              => ['hOst'],
+            'mixed-3'              => ['hoSt'],
+        ];
+    }
+
+    /**
+     * @group 91
+     * @dataProvider hostHeaderKeys
+     */
+    public function testWithUriAndNoPreserveHostWillOverwriteHostHeaderRegardlessOfOriginalCase($hostKey)
+    {
+        $request = (new Request())
+            ->withHeader($hostKey, 'example.com');
+
+        $uri  = new Uri('http://example.org/foo/bar');
+        $new  = $request->withUri($uri);
+        $host = $new->getHeaderLine('host');
+        $this->assertEquals('example.org', $host);
+        $headers = $new->getHeaders();
+        $this->assertArrayHasKey('Host', $headers);
+        if ($hostKey !== 'Host') {
+            $this->assertArrayNotHasKey($hostKey, $headers);
+        }
+    }
 }