Merge branch 'hotfix/psr-7-compliance'

Close #49

Author: weierophinney

CHANGELOG.md

@@ -27,6 +27,18 @@ All notable changes to this project will be documented in this file, in reverse
 - [#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 
+  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`.
+  - If no `Host` header is set, the `$preserveHost` flag MUST be ignored when
+    calling `withUri()` (previously, Diactoros would not set the `Host` header
+    if `$preserveHost` was `true`, but no `Host` header was present).
+  - The request method MUST be a string; it CAN be empty. Previously, Diactoros
+    would return `null`.
+  - The request MUST return a `UriInterface` instance from `getUri()`; that
+    instance CAN be empty. Previously, Diactoros would return `null`; now it
+    lazy-instantiates an empty `Uri` instance on initialization.
 
 ## 1.0.3 - 2015-06-04
 

src/RequestTrait.php

@@ -26,13 +26,14 @@
  * @property array $headers
  * @property array $headerNames
  * @property StreamInterface $stream
+ * @method bool hasHeader(string $header)
  */
 trait RequestTrait
 {
     /**
      * @var string
      */
-    private $method;
+    private $method = '';
 
     /**
      * The request-target, if it has been provided or calculated.
@@ -96,8 +97,8 @@ private function initialize($uri = null, $method = null, $body = 'php://memory',
             $uri = new Uri($uri);
         }
 
-        $this->method = $method;
-        $this->uri    = $uri;
+        $this->method = $method ?: '';
+        $this->uri    = $uri ?: new Uri();
         $this->stream = ($body instanceof StreamInterface) ? $body : new Stream($body, 'r');
 
         list($this->headerNames, $headers) = $this->filterHeaders($headers);
@@ -251,7 +252,7 @@ public function withUri(UriInterface $uri, $preserveHost = false)
         $new = clone $this;
         $new->uri = $uri;
 
-        if ($preserveHost) {
+        if ($preserveHost && $this->hasHeader('Host')) {
             return $new;
         }
 

test/RequestTest.php

@@ -26,9 +26,9 @@ public function setUp()
         $this->request = new Request();
     }
 
-    public function testMethodIsNullByDefault()
+    public function testMethodIsEmptyByDefault()
     {
-        $this->assertNull($this->request->getMethod());
+        $this->assertSame('', $this->request->getMethod());
     }
 
     public function testMethodMutatorReturnsCloneWithChangedMethod()
@@ -38,9 +38,18 @@ public function testMethodMutatorReturnsCloneWithChangedMethod()
         $this->assertEquals('GET', $request->getMethod());
     }
 
-    public function testUriIsNullByDefault()
+    public function testReturnsUnpopulatedUriByDefault()
     {
-        $this->assertNull($this->request->getUri());
+        $uri = $this->request->getUri();
+        $this->assertInstanceOf('Psr\Http\Message\UriInterface', $uri);
+        $this->assertInstanceOf('Zend\Diactoros\Uri', $uri);
+        $this->assertEmpty($uri->getScheme());
+        $this->assertEmpty($uri->getUserInfo());
+        $this->assertEmpty($uri->getHost());
+        $this->assertNull($uri->getPort());
+        $this->assertEmpty($uri->getPath());
+        $this->assertEmpty($uri->getQuery());
+        $this->assertEmpty($uri->getFragment());
     }
 
     public function testConstructorRaisesExceptionForInvalidStream()