Merge branch 'hotfix/142'

Close zendframework#142

CHANGELOG.md

@@ -25,6 +25,9 @@ All notable changes to this project will be documented in this file, in reverse
   removes attributes with `null` values when calling `withoutAttribute()`.
 - [#132](https://github.com/zendframework/zend-diactoros/pull/132) updates the
   `ServerRequestFactory` to marshal the request path fragment, if present.
+- [#142](https://github.com/zendframework/zend-diactoros/pull/142) updates the
+  exceptions thrown by `HeaderSecurity` to include the header name and/or
+  value.
 
 ## 1.3.3 - 2016-01-04
 

src/HeaderSecurity.php

@@ -130,7 +130,10 @@ public static function isValid($value)
     public static function assertValid($value)
     {
         if (! self::isValid($value)) {
-            throw new InvalidArgumentException('Invalid header value');
+            throw new InvalidArgumentException(sprintf(
+                '"%s" is not valid header value',
+                $value
+            ));
         }
     }
 
@@ -144,7 +147,10 @@ public static function assertValid($value)
     public static function assertValidName($name)
     {
         if (! preg_match('/^[a-zA-Z0-9\'`#$%&*+.^_|~!-]+$/', $name)) {
-            throw new InvalidArgumentException('Invalid header name');
+            throw new InvalidArgumentException(sprintf(
+                '"%s" is not valid header name',
+                $name
+            ));
         }
     }
 }