add strict_types on file head

Author: inhere

.php_cs

@@ -0,0 +1,33 @@
+<?php
+
+$header = <<<'EOF'
+
+@license  https://github.com/inhere/php-validate/blob/master/LICENSE
+EOF;
+
+return PhpCsFixer\Config::create()
+    ->setRiskyAllowed(true)
+    ->setRules([
+        '@PSR2' => true,
+        // 'header_comment' => [
+        //     'comment_type' => 'PHPDoc',
+        //      'header'    => $header,
+        //     'separate'  => 'none'
+        // ],
+        'array_syntax' => [
+            'syntax' => 'short'
+        ],
+        'single_quote' => true,
+        'class_attributes_separation' => true,
+        'no_unused_imports' => true,
+        'standardize_not_equals' => true,
+        'declare_strict_types' => true,
+    ])
+    ->setFinder(
+        PhpCsFixer\Finder::create()
+            ->exclude('test')
+            ->exclude('docs')
+            ->exclude('vendor')
+            ->in(__DIR__)
+    )
+    ->setUsingCache(false);

.travis.yml

@@ -1,22 +1,30 @@
 language: php
 
 php:
-    - '7.1'
-    - '7.2'
-    - '7.3'
+  - '7.1'
+  - '7.2'
+  - '7.3'
+  - '7.4'
 
 #matrix:
 #  include:
 #    - php: 7.2
 #      env: ANALYSIS='true'
 
+install:
+  - |
+    wget -O bin/php-cs-fixer "https://cs.symfony.com/download/php-cs-fixer-v2.phar"
+    chmod +x bin/php-cs-fixer
+
 before_script:
-    - php -m
-    - composer require php-coveralls/php-coveralls:^2.1.0
+  - php -m
+  - composer require php-coveralls/php-coveralls:^2.1.0
 
 script:
-    # - phpunit --coverage-clover clover.xml
-    - php vendor/bin/phpunit --coverage-clover clover.xml
+  # check code style
+  # - composer check-cs
+  # - phpunit --coverage-clover clover.xml
+  - php vendor/bin/phpunit --coverage-clover clover.xml
 
 after_success:
-    - vendor/bin/php-coveralls --coverage_clover=clover.xml --json_path=coveralls-upload.json -v
+  - vendor/bin/php-coveralls --coverage_clover=clover.xml --json_path=coveralls-upload.json -v

composer.json

