add more tests code

Author: inhere

src/Traits/ScopedValidatorsTrait.php

@@ -437,8 +437,6 @@ public function neqFieldValidator($val, string $compareField): bool
         return $compareField && ($val !== $this->getByPath($compareField));
     }
 
-    // TODO: ltField, lteField
-
     /**
      * 字段值比较：当前字段值 要小于 给定字段的值
      * @param string|int $val
@@ -447,9 +445,13 @@ public function neqFieldValidator($val, string $compareField): bool
      */
     public function ltFieldValidator($val, string $compareField): bool
     {
-        $minVal = $this->getByPath($compareField);
+        $maxVal = $this->getByPath($compareField);
 
-        return Validators::gt($val, $minVal);
+        if ($maxVal === null) {
+            return false;
+        }
+
+        return Validators::lt($val, $maxVal);
     }
 
     /**
@@ -460,9 +462,13 @@ public function ltFieldValidator($val, string $compareField): bool
      */
     public function lteFieldValidator($val, string $compareField): bool
     {
-        $minVal = $this->getByPath($compareField);
+        $maxVal = $this->getByPath($compareField);
 
-        return Validators::gte($val, $minVal);
+        if ($maxVal === null) {
+            return false;
+        }
+
+        return Validators::lte($val, $maxVal);
     }
 
     /**
@@ -475,6 +481,10 @@ public function gtFieldValidator($val, string $compareField): bool
     {
         $minVal = $this->getByPath($compareField);
 
+        if ($minVal === null) {
+            return false;
+        }
+
         return Validators::gt($val, $minVal);
     }
 
@@ -488,6 +498,10 @@ public function gteFieldValidator($val, string $compareField): bool
     {
         $minVal = $this->getByPath($compareField);
 
+        if ($minVal === null) {
+            return false;
+        }
+
         return Validators::gte($val, $minVal);
     }
 

src/Validator/Messages.php

@@ -121,6 +121,17 @@ public static function get(string $key)
         return self::$messages[$key] ?? '';
     }
 
+    /**
+     * @param string       $key
+     * @param string|array $msg
+     */
+    public static function set(string $key, $msg)
+    {
+        if ($key && $msg) {
+            self::$messages[$key] = $msg;
+        }
+    }
+
     /**
      * @param string $key
      * @return bool
@@ -138,21 +149,6 @@ public static function getDefault(): string
         return self::$messages['__default'];
     }
 
-    /*******************************************************************************
-     * Error Messages
-     ******************************************************************************/
-
-    /**
-     * @param string       $key
-     * @param string|array $msg
-     */
-    public static function set(string $key, $msg)
-    {
-        if ($key && $msg) {
-            self::$messages[$key] = $msg;
-        }
-    }
-
     /**
      * @param array $messages
      */

src/Validator/UserValidators.php

@@ -26,7 +26,9 @@ final class UserValidators
      */
     public static function set(string $name, callable $callback)
     {
-        self::$validators[$name] = $callback;
+        if ($name = \trim($name)) {
+            self::$validators[$name] = $callback;
+        }
     }
 
     /**

test/ScopedValidatorsTest.php

@@ -0,0 +1,18 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: inhere
+ * Date: 2019-01-23
+ * Time: 01:26
+ */
+
+namespace Inhere\ValidateTest;
+
+/**
+ * Class ScopedValidatorsTest
+ * @package Inhere\ValidateTest
+ */
+class ScopedValidatorsTest
+{
+
+}

test/Validator/UserValidatorsTest.php

@@ -0,0 +1,42 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: inhere
+ * Date: 2019-01-23
+ * Time: 01:27
+ */
+
+namespace Inhere\ValidateTest\Validator;
+
+use Inhere\Validate\Validator\UserValidators;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Class UserValidatorsTest
+ * @package Inhere\ValidateTest\Validator
+ */
+class UserValidatorsTest extends TestCase
+{
+    public function testBasic()
+    {
+        UserValidators::removeAll();
+        UserValidators::setValidators([
+            'name1' => function() {},
+            'name2' => function() {},
+            '' => function() {},
+        ]);
+
+        $this->assertCount(2, UserValidators::getValidators());
+        $this->assertTrue(UserValidators::has('name1'));
+        $this->assertFalse(UserValidators::has(''));
+
+        $this->assertNotEmpty(UserValidators::get('name2'));
+        $this->assertEmpty(UserValidators::get('name3'));
+
+        UserValidators::remove('name1');
+        $this->assertFalse(UserValidators::has('name1'));
+
+        UserValidators::removeAll();
+        $this->assertCount(0, UserValidators::getValidators());
+    }
+}