Merge branch 'release/0.2.5'

Author: cdtweb

composer.json

@@ -1,7 +1,7 @@
 {
     "name": "nonamephp/php7-common",
     "description": "A collection of common PHP 7 libraries",
-    "version": "0.2.4",
+    "version": "0.2.5",
     "license": "MIT",
     "authors": [
         {
@@ -15,7 +15,8 @@
         "php": ">=7.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "~4.0"
+        "phpunit/phpunit": "~4.0",
+        "squizlabs/php_codesniffer": "2.*"
     },
     "autoload": {
         "psr-4": {

phpcs.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<ruleset name="Nonamephp coding standard">
+    <description>Nonamephp coding standard</description>
+
+    <!-- command arguments -->
+    <arg value="p"/>
+    <arg name="colors"/>
+
+    <!-- inherit rules -->
+    <rule ref="PSR2"/>
+    <rule ref="Generic.Arrays.DisallowLongArraySyntax"/>
+
+    <!-- include paths -->
+    <file>src</file>
+    <file>tests</file>
+</ruleset>

src/Collection.php

@@ -77,7 +77,7 @@ public function set($key, $value)
      */
     public function get($key, $default = null)
     {
-        if(isset($this->items[$key])){
+        if (isset($this->items[$key])) {
             return $this->items[$key];
         }
         return $default;
@@ -153,21 +153,21 @@ public function is($key, $value, $operator = null) : bool
     {
         $keyValue = $this->get($key);
 
-        if(in_array($operator, [null, '=', '=='])){
+        if (in_array($operator, [null, '=', '=='])) {
             return $keyValue == $value;
-        }elseif($operator == '==='){ // strict
+        } elseif ($operator == '===') { // strict
             return $keyValue === $value;
-        }elseif($operator == '>'){
+        } elseif ($operator == '>') {
             return $keyValue > $value;
-        }elseif($operator == '>='){
+        } elseif ($operator == '>=') {
             return $keyValue >= $value;
-        }elseif($operator == '<'){
+        } elseif ($operator == '<') {
             return $keyValue < $value;
-        }elseif($operator == '<='){
+        } elseif ($operator == '<=') {
             return $keyValue <= $value;
-        }elseif(in_array($operator, ['!=', '<>'])){
+        } elseif (in_array($operator, ['!=', '<>'])) {
             return $keyValue != $value;
-        }else{
+        } else {
             throw new \InvalidArgumentException('Invalid value supplied for $operator');
         }
     }
@@ -205,7 +205,7 @@ public function toArray() : array
 
     public function getIterator()
     {
-        foreach($this->items as $key => $value){
+        foreach ($this->items as $key => $value) {
             yield $key => $value;
         }
     }
@@ -244,7 +244,7 @@ public function offsetUnset($offset)
     ///////////////////////////////////
     // JsonSerializable Methods
 
-    function jsonSerialize()
+    public function jsonSerialize()
     {
         return $this->toArray();
     }
@@ -261,4 +261,4 @@ public function unserialize($serialized)
     {
         $this->items = unserialize($serialized);
     }
-}
+}

src/Validator.php

@@ -20,8 +20,8 @@
  * @method static bool isNumeric(mixed $value, array $rule = []) Checks if value is numeric
  * @method static bool isFloat(mixed $value, array $rule = []) Checks if value is float
  * @method static bool isDouble(mixed $value, array $rule = []) Checks if value is double
- * @method static bool isAlNum(mixed $value, array $rule = []) Checks if value contains only alpha-numeric characters
- * @method static bool isAlphaNumeric(mixed $value, array $rule = []) Checks if value contains only alpha-numeric characters
+ * @method static bool isAlNum(mixed $value, array $rule = []) Check for alpha-numeric characters only
+ * @method static bool isAlphaNumeric(mixed $value, array $rule = []) Check for alpha-numeric characters only
  * @method static bool isAlpha(mixed $value, array $rule = []) Checks if value contains only alpha characters
  * @method static bool isArr(mixed $value, array $rule = []) Checks if value is an array
  * @method static bool isArray(mixed $value, array $rule = []) Checks if value is an array
@@ -133,7 +133,7 @@ public static function __callStatic($method, $arguments)
                     }
                     return (new self())->validateType($type, $value, $rule);
                 }
-                throw new \InvalidArgumentException("Validator::is() expects 2 or 3 parameters, $numArgs parameters were given.");
+                throw new \InvalidArgumentException("Too many arguments passed to Validator::{$method}()");
             } else {
                 // Handle call to Validator::is{Type}($value [, $rule])
                 $type = implode('', $parts);
@@ -475,4 +475,4 @@ private function validateDateTime($value, array $rule = []) : bool
 
         return true;
     }
-}
+}

tests/CollectionTest.php

@@ -221,4 +221,4 @@ public function testMagicMethods()
         unset($collection['key1']);
         $this->assertFalse($collection->has('key1'));
     }
-}
+}