Merge remote-tracking branch 'origin/master' into php5

# Conflicts:
#	README.md
#	src/FilterList.php
#	src/ValidationTrait.php

Author: inhere

README.md

@@ -13,7 +13,7 @@
     }
   ],
   "require": {
-    "php": ">=5.5.0"
+    "php": ">=7.0.0"
   },
   "autoload": {
     "psr-4": {

composer.json

@@ -236,20 +236,22 @@ $valid = Validation::make($_POST,[
 
 validator | description | rule example
 ----------|-------------|------------
-`int`   | validate int | ....
+`int`   | validate int | `['userId', 'int']`
 `number`    | validate number | ....
 `bool`  | validate bool | ....
 `float` | validate float | ....
+`string`    | validate string. support length check (like `length`) | `['name', 'string']`, `['name', 'string', 'min'=>4, 'max'=>16]`
 `regexp`    | validate regexp | ....
 `url`   | validate url | ....
 `email` | validate email | ....
 `ip`    | validate ip | ....
 `required`  | validate required | `['tagId,userId', 'required' ]`
-`length`    | validate length | ....
-`size`  | validate size | `['tagId', 'size', 'min'=>4, 'max'=>567]`
+`size`  | validate size, can validate `int`, `string`, `array` | `['tagId', 'size', 'min'=>4, 'max'=>567]` `['name', 'size', 'max' => 16]`
+`range`  | alias `size` | same `size`
+`length`    | like `size`, but only validate `string`, `array` length | ....
 `min`   | validate min | `['title', 'min', 'value' => 40],]`
 `max`   | validate max | ....
 `in`    | validate in | `['id', 'in', 'value' => [1,2,3],]`
-`string`    | validate string | ....
+`compare`    | compare attr | `['passwd', 'compare', 'repasswd']`
 `isArray`   | validate is Array | ....
-`callback`  | validate by custom callback | ....
+`callback`  | validate by custom callback | ....

document.md

@@ -7,12 +7,10 @@
  */
 class DataModel
 {
-
     use \inhere\validate\ValidationTrait;
 
     protected $data = [];
 
-
     /**
      * @param array $data
      * @return $this
@@ -23,6 +21,4 @@ public function setData($data)
 
         return $this;
     }
-
-
-}
+}

example/index.php

@@ -0,0 +1,91 @@
+<?php
+
+spl_autoload_register(function($class)
+{
+    // e.g. "inhere\validate\ValidationTrait"
+    if (strpos($class,'\\')) {
+        $file = dirname(__DIR__) . '/src/' . trim(strrchr($class,'\\'),'\\'). '.php';
+    } else {
+        $file = __DIR__ . '/' . $class. '.php';
+    }
+
+    if (is_file($file)) {
+        include $file;
+    }
+});
+
+$data = [
+    // 'userId' => 234,
+    'userId' => 'is not an integer',
+    'tagId' => '234535',
+    // 'freeTime' => '1456767657', // filed not exists
+    'note' => '',
+    'name' => 'Ajohn',
+    'existsField' => 'test',
+    'passwd' => 'password',
+    'repasswd' => 'repassword',
+    'insertTime' => '1456767657',
+    'goods' => [
+        'apple' => 34,
+        'pear' => 50,
+    ],
+];
+
+$rules = [
+    ['tagId,userId,freeTime', 'required', 'msg' => '{attr} is required!'],// set message
+    ['tagId,userId,freeTime', 'number'],
+    ['note', 'email', 'skipOnEmpty' => false], // set skipOnEmpty is false.
+    ['insertTime', 'email', 'scene' => 'otherScene' ],// set scene. will is not validate it on default.
+    ['tagId', 'size', 'max'=> 567, 'min'=> 4, ], // 4<= tagId <=567
+    ['passwd', 'compare', 'repasswd'], //
+
+    ['name', 'regexp' ,'/^[a-z]\w{2,12}$/'],
+
+    ['goods.pear', 'max', 30], //
+
+    ['goods', 'isList'], //
+
+     ['notExistsField1', 'requiredWithout', 'notExistsField2'], //
+//    ['notExistsField1', 'requiredWithout', 'existsField'], //
+
+    ['freeTime', 'size', 'min'=>4, 'max'=>567, 'when' => function($data, $valid) {
+        echo "  use when pre-check\n";
+
+        // $valid is current validation instance.
+
+        return true;
+    }], // 4<= tagId <=567
+
+    ['userId', function($value, $data){
+        echo "  use custom validate to check userId \n";
+
+        // var_dump($value, $data);
+        // echo __LINE__ . "\n";
+
+        return false;
+    }, 'msg' => 'userId check failure by closure!'],
+];
+
+echo "\n----------------------------\n raw data, waiting to validate\n----------------------------\n\n";
+
+print_r($data);
+
+echo "\n----------------------------\n use ValidationTrait\n----------------------------\n\n";
+
+//$model = new DataModel($_POST,$rules);
+$model = new DataModel;
+$model->setData($data)->setRules($rules);
+$model->validate();
+
+print_r($model->getErrors());
+
+echo "\n----------------------------\n use Validation\n----------------------------\n\n";
+
+$valid = \inhere\validate\Validation::make($data, $rules)
+        ->setAttrTrans([
+            'goods.pear' => '梨子'
+        ])
+       ->validate([], false);
+
+print_r($valid->getErrors());
+