update logic. bug fixed

Author: inhere

.gitignore

@@ -0,0 +1,17 @@
+# Created by .ignore support plugin (hsz.mobi)
+### Example user template template
+### Example user template
+
+# IntelliJ project files
+.idea/
+
+### OSX template
+*.DS_Store
+
+# Icon must end with two \r
+Icon
+
+# Thumbnails
+._*
+
+

document.md

@@ -1,4 +1,4 @@
-## simple validator
+## a simple php data validator
 
 ### Install
 
@@ -156,11 +156,12 @@ $valid = Validation::make($_POST,[
             ['title', 'required' ],
             ['userId', 'number', 'scene' => 'scene1' ],
             ['userId', 'int',    'scene' => 'scene2' ],
+            ['name', 'string',    'scene' => 'scene1,scene2' ],
         ];
     }
 ```
 
-> 在下面设置了场景时，将只会使用上面的第 1,3 条规则. (第 1 条没有限制规则使用场景的，在所有场景都可用)
+> 在下面设置了场景时，将会使用上面的第 1,3,4 条规则. (第 1 条没有限制规则使用场景的，在所有场景都可用)
 
 ```php
 
@@ -196,6 +197,40 @@ $valid = Validation::make($_POST,[
     }
 ```
 
+- skipOnEmpty -- 为空是否跳过验证
+
+为空是否跳过验证,默认值是 `true`. (reference yii2)
+
+> 'required' 规则不在此限制内.
+
+如,有一条规则:
+
+```
+['name', 'string'],
+```
+
+提交的数据中 没有'name'字段或者 `$data['name']` 等于空都不会进行 `string` 验证;只有当`$data['name']`有值时才会验证是否是string
+
+
+如果要想为空时也检查, 请将此字段同时加入 'required' 规则中.
+也可以设置 `'skipOnEmpty' => false`:
+
+```
+['name', 'string', 'skipOnEmpty' => false ]
+```
+
+- isEmpty -- 是否为空判断
+
+是否为空判断, 这个判断作为 `skipOnEmpty` 的依据.
+默认使用 `empty($data['attr'])` 来判断.
+
+你也可以自定义判断规则
+
+```
+['name', 'string', 'isEmpty' => function($data, $attr) {
+    return true or false;
+ }]
+```
 
 ### Existing validators 
 
@@ -212,9 +247,9 @@ validator | description | rule example
 `required`  | validate required | `['tagId,userId', 'required' ]`
 `length`    | validate length | ....
 `size`  | validate size | `['tagId', 'size', 'min'=>4, 'max'=>567]`
-`min`   | validate min | `['title', 'min', 'value' => 40],`
+`min`   | validate min | `['title', 'min', 'value' => 40],]`
 `max`   | validate max | ....
-`in`    | validate in | ....
+`in`    | validate in | `['id', 'in', 'value' => [1,2,3],]`
 `string`    | validate string | ....
 `isArray`   | validate is Array | ....
 `callback`  | validate by custom callback | ....

example/DataModel.php

@@ -10,5 +10,19 @@ class DataModel
 
     use \inhere\validate\ValidationTrait;
 
+    protected $data = [];
+
+
+    /**
+     * @param array $data
+     * @return $this
+     */
+    public function setData($data)
+    {
+        $this->data = $data;
+
+        return $this;
+    }
+
 
 }

example/index.php

@@ -2,7 +2,12 @@
 
 spl_autoload_register(function($class)
 {
-    $file = __DIR__ . '/' . $class. '.php';
+    // 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;
@@ -14,30 +19,55 @@
     'tagId' => '234535',
     // 'freeTime' => 'sdfdffffffffff',
     'distanceRequire' => 'sdfdffffffffff',
-    'note' => 'sdfdffffffffff',
-    'insertTime' => '',
-    'lastReadTime' => 'sdfdffffffffff',
+    'note' => '',
+    'insertTime' => '1456767657',
+    'lastReadTime' => '1456767657',
 ];
 
 $rules = [
-    ['tagId,userId,freeTime', 'required', 'msg' => '{field} is required!'],
-    ['note', 'email'],
-    ['tagId', 'size', 'min'=>4, 'max'=>567, 'msg' => '{field} must is big!'], // 4<= tagId <=567
-    ['freeTime', 'size', 'min'=>4, 'max'=>567, 'msg' => '{field} must is big!'], // 4<= tagId <=567
-    ['userId', function($value){ echo $value."\n"; return false;}, 'msg' => '{field} check filare!'],
+    ['tagId,userId,freeTime', 'required', 'msg' => '{attr} is required!'],// set message
+    ['note', 'email', 'skipOnEmpty' => false], // set skipOnEmpty is false.
+    ['insertTime', 'email', 'scene' => 'otherScene' ],// set scene. will is not validate it on default.
+    ['tagId', 'size', 'min'=>4, 'max'=>567], // 4<= tagId <=567
+    ['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\n";
+
+        var_dump($value, $data);
+
+        echo __LINE__ . "\n";
+
+        return false;
+    }, 'msg' => 'userId check failure!'],
 ];
 
-/*
-$model = new TestModel();
-$ret = $model->load($_POST)->validate();
-*/
-$model = new DataModel($_POST,$rules);
-$ret = $model->validate([], true);
-
-// echo "<pre>";
-var_dump($ret,
-$model->firstError()
+echo "use ValidationTrait\n";
+
+//$model = new DataModel($_POST,$rules);
+$model = new DataModel;
+$model->setData($data)->setRules($rules);
+$model->validate();
+
+var_dump(
+    $model->all(),
+    $model->getErrors()
 );
 
+/*
+echo "--------------\n";
+echo "use Validation\n";
+
+$valid = \inhere\validate\Validation::make($data, $rules)->validate();
 
-// echo "</pre>";
+var_dump(
+    $valid->all(),
+    $valid->getErrors()
+);
+*/

src/StrHelper.php

@@ -326,61 +326,14 @@ static public function toCamelCase($str, $upper_case_first_char = false)
      * Transform a CamelCase string to underscore_case string
      *
      * @param string $string
+     * @param string $sep
      * @return string
      */
-    static public function toUnderscoreCase($string)
+    static public function toUnderscoreCase($string, $sep='_')
     {
         // 'CMSCategories' => 'cms_categories'
         // 'RangePrice' => 'range_price'
-        return self::strtolower(trim(preg_replace('/([A-Z][a-z])/', '_$1', $string), '_'));
+        return self::strtolower(trim(preg_replace('/([A-Z][a-z])/', $sep . '$1', $string), $sep));
     }
 
-    /**
-     * Convert a shorthand byte value from a PHP configuration directive to an integer value
-     * @param string $value value to convert
-     * @return int
-     */
-    static public function convertBytes($value)
-    {
-        if (is_numeric($value))
-            return $value;
-        else {
-            $value_length = strlen($value);
-            $qty = (int)substr($value, 0, $value_length - 1 );
-            $unit = self::strtolower(substr($value, $value_length - 1));
-            switch ($unit)
-            {
-                case 'k':
-                    $qty *= 1024;
-                    break;
-                case 'm':
-                    $qty *= 1048576;
-                    break;
-                case 'g':
-                    $qty *= 1073741824;
-                    break;
-            }
-            return $qty;
-        }
-    }
-
-    /**
-     * Format a number into a human readable format
-     * e.g. 24962496 => 23.81M
-     * @param     $size
-     * @param int $precision
-     * @return string
-     */
-    static public function formatBytes($size, $precision = 2)
-    {
-        if (!$size) {
-            return '0';
-        }
-
-        $base     = log($size) / log(1024);
-        $suffixes = array('', 'k', 'M', 'G', 'T');
-        $floorBase = floor($base);
-
-        return round(pow(1024, $base - $floorBase), $precision).$suffixes[(int)$floorBase];
-    }
 }