@@ -1,37 +1,41 @@
 {
-    "name": "inhere/php-validate",
-    "type": "library",
-    "description": "an simple validate, filter library of the php",
-    "keywords": [
-        "php-library",
-        "library",
-        "validate",
-        "form-validate",
-        "validation"
-    ],
-    "homepage": "https://github.com/inhere/php-validate",
-    "license": "MIT",
-    "authors": [
-        {
-            "name": "inhere",
-            "email": "in.798@qq.com",
-            "homepage": "http://www.yzone.net/"
-        }
-    ],
-    "require": {
-        "php": ">7.1.0"
-    },
-    "require-dev": {
-        "phpunit/phpunit": "^7.5"
-    },
-    "autoload": {
-        "psr-4": {
-            "Inhere\\Validate\\": "src/"
-        }
-    },
-    "autoload-dev": {
-        "psr-4": {
-            "Inhere\\ValidateTest\\": "test/"
-        }
+  "name": "inhere/php-validate",
+  "type": "library",
+  "description": "an simple validate, filter library of the php",
+  "keywords": [
+    "php-library",
+    "library",
+    "validate",
+    "form-validate",
+    "validation"
+  ],
+  "homepage": "https://github.com/inhere/php-validate",
+  "license": "MIT",
+  "authors": [
+    {
+      "name": "inhere",
+      "email": "in.798@qq.com",
+      "homepage": "http://www.yzone.net/"
     }
+  ],
+  "require": {
+    "php": ">7.1.0"
+  },
+  "require-dev": {
+    "phpunit/phpunit": "^7.5"
+  },
+  "autoload": {
+    "psr-4": {
+      "Inhere\\Validate\\": "src/"
+    }
+  },
+  "autoload-dev": {
+    "psr-4": {
+      "Inhere\\ValidateTest\\": "test/"
+    }
+  },
+  "scripts": {
+    "check-cs": "./bin/php-cs-fixer fix --dry-run --diff --diff-format=udiff",
+    "cs-fix": "./bin/php-cs-fixer fix"
+  }
 }

docs/Valid.php

@@ -2,55 +2,74 @@
 
 namespace Inhere\Validate;
 
+use function array_merge;
+
 /**
  * Class Valid - Simple Data Validator
+ *
  * @package Inhere\Validate
  */
 class Valid
 {
     /**
      * @var array
      */
-    protected $data = [];
+    protected static $data = [];
 
     /**
      * @param array $data
-     *
-     * @return Valid
      */
-    public static function create(array $data): self
+    public static function load(array $data): void
     {
-        return new static($data);
+        self::$data = $data;
     }
 
     /**
-     * Validator constructor.
-     *
      * @param array $data
      */
-    public function __construct(array $data)
-    {
-        $this->data = $data;
-    }
-
-    public function getInt(string $field, $min = null, $max = null, $default = 0): int
+    public static function append(array $data): void
     {
-        return 0;
+        self::$data = array_merge(self::$data, $data);
     }
 
     /**
      * @return array
      */
     public function getData(): array
     {
-        return $this->data;
+        return self::$data;
     }
 
+    /**********************************************************************************************
+     * =========== validate data field value and return
+     *********************************************************************************************/
+
     /**
-     * @param array $data
+     * @param string $field
+     * @param null|int   $min
+     * @param null|int   $max
+     * @param null|int    $default
+     *
+     * @return int
      */
-    public function setData(array $data): void
+    public static function getInt(string $field, int $min = null, int $max = null, int $default = null): int
+    {
+        return 0;
+    }
+
+    public static function getInts(string $field, int $min = null, int $max = null, int $default = 0): int
+    {
+        return 0;
+    }
+
+    public static function getString(string $field, int $minLen = null, int $maxLen = null, string $default = null): int
     {
-        $this->data = $data;
+        return 0;
+    }
+
+    public static function getStrings(string $field, int $min = null, int $max = null, array $default = null): int
+    {
+        return 0;
     }
+
 }

src/AbstractValidation.php

@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 /**
  * Created by PhpStorm.
  * User: inhere

src/ArrayValueNotExists.php

@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace Inhere\Validate;
 

src/FV.php

@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace Inhere\Validate;
 
@@ -8,5 +8,4 @@
  */
 final class FV extends FieldValidation
 {
-
 }

src/FieldValidation.php

@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 /**
  * Created by PhpStorm.
  * User: inhere

src/Filter/FilteringTrait.php

@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 /**
  * Created by PhpStorm.
  * User: Inhere
@@ -63,14 +63,14 @@ protected function valueFiltering($value, $filters)
                 $args  = (array)$filter;
                 $value = $this->callStringCallback($key, $value, ...$args);
 
-                // closure
+            // closure
             } elseif (is_object($filter) && method_exists($filter, '__invoke')) {
                 $value = $filter($value);
-                // string, trim, ....
+            // string, trim, ....
             } elseif (is_string($filter)) {
                 $value = $this->callStringCallback($filter, $value);
 
-                // e.g ['Class', 'method'],
+            // e.g ['Class', 'method'],
             } else {
                 $value = Helper::call($filter, $value);
             }
@@ -94,21 +94,21 @@ protected function callStringCallback(string $filter, ...$args)
         // if $filter is a custom by addFiler()
         if ($callback = $this->getFilter($filter)) {
             $value = $callback(...$args);
-            // if $filter is a custom method of the subclass.
+        // if $filter is a custom method of the subclass.
         } elseif (method_exists($this, $filter . 'Filter')) {
             $filter .= 'Filter';
             $value  = $this->$filter(...$args);
 
-            // if $filter is a custom add callback in the property {@see $_filters}.
+        // if $filter is a custom add callback in the property {@see $_filters}.
         } elseif ($callback = UserFilters::get($filter)) {
             $value = $callback(...$args);
 
-            // if $filter is a custom add callback in the property {@see $_filters}.
+        // if $filter is a custom add callback in the property {@see $_filters}.
             // $filter is a method of the class 'FilterList'
         } elseif (method_exists(Filters::class, $filterName)) {
             $value = Filters::$filterName(...$args);
 
-            // it is function name
+        // it is function name
         } elseif (function_exists($filter)) {
             $value = $filter(...$args);
         } else {

src/Filter/Filters.php

@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 /**
  * @date 2015.08.05 sanitize
  * 过滤器(strainer/filter): 过滤数据，去除不合要求的数据，返回过滤后的数据(始终返回字符串, 全部不符合返回空字符串)