some update ...

Author: inhere

README.md

@@ -357,8 +357,7 @@ $v = Validation::make($_POST,[
     {
          return [
             ['title', 'required' ],
-            ['tagId', 'number', 'when' => function($data)
-            {
+            ['tagId', 'number', 'when' => function($data) {
                return isset($data['status']) && $data['status'] > 2;
             }],
         ];
@@ -495,6 +494,7 @@ public function isFail() // hasError() 的别名方法
 public function fail() // hasError() 的别名方法
 
 // 成功通过验证
+public function ok() 
 public function passed() 
 public function isPassed() // passed() 的别名方法
 ```
@@ -624,7 +624,8 @@ public function get(string $key, $default = null)
 `max`   | 最大边界值验证 | `['title', 'max', 40]`
 `size/range/between`  | 验证大小范围, 可以支持验证 `int`, `string`, `array` 数据类型 | `['tagId', 'size', 'min'=>4, 'max'=>567]`
 `length`    | 长度验证（ 跟 `size`差不多, 但只能验证 `string`, `array` 的长度 | `['username', 'length', 'min' => 5, 'max' => 20]`
-`in/enum`    | 枚举验证 | `['status', 'in', [1,2,3]`
+`fixedSize/fixedLength`    | 固定的长度/大小 | `['field', 'fixedSize', 12]`
+`in/enum`    | 枚举验证 | `['status', 'in', [1,2,3]]`
 `notIn`    | 枚举验证 | `['status', 'notIn', [4,5,6]]`
 `mustBe`   | 必须是等于给定值 | `['status', 'mustBe', 1]`
 `notBe`   | 不能等于给定值 | `['status', 'notBe', 0]`

examples/DataModel.php

@@ -11,6 +11,8 @@ class DataModel
 
     protected $data = [];
 
+    protected $db;
+
     /**
      * @param array $data
      * @return $this
@@ -21,4 +23,13 @@ public function setData($data)
 
         return $this;
     }
+
+    public function create()
+    {
+        if ($this->validate()->fail()) {
+            return false;
+        }
+
+        return $this->db->insert($this->getSafeData());
+    }
 }

examples/filter.php

@@ -1,7 +1,31 @@
 <?php
-/**
- * Created by PhpStorm.
- * User: inhere
- * Date: 2017-11-24
- * Time: 18:13
- */
+
+require __DIR__ . '/simple-loader.php';
+
+$data = [
+    'name' => ' tom ',
+    'status' => ' 23 ',
+    'word' => 'word',
+    'toLower' => 'WORD',
+    'title' => 'helloWorld',
+];
+
+$rules = [
+    ['name', 'string|trim'],
+    ['status', 'trim|int'],
+    ['word', 'string|trim|upper'],
+    ['toLower', 'lower'],
+    ['title', [
+        'string',
+        'snake' => ['-'],
+        'ucfirst',
+    ]],
+];
+
+echo "------------- raw data: -------------\n";
+var_dump($data);
+
+$cleaned = \Inhere\Validate\Filter\Filtration::make($data, $rules)->filtering();
+
+echo "------------- cleaned data: -------------\n";
+var_dump($cleaned);

src/Utils/ErrorMessageTrait.php

@@ -55,6 +55,7 @@ trait ErrorMessageTrait
             '{attr} must be an integer/string/array and minimum value/length is {min}',
             '{attr} must be an integer/string/array and value/length between {min} ~ {max}',
         ],
+        'fixedSize' => '{attr} length must is {value0}',
         'min' => '{attr} minimum boundary is {value0}',
         'max' => '{attr} maximum boundary is {value0}',
         'in' => '{attr} must in ({value0})',
@@ -104,7 +105,7 @@ trait ErrorMessageTrait
      * [
      *     [ field => errorMessage1 ],
      *     [ field => errorMessage2 ],
-     *     [ field2 => errorMessage3 ]
+     *     [ field2 => errorMessage3 ],
      * ]
      */
     private $_errors = [];
@@ -121,16 +122,6 @@ trait ErrorMessageTrait
      * Errors Information
      ******************************************************************************/
 
-    /**
-     * @return $this
-     */
-    public function clearErrors()
-    {
-        $this->_errors = [];
-
-        return $this;
-    }
-
     /**
      * 是否有错误
      * @return boolean
@@ -164,6 +155,14 @@ public function failed(): bool
         return $this->isFail();
     }
 
+    /**
+     * @return bool
+     */
+    public function ok(): bool
+    {
+        return !$this->isFail();
+    }
+
     /**
      * @return bool
      */
@@ -197,6 +196,16 @@ public function getErrors(): array
         return $this->_errors;
     }
 
+    /**
+     * @return $this
+     */
+    public function clearErrors()
+    {
+        $this->_errors = [];
+
+        return $this;
+    }
+
     /**
      * 得到第一个错误信息
      * @author inhere
@@ -380,18 +389,4 @@ public function getTranslate(string $attr): string
 
         return $trans[$attr] ?? Helper::beautifyFieldName($attr);
     }
-
-    /**
-     * set the attrs translation data
-     * @deprecated please use setTranslates() instead.
-     * @param array $attrTrans
-     * @return $this
-     */
-    public function setAttrTrans(array $attrTrans)
-    {
-        $this->_translates = $attrTrans;
-
-        return $this;
-    }
-
 }

src/ValidationTrait.php

@@ -88,7 +88,7 @@ public function messages()
         return [
             // validator name => message string
             // 'required' => '{attr} 是必填项。',
-            // 'required.username' => '用户名 是必填项。',
+            // 'username.required' => '用户名 是必填项。',
         ];
     }
 
@@ -178,17 +178,16 @@ public function validate(array $onlyChecked = null, $stopOnError = null)
 
             // 验证的前置条件 -- 不满足条件,跳过此条规则
             $when = $rule['when'] ?? null;
-            if ($when && $when instanceof \Closure && $when($data, $this) !== true) {
+            if ($when && ($when instanceof \Closure) && $when($data, $this) !== true) {
                 continue;
             }
 
             // clear all keywords options
             unset($rule['msg'], $rule['default'], $rule['skipOnEmpty'], $rule['isEmpty'], $rule['when'], $rule['filter']);
 
-            // 验证设置, 有一些验证器需要参数。 e.g. size()
+            // 验证器参数, 有一些验证器需要参数。 e.g. size()
             $args = $rule;
 
-            // 循环检查属性
             foreach ($fields as $field) {
                 if (!$field || ($onlyChecked && !\in_array($field, $onlyChecked, true))) {
                     continue;

src/ValidatorList.php

@@ -277,28 +277,6 @@ public static function range($val, $min = null, $max = null)
         return self::size($val, $min, $max);
     }
 
-    /**
-     * 必须是等于给定值
-     * @param  mixed $val
-     * @param  mixed $excepted
-     * @return bool
-     */
-    public static function mustBe($val, $excepted)
-    {
-        return $val === $excepted;
-    }
-
-    /**
-     * 不能等于给定值
-     * @param  mixed $val
-     * @param  mixed $excepted
-     * @return bool
-     */
-    public static function notBe($val, $excepted)
-    {
-        return $val !== $excepted;
-    }
-
     /**
      * 最小值检查
      * @param  int|string|array $val
@@ -337,6 +315,37 @@ public static function length($val, $minLength = 0, $maxLength = null)
         return self::size($val, $minLength, $maxLength);
     }
 
+    /**
+     * 固定的长度
+     * @param mixed $val
+     * @param int $size
+     * @return bool
+     */
+    public static function fixedLength($val, $size)
+    {
+        return self::fixedSize($val, $size);
+    }
+
+    /**
+     * @param mixed $val
+     * @param int $size
+     * @return bool
+     */
+    public static function fixedSize($val, $size)
+    {
+        if (!\is_int($val)) {
+            if (\is_string($val)) {
+                $val = Helper::strlen(trim($val));
+            } elseif (\is_array($val)) {
+                $val = \count($val);
+            } else {
+                return false;
+            }
+        }
+
+        return $val === (int)$size;
+    }
+
     /*******************************************************************************
      * custom validators
      ******************************************************************************/
@@ -650,13 +659,25 @@ public static function notIn($val, $dict)
     }
 
     /**
-     * @param mixed $val
-     * @param mixed $compareVal
+     * 必须是等于给定值
+     * @param  mixed $val
+     * @param  mixed $excepted
      * @return bool
      */
-    public static function compare($val, $compareVal)
+    public static function mustBe($val, $excepted)
     {
-        return $val === $compareVal;
+        return $val === $excepted;
+    }
+
+    /**
+     * 不能等于给定值
+     * @param  mixed $val
+     * @param  mixed $excepted
+     * @return bool
+     */
+    public static function notBe($val, $excepted)
+    {
+        return $val !== $excepted;
     }
 
     /*******************************************************************************