Fixed normalizing headers in HeadersConstraint (#15)

* Fixed normalizing headers in HeadersConstraint
* Update CHANGELOG

Author: slavcodev

CHANGELOG.md

@@ -3,6 +3,11 @@ All notable changes to this project will be documented in this file
 using the [Keep a CHANGELOG](http://keepachangelog.com/) principles.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [Unreleased]
+
+### Fixed
+- Fixed normalizing headers with scalar value in HeadersConstraint.
+
 ## [0.1.1] 2016-05-15
 
 ### Added

src/PhpUnit/HeadersConstraint.php

@@ -118,10 +118,10 @@ private static function normalizeJsonSchema($schema)
      */
     private static function normalizeHeaderValue($value)
     {
-        if (is_string($value)) {
+        if (is_string($value) && strpos($value, ',') !== false) {
             return preg_split('#\s*,\s*#', $value, -1, PREG_SPLIT_NO_EMPTY);
         } else {
-            return (array) $value;
+            return $value;
         }
     }
 }

tests/PhpUnit/HeadersConstraintTest.php

@@ -34,12 +34,8 @@ protected function setUp()
         $this->constraint = new HeadersConstraint(
             [
                 'Content-Type' => [
-                    'type' => 'array',
+                    'type' => 'string',
                     'required' => true,
-                    'minItems' => 1,
-                    'items' => [
-                        'type' => 'string',
-                    ],
                 ],
                 'Allow' => [
                     'type' => 'array',
@@ -48,6 +44,9 @@ protected function setUp()
                         'type' => 'string',
                     ],
                 ],
+                'X-Timestamp' => [
+                    'type' => 'integer',
+                ],
             ]
         );
     }
@@ -68,7 +67,11 @@ public function passUnexpectedValue()
      */
     public function AssertValidHeaders()
     {
-        $headers = ['Content-Type' => ['application/json'], 'Allow' => 'OPTIONS, HEAD'];
+        $headers = [
+            'Content-Type' => 'application/json',
+            'Allow' => 'OPTIONS, HEAD',
+            'X-Timestamp' => time(),
+        ];
 
         $this->assertThat($headers, $this->constraint);
     }
@@ -104,12 +107,17 @@ public function provideInvalidHeaders()
             'Missing required header' => [
                 [],
             ],
-            '[Allow] There must be a minimum of 2 items in the array' => [
+            '[Allow] String value found, but an array is required' => [
                 [
                     'Content-Type' => 'application/json',
                     'Allow' => 'OPTIONS',
                 ],
             ],
+            '[X-Timestamp] String value found, but an integer is required' => [
+                [
+                    'X-Timestamp' => 'foo',
+                ],
+            ],
         ];
     }
 }