Merge branch 'patch-1' of https://github.com/cebe/zf2 into feature/ht…

…tp-exceptions

src/Header/Accept.php

@@ -30,7 +30,7 @@ public static function fromString($headerLine)
 
         // check to ensure proper header type for this factory
         if (strtolower($name) !== 'accept') {
-            throw new Exception\InvalidArgumentException('Invalid header line for accept header string');
+            throw new Exception\InvalidArgumentException('Invalid header line for accept header string: "' . $name . '"');
         }
 
         // process multiple accept values

src/Header/AcceptCharset.php

@@ -20,7 +20,7 @@ public static function fromString($headerLine)
 
         // check to ensure proper header type for this factory
         if (strtolower($name) !== 'accept-charset') {
-            throw new Exception\InvalidArgumentException('Invalid header line for accept header string');
+            throw new Exception\InvalidArgumentException('Invalid header line for accept header string: "' . $name . '"');
         }
 
         $valueParts = explode(';', $value, 2);

src/Header/AcceptEncoding.php

@@ -17,7 +17,7 @@ public static function fromString($headerLine)
 
         // check to ensure proper header type for this factory
         if (strtolower($name) !== 'accept-encoding') {
-            throw new Exception\InvalidArgumentException('Invalid header line for accept header string');
+            throw new Exception\InvalidArgumentException('Invalid header line for accept header string: "' . $name . '"');
         }
 
         // @todo implementation details

src/Header/AcceptLanguage.php

@@ -17,7 +17,7 @@ public static function fromString($headerLine)
 
         // check to ensure proper header type for this factory
         if (strtolower($name) !== 'accept-language') {
-            throw new Exception\InvalidArgumentException('Invalid header line for Accept-Language string');
+            throw new Exception\InvalidArgumentException('Invalid header line for Accept-Language string: "' . $name . '"');
         }
 
         // @todo implementation details

src/Header/AcceptRanges.php

@@ -19,7 +19,7 @@ public static function fromString($headerLine)
 
         // check to ensure proper header type for this factory
         if (strtolower($name) !== 'accept-ranges') {
-            throw new Exception\InvalidArgumentException('Invalid header line for Accept-Ranges string');
+            throw new Exception\InvalidArgumentException('Invalid header line for Accept-Ranges string: "' . $name . '"');
         }
 
         $header->rangeUnit = trim($value);

src/Header/Age.php

@@ -19,7 +19,7 @@ public static function fromString($headerLine)
 
         // check to ensure proper header type for this factory
         if (strtolower($name) !== 'age') {
-            throw new Exception\InvalidArgumentException('Invalid header line for Age string');
+            throw new Exception\InvalidArgumentException('Invalid header line for Age string: "' . $name . '"');
         }
 
         $header->deltaSeconds = $value;

src/Header/Allow.php

@@ -19,7 +19,7 @@ public static function fromString($headerLine)
 
         // check to ensure proper header type for this factory
         if (strtolower($name) !== 'allow') {
-            throw new Exception\InvalidArgumentException('Invalid header line for Allow string');
+            throw new Exception\InvalidArgumentException('Invalid header line for Allow string: "' . $name . '"');
         }
 
         foreach (explode(',', $value) as $method) {

src/Header/AuthenticationInfo.php

@@ -17,12 +17,12 @@ public static function fromString($headerLine)
 
         // check to ensure proper header type for this factory
         if (strtolower($name) !== 'authentication-info') {
-            throw new Exception\InvalidArgumentException('Invalid header line for Authentication-Info string');
+            throw new Exception\InvalidArgumentException('Invalid header line for Authentication-Info string: "' . $name . '"');
         }
 
         // @todo implementation details
-        $header->value= $value;
-        
+        $header->value = $value;
+
         return $header;
     }
 
@@ -40,5 +40,5 @@ public function toString()
     {
         return 'Authentication-Info: ' . $this->getFieldValue();
     }
-    
+
 }

src/Header/Authorization.php

@@ -17,12 +17,12 @@ public static function fromString($headerLine)
 
         // check to ensure proper header type for this factory
         if (strtolower($name) !== 'authorization') {
-            throw new Exception\InvalidArgumentException('Invalid header line for Authorization string');
+            throw new Exception\InvalidArgumentException('Invalid header line for Authorization string: "' . $name . '"');
         }
 
         // @todo implementation details
-        $header->value= $value;
-        
+        $header->value = $value;
+
         return $header;
     }
 
