update some logic

Author: inhere

src/Filter/Filters.php

@@ -14,6 +14,8 @@
  */
 final class Filters
 {
+    // TODO manage aliases
+
     /**
      * don't allow create instance.
      */

src/Filter/Filtration.php

@@ -153,7 +153,7 @@ public function reset(bool $clearFilters = false): self
         $this->_data = $this->_rules = [];
 
         if ($clearFilters) {
-            self::clearCustomFilters();
+            $this->clearFilters();
         }
 
         return $this;

src/Filter/UserFilters.php

@@ -14,9 +14,24 @@
  */
 final class UserFilters
 {
-    /** @var array user custom filters */
+    /**
+     * @var array user custom filters
+     */
     private static $filters = [];
 
+    /**
+     * @param string $name
+     * @return null|callable
+     */
+    public static function get(string $name)
+    {
+        if (isset(self::$filters[$name])) {
+            return self::$filters[$name];
+        }
+
+        return null;
+    }
+
     /**
      * @param string   $name
      * @param callable $filter

src/Utils/DataFilteringTrait.php

@@ -9,6 +9,7 @@
 namespace Inhere\Validate\Utils;
 
 use Inhere\Validate\Filter\Filters;
+use Inhere\Validate\Filter\UserFilters;
 
 /**
  * Trait DataFilteringTrait
@@ -17,7 +18,7 @@
 trait DataFilteringTrait
 {
     /** @var array user custom filters */
-    private static $customFilters = [];
+    private $_filters = [];
 
     /** @var array filter aliases map */
     private static $filterAliases = [
@@ -95,19 +96,22 @@ protected function callStringCallback(string $filter, ...$args)
         // if is alias name
         $filterName = isset(self::$filterAliases[$filter]) ? self::$filterAliases[$filter] : $filter;
 
-        // if $filter is a custom add callback in the property {@see $_filters}.
-        if (isset(self::$customFilters[$filterName])) {
-            $callback = self::$customFilters[$filterName];
+        // if $filter is a custom by addFiler()
+        if ($callback = $this->getFilter($filter)) {
             $value    = $callback(...$args);
-
             // 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}.
+        } elseif ($callback = UserFilters::get($filter)) {
+            $value = $callback(...$args);
+
+            // 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, $filter)) {
-            $value = Filters::$filter(...$args);
+        } elseif (\method_exists(Filters::class, $filterName)) {
+            $value = Filters::$filterName(...$args);
 
             // it is function name
         } elseif (\function_exists($filter)) {
@@ -123,34 +127,49 @@ protected function callStringCallback(string $filter, ...$args)
      * custom filters
      ******************************************************************************/
 
+    /**
+     * @param string $name
+     * @return callable|null
+     */
+    public function getFilter(string $name)
+    {
+        if (isset($this->_filters[$name])) {
+            return $this->_filters[$name];
+        }
+
+        return null;
+    }
+
     /**
      * @param string   $name
      * @param callable $filter
      * @return $this
      */
-    public function addCustomFilter(string $name, callable $filter): self
+    public function addFilter(string $name, callable $filter): self
     {
-        self::$customFilters[$name] = $filter;
+        $this->_filters[$name] = $filter;
         return $this;
     }
 
     /**
      * @param string   $name
      * @param callable $filter
+     * @return DataFilteringTrait
      */
-    public static function setCustomFilter(string $name, callable $filter)
+    public function setFilter(string $name, callable $filter)
     {
-        self::$customFilters[$name] = $filter;
+        $this->_filters[$name] = $filter;
+        return $this;
     }
 
     /**
      * @param string $name
      * @return $this
      */
-    public function delCustomFilter(string $name): self
+    public function delFilter(string $name): self
     {
-        if (isset(self::$customFilters[$name])) {
-            unset(self::$customFilters[$name]);
+        if (isset($this->_filters[$name])) {
+            unset($this->_filters[$name]);
         }
 
         return $this;
@@ -159,24 +178,24 @@ public function delCustomFilter(string $name): self
     /**
      * clear Filters
      */
-    public static function clearCustomFilters()
+    public function clearFilters()
     {
-        self::$customFilters = [];
+        $this->_filters = [];
     }
 
     /**
      * @return array
      */
-    public static function getCustomFilters(): array
+    public function getFilters(): array
     {
-        return self::$customFilters;
+        return $this->_filters;
     }
 
     /**
      * @param array $filters
      */
-    public static function setCustomFilters(array $filters)
+    public function setFilters(array $filters)
     {
-        self::$customFilters = $filters;
+        $this->_filters = $filters;
     }
 }

src/ValidationTrait.php

@@ -350,13 +350,13 @@ protected function valueValidate(string $field, $value, $validator, array $args,
             if ($callback = $this->getValidator($validator)) {
                 $args[] = $this->data;
                 $passed = $callback($value, ...$args);
+                // if $validator is a custom method of the subclass.
+            } elseif (\method_exists($this, $method = $validator . 'Validator')) {
+                $passed = $this->$method($value, ...$args);
                 // if $validator is a custom validator {@see $_validators}.
             } elseif ($callback = UserValidators::get($validator)) {
                 $args[] = $this->data;
                 $passed = $callback($value, ...$args);
-                // if $validator is a custom method of the subclass.
-            } elseif (\method_exists($this, $method = $validator . 'Validator')) {
-                $passed = $this->$method($value, ...$args);
             } elseif (\method_exists(Validators::class, $realName)) {
                 $passed = Validators::$realName($value, ...$args);
             } elseif (\function_exists($validator)) { // it is function name