add more unit for filter

Author: inhere

README.md

@@ -739,13 +739,10 @@ public function addValidator(string $name, \Closure $callback, string $msg = '')
 ```
 // 验证失败
 public function isFail()
-public function fail() // isFail() 的别名方法
-public function failed() // isFail() 的别名方法
 public function hasError() // isFail() 的别名方法
 
 // 成功通过验证
-public function ok() 
-public function isOk() 
+public function isOk()
 public function isPassed()
 ```
 

src/Filter/FilteringTrait.php

@@ -11,6 +11,7 @@
 use Inhere\Validate\Helper;
 use InvalidArgumentException;
 use function function_exists;
+use function is_array;
 use function is_object;
 use function is_string;
 use function method_exists;
@@ -51,6 +52,11 @@ protected function valueFiltering($value, $filters)
     {
         $filters = is_string($filters) ? Filters::explode($filters, '|') : $filters;
 
+        // fix: must ensure is array
+        if (!is_array($filters)) {
+            $filters = [$filters];
+        }
+
         foreach ($filters as $key => $filter) {
             // key is a filter. ['myFilter' => ['arg1', 'arg2']]
             if (is_string($key)) {

src/Filter/Filtration.php

@@ -79,12 +79,12 @@ public function filtering(array $rules = []): array
     }
 
     /**
-     * 对数据应用给的一系列过滤规则
+     * Apply a series of filtering rules to the input data
      *
      * @param array $rules
      * @param array $data
      *
-     * @return array 返回过滤后的数据
+     * @return array Return filtered data
      * @throws InvalidArgumentException
      */
     public function applyRules(array $rules = [], array $data = []): array
@@ -106,8 +106,8 @@ public function applyRules(array $rules = [], array $data = []): array
             $fields = is_string($fields) ? Filters::explode($fields) : (array)$fields;
 
             foreach ($fields as $field) {
-                if (!isset($data[$field])) {
-                    $filtered[$field] = $rule['default'] ?? null;
+                if (!isset($data[$field]) && isset($rule['default'])) {
+                    $filtered[$field] = $rule['default'];
                 } else {
                     $filtered[$field] = $this->valueFiltering($data[$field], $rule[1]);
                 }
@@ -118,7 +118,7 @@ public function applyRules(array $rules = [], array $data = []): array
     }
 
     /**
-     * value sanitize 直接对给的值进行过滤
+     * value sanitize Filter the value directly
      *
      * @param mixed        $value
      * @param string|array $filters

src/ValidationTrait.php

@@ -281,7 +281,7 @@ protected function applyRule($fields, array $rule, array $onlyChecked): void
                 $this->data[$field] = $value;
             }
 
-            // Field value validate
+            // Field name validate
             if (is_string($validator)) {
                 if ($validator === 'safe') {
                     $this->setSafe($field, $value);

test/Filter/FiltrationTest.php

@@ -9,7 +9,9 @@
 namespace Inhere\ValidateTest\Filter;
 
 use Inhere\Validate\Filter\Filtration;
+use InvalidArgumentException;
 use PHPUnit\Framework\TestCase;
+use function trim;
 
 /**
  * Class FiltrationTest
@@ -48,21 +50,28 @@ public function testUserFilters(): void
         $fl->addFilters([
             'name1' => function () {
             },
-            'name2' => function () {
+            'newTrim' => function ($val) {
+                return trim($val);
             },
             ''      => function () {
             },
         ]);
 
         $this->assertCount(2, $fl->getFilters());
 
-        $this->assertNotEmpty($fl->getFilter('name2'));
+        $this->assertNotEmpty($fl->getFilter('newTrim'));
         $this->assertEmpty($fl->getFilter('name3'));
 
         $fl->addFilter('new1', function () {
         });
         $this->assertNotEmpty($fl->getFilter('new1'));
 
+        // use user filter
+        $filtered = $fl->filtering([
+           ['name', 'newTrim']
+        ]);
+        $this->assertSame('tom', $filtered['name']);
+
         $fl->delFilter('name1');
         $this->assertEmpty($fl->getFilter('name1'));
 
@@ -72,7 +81,6 @@ public function testUserFilters(): void
 
     public function testFiltering(): void
     {
-
         $rules = [
             ['name', 'string|trim'],
             ['status', 'trim|int'],
@@ -104,4 +112,29 @@ public function testFiltering(): void
         $this->assertEmpty($fl->getData());
         $this->assertEmpty($fl->getRules());
     }
+
+    public function testUseClosure(): void
+    {
+        $fl = Filtration::make($this->data);
+        $fl->setRules([
+            ['name', function($val) {
+                $this->assertSame(' tom ', $val);
+                return trim($val);
+            }]
+        ]);
+
+        $cleaned = $fl->filtering();
+        $this->assertSame('tom', $cleaned['name']);
+    }
+
+    public function testCallNotExist(): void
+    {
+        $fl = Filtration::make($this->data);
+        $fl->setRules([
+            ['name', 'not-exist-filter']
+        ]);
+
+        $this->expectException(InvalidArgumentException::class);
+        $fl->filtering();
+    }
 }

test/RuleValidationTest.php

@@ -604,4 +604,42 @@ public function testValidatorAlias(): void
         $this->assertEquals('arr val must be an array of nature', $v->firstError());
         $this->assertEquals('list val must be an array', $v->lastError());
     }
+
+    public function testIssue13(): void
+    {
+        $rule = [
+            ['goods_id', 'list', 'msg' => '商品id数组为空或不合法'],
+            ['goods_id.*', 'each', 'integer', 'msg' => '商品分类id必须是一串数字']
+        ];
+
+        $v = Validation::check([
+            'goods_id' => [
+                1144181460261978556, 114418146, 1144
+            ]
+        ], $rule);
+
+        $this->assertTrue($v->isOk());
+        $this->assertFalse($v->isFail());
+
+        // not array
+        $v = Validation::check([
+            'goods_id' => 'string'
+        ], $rule);
+        $this->assertFalse($v->isOk());
+        $this->assertSame('商品id数组为空或不合法', $v->firstError());
+
+        // not list
+        $v = Validation::check([
+            'goods_id' => ['k' => 'v']
+        ], $rule);
+        $this->assertFalse($v->isOk());
+        $this->assertSame('商品id数组为空或不合法', $v->firstError());
+
+        // value not int
+        $v = Validation::check([
+            'goods_id' => ['v']
+        ], $rule);
+        $this->assertFalse($v->isOk());
+        $this->assertSame('商品分类id必须是一串数字', $v->firstError());
+    }
 }