Merge branch 'hotfix/51'

Close #51

Author: weierophinney

CHANGELOG.md

@@ -21,7 +21,9 @@ All notable changes to this project will be documented in this file, in reverse
 
 ### Fixed
 
-- Nothing.
+- [#51](https://github.com/zendframework/zend-diactoros/pull/51) fixes
+  `MessageTrait::getHeaderLine()` to return an empty string instead of `null` if
+  the header is undefined (which is the behavior specified in PSR-7).
 
 ## 1.0.3 - 2015-06-04
 

src/MessageTrait.php

@@ -142,8 +142,7 @@ public function getHeader($header)
     }
 
     /**
-     * Retrieves the line for a single header, with the header values as a
-     * comma-separated string.
+     * Retrieves a comma-separated string of the values for a single header.
      *
      * This method returns all of the header values of the given
      * case-insensitive header name as a string concatenated together using
@@ -154,18 +153,18 @@ public function getHeader($header)
      * and supply your own delimiter when concatenating.
      *
      * If the header does not appear in the message, this method MUST return
-     * a null value.
+     * an empty string.
      *
-     * @param string $header Case-insensitive header field name.
-     * @return string|null A string of values as provided for the given header
+     * @param string $name Case-insensitive header field name.
+     * @return string A string of values as provided for the given header
      *    concatenated together using a comma. If the header does not appear in
-     *    the message, this method MUST return a null value.
+     *    the message, this method MUST return an empty string.
      */
-    public function getHeaderLine($header)
+    public function getHeaderLine($name)
     {
-        $value = $this->getHeader($header);
+        $value = $this->getHeader($name);
         if (empty($value)) {
-            return null;
+            return '';
         }
 
         return implode(',', $value);

test/MessageTraitTest.php

@@ -198,9 +198,9 @@ public function testGetHeaderReturnsAnEmptyArrayWhenHeaderDoesNotExist()
         $this->assertSame([], $this->message->getHeader('X-Foo-Bar'));
     }
 
-    public function testGetHeaderLineReturnsNullWhenHeaderDoesNotExist()
+    public function testGetHeaderLineReturnsEmptyStringWhenHeaderDoesNotExist()
     {
-        $this->assertNull($this->message->getHeaderLine('X-Foo-Bar'));
+        $this->assertEmpty($this->message->getHeaderLine('X-Foo-Bar'));
     }
 
     public function headersWithInjectionVectors()

test/RequestTest.php

@@ -341,19 +341,19 @@ public function testGetHostHeaderLineReturnsUriHostWhenPresent()
     /**
      * @group 39
      */
-    public function testGetHostHeaderLineReturnsNullIfNoUriPresent()
+    public function testGetHostHeaderLineReturnsEmptyStringIfNoUriPresent()
     {
         $request = new Request();
-        $this->assertNull($request->getHeaderLine('host'));
+        $this->assertEmpty($request->getHeaderLine('host'));
     }
 
     /**
      * @group 39
      */
-    public function testGetHostHeaderLineReturnsNullIfUriDoesNotContainHost()
+    public function testGetHostHeaderLineReturnsEmptyStringIfUriDoesNotContainHost()
     {
         $request = new Request(new Uri());
-        $this->assertNull($request->getHeaderLine('host'));
+        $this->assertEmpty($request->getHeaderLine('host'));
     }
 
     public function testPassingPreserveHostFlagWhenUpdatingUriDoesNotUpdateHostHeader()