@@ -40,5 +40,5 @@ public function toString()
     {
         return 'Authorization: ' . $this->getFieldValue();
     }
-    
+
 }

src/Header/CacheControl.php

@@ -17,12 +17,12 @@ public static function fromString($headerLine)
 
         // check to ensure proper header type for this factory
         if (strtolower($name) !== 'cache-control') {
-            throw new Exception\InvalidArgumentException('Invalid header line for Cache-Control string');
+            throw new Exception\InvalidArgumentException('Invalid header line for Cache-Control string: "' . $name . '"');
         }
 
         // @todo implementation details
-        $header->value= $value;
-        
+        $header->value = $value;
+
         return $header;
     }
 
@@ -40,5 +40,5 @@ public function toString()
     {
         return 'Cache-Control: ' . $this->getFieldValue();
     }
-    
+
 }

src/Header/Connection.php

@@ -17,12 +17,12 @@ public static function fromString($headerLine)
 
         // check to ensure proper header type for this factory
         if (strtolower($name) !== 'connection') {
-            throw new Exception\InvalidArgumentException('Invalid header line for Connection string');
+            throw new Exception\InvalidArgumentException('Invalid header line for Connection string: "' . $name . '"');
         }
 
         // @todo implementation details
-        $header->value= $value;
-        
+        $header->value = $value;
+
         return $header;
     }
 
@@ -40,5 +40,5 @@ public function toString()
     {
         return 'Connection: ' . $this->getFieldValue();
     }
-    
+
 }

src/Header/ContentDisposition.php

@@ -17,12 +17,12 @@ public static function fromString($headerLine)
 
         // check to ensure proper header type for this factory
         if (strtolower($name) !== 'content-disposition') {
-            throw new Exception\InvalidArgumentException('Invalid header line for Content-Disposition string');
+            throw new Exception\InvalidArgumentException('Invalid header line for Content-Disposition string: "' . $name . '"');
         }
 
         // @todo implementation details
-        $header->value= $value;
-        
+        $header->value = $value;
+
         return $header;
     }
 
@@ -40,5 +40,5 @@ public function toString()
     {
         return 'Content-Disposition: ' . $this->getFieldValue();
     }
-    
+
 }

src/Header/ContentEncoding.php

@@ -17,12 +17,12 @@ public static function fromString($headerLine)
 
         // check to ensure proper header type for this factory
         if (strtolower($name) !== 'content-encoding') {
-            throw new Exception\InvalidArgumentException('Invalid header line for Content-Encoding string');
+            throw new Exception\InvalidArgumentException('Invalid header line for Content-Encoding string: "' . $name . '"');
         }
 
         // @todo implementation details
-        $header->value= $value;
-        
+        $header->value = $value;
+
         return $header;
     }
 
@@ -40,5 +40,5 @@ public function toString()
     {
         return 'Content-Encoding: ' . $this->getFieldValue();
     }
-    
+
 }

src/Header/ContentLanguage.php

@@ -17,12 +17,12 @@ public static function fromString($headerLine)
 
         // check to ensure proper header type for this factory
         if (strtolower($name) !== 'content-language') {
-            throw new Exception\InvalidArgumentException('Invalid header line for Content-Language string');
+            throw new Exception\InvalidArgumentException('Invalid header line for Content-Language string: "' . $name . '"');
         }
 
         // @todo implementation details
-        $header->value= $value;
-        
+        $header->value = $value;
+
         return $header;
     }
 
@@ -40,5 +40,5 @@ public function toString()
     {
         return 'Content-Language: ' . $this->getFieldValue();
     }
-    
+
 }

src/Header/ContentLength.php

@@ -17,12 +17,12 @@ public static function fromString($headerLine)
 
         // check to ensure proper header type for this factory
         if (strtolower($name) !== 'content-length') {
-            throw new Exception\InvalidArgumentException('Invalid header line for Content-Length string');
+            throw new Exception\InvalidArgumentException('Invalid header line for Content-Length string: "' . $name . '"');
         }
 
         // @todo implementation details
-        $header->value= $value;
-        
+        $header->value = $value;
+
         return $header;
     }
 
@@ -40,5 +40,5 @@ public function toString()
     {
         return 'Content-Length: ' . $this->getFieldValue();
     }
-    
+
 }

src/Header/ContentLocation.php

