update

Author: inhere

document.md

@@ -20,7 +20,7 @@ run: `composer update`
 
 - Method 1: create a new class
     e.g.
-    
+
 ```php
 
     use inhere\validate\Validation;
@@ -34,40 +34,39 @@ run: `composer update`
                 ['tagId', 'size', 'min'=>4, 'max'=>567], // 4<= tagId <=567
                 ['title', 'min', 'min' => 40],
                 ['freeTime', 'number'],
-                ['tagId', 'number', 'when' => function($data) 
+                ['tagId', 'number', 'when' => function($data)
                 {
                     return isset($data['status']) && $data['status'] > 2;
                 }],
-                ['userId', 'number', 'scene' => 'scene1' ],
-                ['userId', 'int', 'scene'    => 'scene2' ],
+                ['userId', 'number', 'on' => 'scene1' ],
+                ['userId', 'int', 'on'    => 'scene2' ],
                 ['title', 'customValidator', 'msg' => '{attr} error msg!' ],
                 ['status', function($status)
-                { 
+                {
 
                     if ( .... ) {
                         return true;
                     }
                     return false;
                 }],
             ];
-        }
-        
+
         // custom validator at the class. return a bool.
         protected function customValidator($title)
         {
             // some logic ...
-            
+
             return true; // Or false;
         }
-        
+
         // define field attribute's translate.
         public function attrTrans()
         {
             return [
               'userId' => '用户Id',
             ];
         }
-        
+
         // custom validator message, more {@see ValidationTrait::_defaultMessages}
         public function messages()
         {
@@ -87,7 +86,7 @@ if ( $valid->fail() ) {
     return $valid->getErrors();
 }
 ...
-    
+
 ```
 
 
@@ -97,7 +96,7 @@ if ( $valid->fail() ) {
 
     use inhere\validate\Validation;
 
-    class SomeClass 
+    class SomeClass
     {
         public function demo()
         {
@@ -111,7 +110,7 @@ if ( $valid->fail() ) {
                 return $valid->getErrors();
             }
 
-            // 
+            //
             // some logic ... ...
         }
     }
@@ -132,14 +131,14 @@ $valid = Validation::make($_POST,[
         ])
         ->addValidator('checkTitle',function($title){
             // some logic ...
-            
+
             return true; // if validate fail, return false.
         }, '{attr} default message!')
         ->validate();
 
 ```
 
-### keywords 
+### keywords
 
 - scene -- 设置验证场景
 
@@ -148,15 +147,15 @@ $valid = Validation::make($_POST,[
 ```php
 
 // at a subclass of the Validation class
-<?php 
-        
-    public function rules() 
+<?php
+
+    public function rules()
     {
          return [
             ['title', 'required' ],
-            ['userId', 'number', 'scene' => 'scene1' ],
-            ['userId', 'int',    'scene' => 'scene2' ],
-            ['name', 'string',    'scene' => 'scene1,scene2' ],
+            ['userId', 'number', 'on' => 'scene1' ],
+            ['userId', 'int',    'on' => 'scene2' ],
+            ['name', 'string',    'on' => 'scene1,scene2' ],
         ];
     }
 ```
@@ -165,7 +164,7 @@ $valid = Validation::make($_POST,[
 
 ```php
 
-// at logic 
+// at logic
 <?php
 
     ...
@@ -184,12 +183,12 @@ $valid = Validation::make($_POST,[
 ```php
 
 // at a subclass of the Validation class
-<?php 
-    public function rules() 
+<?php
+    public function rules()
     {
          return [
             ['title', 'required' ],
-            ['tagId', 'number', 'when' => function($data, $validator) 
+            ['tagId', 'number', 'when' => function($data, $validator)
             {
                return isset($data['status']) && $data['status'] > 2;
             }],
@@ -232,7 +231,7 @@ $valid = Validation::make($_POST,[
  }]
 ```
 
-### Existing validators 
+### Existing validators
 
 validator | description | rule example
 ----------|-------------|------------
@@ -252,4 +251,4 @@ validator | description | rule example
 `in`    | validate in | `['id', 'in', 'value' => [1,2,3],]`
 `string`    | validate string | ....
 `isArray`   | validate is Array | ....
-`callback`  | validate by custom callback | ....
+`callback`  | validate by custom callback | ....

src/ValidationTrait.php

@@ -26,6 +26,13 @@ trait ValidationTrait
 
 ////////////////////////////////////////// validate data //////////////////////////////////////////
 
+
+    /**
+     * Through the validation of the data
+     * @var array
+     */
+    private $_safeData = [];
+
     /**
      * 保存所有的验证错误信息
      * @var array[]
@@ -45,26 +52,27 @@ trait ValidationTrait
     private $_hasErrorStop   = false;
 
     /**
+     * all rules
      * @var array
      */
     private $_rules   = [];
 
     /**
+     * available rules at current scene
      * @var array
      */
-    private $_validators   = [];
+    private $_availableRules  = [];
 
     /**
-     * attribute field translate list
      * @var array
      */
-    private $_attrTrans = [];
+    private $_validators   = [];
 
     /**
-     * Through the validation of the data
+     * attribute field translate list
      * @var array
      */
-    private $_safeData = [];
+    private $_attrTrans = [];
 
     /**
      * @var bool
@@ -88,7 +96,7 @@ public function rules()
                 [ 'tagId,userId', 'required', 'msg' => '{attr} is required!'],
 
                 // set scene is add -- when `$this->scene == 'add'` enable this rule.
-                [ 'tagId', 'size', 'min'=>4, 'max'=>567, 'scene' => 'add' ],
+                [ 'tagId', 'size', 'min'=>4, 'max'=>567, 'on' => 'add' ],
 
                 // use callback and custom error message
                 [ 'userId', function($value){ echo "$value ttg tg tt";}, 'msg' => '{attr} is required!'],
@@ -195,6 +203,11 @@ public function validate(array $onlyChecked = [], $hasErrorStop=false)
                     ( $validator !== 'required' && $skipOnEmpty && call_user_func($isEmpty, $data, $attr))
                 ) {
                      continue;
+
+                // mark attribute is safe. not need validate. like. 'created_at'
+                } elseif ( $validator === 'safe' ) {
+                    $this->_safeData[$attr] = $data[$attr];
+                    continue;
                 }
 
                 list($result,$validator) = $this->doValidate($data, $attr, $validator, $copy);
@@ -332,20 +345,20 @@ protected function collectRules()
                 throw new \InvalidArgumentException("validator setting error!");
             }
 
-            if ( empty($rule['scene']) ) {
+            if ( empty($rule['on']) ) {
                 $availableRules[] = $rule;
             } else {
-                $ruleScene = $rule['scene'];
+                $ruleScene = $rule['on'];
                 $ruleScene = is_string($ruleScene) ? array_filter(explode(',', $ruleScene),'trim') : (array)$ruleScene;
 
                 if ( in_array($scene,$ruleScene) ) {
-                    unset($rule['scene']);
+                    unset($rule['on']);
                     $availableRules[] = $rule;
                 }
             }
         }
 
-        return $availableRules;
+        return ($this->_availableRules = $availableRules);
     }
 
 //////////////////////////////////// error info ////////////////////////////////////