merge master code to branch php5

Author: inhere

README.md

@@ -0,0 +1 @@
+# methods API

api.md

@@ -2,7 +2,7 @@
   "name": "inhere/php-validate",
   "type": "library",
   "description": "a simple validate library of the php",
-  "keywords": ["library","validate"],
+  "keywords": ["library", "validate"],
   "homepage": "http://github.com/inhere/php-validate",
   "license": "MIT",
   "authors": [
@@ -17,7 +17,7 @@
   },
   "autoload": {
     "psr-4": {
-      "inhere\\validate\\" : "src/"
+      "Inhere\\Validate\\" : "src/"
     }
   },
   "suggest": {

composer.json

@@ -7,7 +7,7 @@
  */
 class DataModel
 {
-    use \inhere\validate\ValidationTrait;
+    use \Inhere\Validate\ValidationTrait;
 
     protected $data = [];
 

examples/DataModel.php

@@ -9,7 +9,7 @@
 /**
  * Class PageRequest
  */
-class PageRequest extends \inhere\validate\Validation
+class PageRequest extends \Inhere\Validate\Validation
 {
     public function rules()
     {
@@ -26,7 +26,7 @@ public function rules()
         ];
     }
 
-    public function attrTrans()
+    public function translates()
     {
         return [
             'userId' => '用户Id',

examples/PageRequest.php

@@ -0,0 +1,38 @@
+<?php
+
+require __DIR__ . '/simple-loader.php';
+
+$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 = [
+    ['userId', 'required|int'],
+    ['tagId', 'size:0,50'],
+];
+
+echo "\n----------------------------\n use FieldValidation\n----------------------------\n\n";
+
+$v = \Inhere\Validate\FieldValidation::make($data, $rules)
+    ->setTranslates([
+        'goods.pear' => '梨子'
+    ])
+    ->setMessages([
+        'freeTime.required' => 'freeTime is required!!!!'
+    ])
+   ->validate([], false);
+
+print_r($v->getErrors());

examples/field.php

@@ -0,0 +1,7 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: inhere
+ * Date: 2017-11-24
+ * Time: 18:13
+ */

examples/filter.php

@@ -1,18 +1,6 @@
 <?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;
-    }
-});
+require __DIR__ . '/simple-loader.php';
 
 $data = [
     // 'userId' => 234,
@@ -23,7 +11,7 @@
     'name' => 'Ajohn',
     'existsField' => 'test',
     'passwd' => 'password',
-    'repasswd' => 'repassword',
+    'repasswd' => 'password',
     'insertTime' => '1456767657',
     'goods' => [
         'apple' => 34,
@@ -32,7 +20,7 @@
 ];
 
 $rules = [
-    ['tagId,userId,freeTime', 'required', 'msg' => '{attr} is required!'],// set message
+    ['tagId,userId,freeTime', '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.
@@ -75,17 +63,23 @@
 //$model = new DataModel($_POST,$rules);
 $model = new DataModel;
 $model->setData($data)->setRules($rules);
+$model->setMessages([
+    'freeTime.required' => 'freeTime is required!!!!'
+]);
 $model->validate();
 
 print_r($model->getErrors());
 
 echo "\n----------------------------\n use Validation\n----------------------------\n\n";
 
-$valid = \inhere\validate\Validation::make($data, $rules)
-        ->setAttrTrans([
+$v = \Inhere\Validate\Validation::make($data, $rules)
+        ->setTranslates([
             'goods.pear' => '梨子'
         ])
+        ->setMessages([
+            'freeTime.required' => 'freeTime is required!!!!'
+        ])
        ->validate([], false);
 
-print_r($valid->getErrors());
+print_r($v->getErrors());
 

examples/index.php

@@ -0,0 +1,20 @@
+<?php
+
+error_reporting(E_ALL);
+date_default_timezone_set("Asia/Shanghai");
+
+spl_autoload_register(function($class)
+{
+    $prefix = 'Inhere\\Validate\\';
+
+    // e.g. "Inhere\Validate\ValidationTrait"
+    if (strpos($class, $prefix) !== false) {
+        $file = dirname(__DIR__) . '/src/' . str_replace('\\', '/', substr($class, strlen($prefix))). '.php';
+    } else {
+        $file = __DIR__ . '/' . $class. '.php';
+    }
+
+    if (is_file($file)) {
+        include $file;
+    }
+});

examples/simple-loader.php

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<phpunit backupGlobals="false"
+         backupStaticAttributes="false"
+         bootstrap="./tests/boot.php"
+         colors="false"
+         convertErrorsToExceptions="true"
+         convertNoticesToExceptions="true"
+         convertWarningsToExceptions="true"
+         stopOnFailure="false"
+         syntaxCheck="false"
+>
+    <testsuites>
+        <testsuite name="Php Validate-Filter Test Suite">
+            <directory>./tests/</directory>
+        </testsuite>
+    </testsuites>
+
+    <filter>
+        <whitelist>
+            <directory suffix=".php">./examples</directory>
+        </whitelist>
+    </filter>
+</phpunit>

phpunit.xml.dist

@@ -0,0 +1,66 @@
+<?php
+
+/**
+ * Created by PhpStorm.
+ * User: inhere
+ * Date: 2017-11-07
+ * Time: 10:04
+ */
+
+namespace Inhere\Validate;
+
+/**
+ * Class AbstractValidation
+ * - one field to many rules. like Laravel framework
+ * ```php
+ * [
+ *  ['field1', 'rule1, rule2, ...', ...],
+ *  ['field2', 'rule1, rule3, ...', ...],
+ * ]
+ * ```
+ * @package Inhere\Validate
+ */
+abstract class AbstractValidation implements ValidationInterface
+{
+    use ValidationTrait {
+        //set as traitSet;
+        get as traitGet;
+    }
+    /**
+     * @var array
+     */
+    protected $data = [];
+
+    /**
+     * @param array $data
+     * @param array $rules
+     * @param array $translates
+     * @param string $scene
+     * @param bool $startValidate 立即开始验证
+     * @throws \InvalidArgumentException
+     * @throws \RuntimeException
+     */
+    public function __construct(array $data = [], array $rules = [], array $translates = [], $scene = '', $startValidate = false)
+    {
+        $this->data = $data;
+        $this->setRules($rules)->setScene($scene)->setTranslates($translates);
+        if ($startValidate) {
+            $this->validate();
+        }
+    }
+
+    /**
+     * @param array $data
+     * @param array $rules
+     * @param array $translates
+     * @param string $scene
+     * @param bool $startValidate 立即开始验证
+     * @return static
+     * @throws \InvalidArgumentException
+     * @throws \RuntimeException
+     */
+    public static function make(array $data, array $rules = [], array $translates = [], $scene = '', $startValidate = false)
+    {
+        return new static($data, $rules, $translates, $scene, $startValidate);
+    }
+}

src/AbstractValidation.php

@@ -0,0 +1,113 @@
+<?php
+
+/**
+ * Created by PhpStorm.
+ * User: inhere
+ * Date: 2017-11-07
+ * Time: 10:04
+ */
+
+namespace Inhere\Validate;
+
+/**
+ * Class FieldValidation
+ * - one field to many rules. like Laravel framework
+ * ```php
+ * $vd = FieldValidation::make($data, $rules, ...);
+ * $vd->validate();
+ * ```
+ * @package Inhere\Validate
+ */
+class FieldValidation extends AbstractValidation
+{
+    /**
+     * @return array
+     */
+    public function rules()
+    {
+        return [];
+    }
+
+    /**
+     * @return \Generator
+     * @throws \InvalidArgumentException
+     */
+    protected function collectRules()
+    {
+        $scene = $this->scene;
+        // 循环规则, 搜集当前场景可用的规则
+        foreach ($this->getRules() as $rule) {
+            // check field
+            if (!isset($rule[0]) || !$rule[0]) {
+                throw new \InvalidArgumentException('Please setting the field(string) to wait validate! position: rule[0].');
+            }
+            // check validators
+            if (!isset($rule[1]) || !$rule[1]) {
+                throw new \InvalidArgumentException('The field validators must be is a validator name(s) string! position: rule[1].');
+            }
+            // an rule for special scene.
+            if (!empty($rule['on'])) {
+                $sceneList = \is_string($rule['on']) ? array_map('trim', explode(',', $rule['on'])) : (array)$rule['on'];
+                if ($scene && !\in_array($scene, $sceneList, true)) {
+                    continue;
+                }
+                unset($rule['on']);
+                $this->_usedRules[] = $rule;
+            }
+            $field = array_shift($rule);
+            if (\is_object($rule[0])) {
+                (yield $field => $rule);
+            } else {
+                // 'required|string:5,10;' OR 'required|in:5,10'
+                $rules = \is_array($rule[0]) ? $rule[0] : array_map('trim', explode('|', $rule[0]));
+                foreach ($rules as $aRule) {
+                    $rule = $this->parseRule($aRule, $rule);
+                    (yield $field => $rule);
+                }
+            }
+        }
+
+        yield [];
+    }
+
+    /**
+     * @param string $rule
+     * @param array $row
+     * @return array
+     */
+    protected function parseRule($rule, $row)
+    {
+        $rule = trim($rule, ': ');
+        if (false === strpos($rule, ':')) {
+            $row[0] = $rule;
+
+            return $row;
+        }
+        list($name, $args) = explode(':', $rule, 2);
+        $args = trim($args, ', ');
+        $row[0] = $name;
+        switch ($name) {
+            case 'in':
+            case 'enum':
+            case 'ontIn':
+                $row[] = array_map('trim', explode(',', $args));
+                break;
+            case 'size':
+            case 'range':
+            case 'string':
+            case 'between':
+                if (strpos($args, ',')) {
+                    list($row['min'], $row['max']) = array_map('trim', explode(',', $args, 2));
+                } else {
+                    $row['min'] = $args;
+                }
+                break;
+            default:
+                $args = strpos($args, ',') ? array_map('trim', explode(',', $args)) : [$args];
+                $row = array_merge($row, $args);
+                break;
+        }
+
+        return $row;
+    }
+}