Merge pull request #10 from linna/exception-update

Exception messages updated

Author: s3b4stian

CHANGELOG.md

@@ -8,6 +8,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unrelased ][v1.0.3](https://github.com/linna/typed-array/compare/v1.0.1...v1.0.3) - 2017-XX-XX
 
+### Changed
+* `Linna\TypedArray` exception messages updated
+* `Linna\TypedObjectArray` exception messages updated
+
 ### Fixed
 * `CHANGELOG.md` links url
 
@@ -24,5 +28,5 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 ## [v1.0.0](https://github.com/linna/typed-array/compare/v1.0.0...master) - 2017-06-07
 
 ### Added
-* `Linna\TypedArray` for create arrays that accept only values of the user defined type.
-* `Linna\TypedObjectArray` for create arrays that accept only class instances of the user defined type.
+* `Linna\TypedArray` for create arrays that accept only values of the user defined type
+* `Linna\TypedObjectArray` for create arrays that accept only class instances of the user defined type

src/TypedArray.php

@@ -51,13 +51,13 @@ public function __construct(string $type, array $array = [])
     {
         //single class, multi type support :)
         if (!isset($this->allowedTypes[$type])) {
-            throw new InvalidArgumentException($type.' type passed to '.__CLASS__.' not supported');
+            throw new InvalidArgumentException(__CLASS__.': '.$type.' type passed to '.__METHOD__.' not supported.');
         }
 
         //for not utilize foreach, compare sizes of array
         //before and after apply a filter :)
         if (count($array) > count(array_filter($array, 'is_'.$type))) {
-            throw new InvalidArgumentException('Elements passed to '.__CLASS__.' must be of the type '.$type);
+            throw new InvalidArgumentException(__CLASS__.': Elements passed to '.__METHOD__.' must be of the type '.$type.'.');
         }
 
         //call parent constructor
@@ -86,6 +86,6 @@ public function offsetSet($index, $newval)
 
             return;
         }
-        throw new InvalidArgumentException('Elements passed to '.__CLASS__.' must be of the type '.$this->type);
+        throw new InvalidArgumentException(__CLASS__.': Elements passed to '.__CLASS__.' must be of the type '.$this->type.'.');
     }
 }

src/TypedObjectArray.php

@@ -36,7 +36,7 @@ class TypedObjectArray extends ArrayObject
     public function __construct(string $type, array $array = [])
     {
         if (!class_exists($type)) {
-            throw new InvalidArgumentException('Type passed to '.__CLASS__.' must be an existing class');
+            throw new InvalidArgumentException(__CLASS__.': Type passed to '.__METHOD__.' must be an existing class');
         }
 
         //check elements of passed array
@@ -45,7 +45,7 @@ public function __construct(string $type, array $array = [])
             if ($element instanceof $type) {
                 continue;
             }
-            throw new InvalidArgumentException('Elements passed to '.__CLASS__.' must be of the type '.$type);
+            throw new InvalidArgumentException(__CLASS__.': Elements passed to '.__METHOD__.' must be of the type '.$type.'.');
         }
 
         //call parent constructor
@@ -71,6 +71,6 @@ public function offsetSet($index, $newval)
 
             return;
         }
-        throw new InvalidArgumentException('Elements passed to '.__CLASS__.' must be of the type '.$this->type);
+        throw new InvalidArgumentException(__CLASS__.': Elements passed to '.__CLASS__.' must be of the type '.$this->type.'.');
     }
 }