@@ -17,12 +17,12 @@ public static function fromString($headerLine)
 
         // check to ensure proper header type for this factory
         if (strtolower($name) !== 'content-location') {
-            throw new Exception\InvalidArgumentException('Invalid header line for Content-Location string');
+            throw new Exception\InvalidArgumentException('Invalid header line for Content-Location string: "' . $name . '"');
         }
 
         // @todo implementation details
-        $header->value= $value;
-        
+        $header->value = $value;
+
         return $header;
     }
 
@@ -40,5 +40,5 @@ public function toString()
     {
         return 'Content-Location: ' . $this->getFieldValue();
     }
-    
+
 }

src/Header/ContentMD5.php

@@ -17,12 +17,12 @@ public static function fromString($headerLine)
 
         // check to ensure proper header type for this factory
         if (strtolower($name) !== 'content-md5') {
-            throw new Exception\InvalidArgumentException('Invalid header line for Content-MD5 string');
+            throw new Exception\InvalidArgumentException('Invalid header line for Content-MD5 string: "' . $name . '"');
         }
 
         // @todo implementation details
-        $header->value= $value;
-        
+        $header->value = $value;
+
         return $header;
     }
 
@@ -40,5 +40,5 @@ public function toString()
     {
         return 'Content-MD5: ' . $this->getFieldValue();
     }
-    
+
 }

src/Header/ContentRange.php

@@ -17,12 +17,12 @@ public static function fromString($headerLine)
 
         // check to ensure proper header type for this factory
         if (strtolower($name) !== 'content-range') {
-            throw new Exception\InvalidArgumentException('Invalid header line for Content-Range string');
+            throw new Exception\InvalidArgumentException('Invalid header line for Content-Range string: "' . $name . '"');
         }
 
         // @todo implementation details
-        $header->value= $value;
-        
+        $header->value = $value;
+
         return $header;
     }
 
@@ -40,5 +40,5 @@ public function toString()
     {
         return 'Content-Range: ' . $this->getFieldValue();
     }
-    
+
 }

src/Header/ContentType.php

@@ -17,12 +17,12 @@ public static function fromString($headerLine)
 
         // check to ensure proper header type for this factory
         if (strtolower($name) !== 'content-type') {
-            throw new Exception\InvalidArgumentException('Invalid header line for Content-Type string');
+            throw new Exception\InvalidArgumentException('Invalid header line for Content-Type string: "' . $name . '"');
         }
 
         // @todo implementation details
-        $header->value= $value;
-        
+        $header->value = $value;
+
         return $header;
     }
 
@@ -40,5 +40,5 @@ public function toString()
     {
         return 'Content-Type: ' . $this->getFieldValue();
     }
-    
+
 }

src/Header/Cookie.php

@@ -61,7 +61,7 @@ public static function fromString($headerLine)
 
         // check to ensure proper header type for this factory
         if (strtolower($name) !== 'cookie') {
-            throw new Exception\InvalidArgumentException('Invalid header line for Server string');
+            throw new Exception\InvalidArgumentException('Invalid header line for Server string: "' . $name . '"');
         }
 
         $nvPairs = preg_split('#;\s*#', $value);

src/Header/Date.php

@@ -17,12 +17,12 @@ public static function fromString($headerLine)
 
         // check to ensure proper header type for this factory
         if (strtolower($name) !== 'date') {
-            throw new Exception\InvalidArgumentException('Invalid header line for Date string');
+            throw new Exception\InvalidArgumentException('Invalid header line for Date string: "' . $name . '"');
         }
 
         // @todo implementation details
-        $header->value= $value;
-        
+        $header->value = $value;
+
         return $header;
     }
 
@@ -40,5 +40,5 @@ public function toString()
     {
         return 'Date: ' . $this->getFieldValue();
     }
-    
+
 }

src/Header/Etag.php

@@ -17,12 +17,12 @@ public static function fromString($headerLine)
 
         // check to ensure proper header type for this factory
         if (strtolower($name) !== 'etag') {
-            throw new Exception\InvalidArgumentException('Invalid header line for Etag string');
+            throw new Exception\InvalidArgumentException('Invalid header line for Etag string: "' . $name . '"');
         }
 
         // @todo implementation details
-        $header->value= $value;
-        
+        $header->value = $value;
+
         return $header;
     }
 
@@ -40,5 +40,5 @@ public function toString()
     {
         return 'Etag: ' . $this->getFieldValue();
     }
-    
+
 }