Merge pull request #78 from l0gicgate/HeadersTestCoverage

Ensure getHeader's default argument is validated and trimmed

composer.json

@@ -39,8 +39,8 @@
     "php-http/psr7-integration-tests": "dev-master",
     "phpstan/phpstan": "^0.10",
     "phpunit/phpunit": "^6.0|^7.0",
-    "squizlabs/php_codesniffer": "^3.3",
-    "ralouphie/getallheaders": "^2"
+    "ralouphie/getallheaders": "^2",
+    "squizlabs/php_codesniffer": "^3.3"
   },
   "provide": {
     "psr/http-message-implementation": "1.0"

src/Headers.php

@@ -81,8 +81,8 @@ public function getHeader(string $name, $default = []): array
             return count(array_keys($default)) ? $this->validateAndTrimHeader($name, $default) : $default;
         }
 
-        if (is_string($default)) {
-            return [$default];
+        if (is_string($default) || is_numeric($default)) {
+            return $this->validateAndTrimHeader($name, $default);
         }
 
         throw new InvalidArgumentException('Default parameter of Headers::getHeader() must be a string or an array.');

tests/HeadersTest.php

@@ -9,8 +9,10 @@
 
 namespace Slim\Tests\Psr7;
 
+use InvalidArgumentException;
 use PHPUnit\Framework\TestCase;
 use Slim\Psr7\Headers;
+use stdClass;
 
 class HeadersTest extends TestCase
 {
@@ -75,6 +77,24 @@ public function testGetHeader()
         $this->assertEquals(['application/json', 'text/html'], $headers->getHeader('HTTP_ACCEPT'));
     }
 
+    public function testGetHeaderReturnsValidatedAndTrimedHeaderDefaultValue()
+    {
+        $headers = new Headers([]);
+
+        $this->assertEquals(['application/json'], $headers->getHeader('accept', ' application/json'));
+    }
+
+    /**
+     * @expectedException InvalidArgumentException
+     * @expectedExceptionMessage Default parameter of Headers::getHeader() must be a string or an array.
+     */
+    public function testGetHeaderThrowsExceptionWithInvalidDefaultArgument()
+    {
+        $headers = new Headers([]);
+
+        $headers->getHeader('accept', new stdClass());
+    }
+
     public function testSetHeader()
     {
         $headers = new Headers([