Merge branch 'master' into 3.1-merge

# Conflicts:
#	src/nacos/src/GrpcClient.php

Author: limingxinleo

src/Concerns/ValidatesAttributes.php

@@ -201,10 +201,14 @@ public function validateBetween(string $attribute, $value, array $parameters): b
      *
      * @param mixed $value
      */
-    public function validateBoolean(string $attribute, $value): bool
+    public function validateBoolean(string $attribute, $value, array $parameters = []): bool
     {
         $acceptable = [true, false, 0, 1, '0', '1'];
 
+        if (isset($parameters[0]) && strtolower($parameters[0]) == 'strict') {
+            $acceptable = [true, false];
+        }
+
         return in_array($value, $acceptable, true);
     }
 
@@ -681,8 +685,12 @@ public function validateInArray(string $attribute, $value, array $parameters): b
      *
      * @param mixed $value
      */
-    public function validateInteger(string $attribute, $value): bool
+    public function validateInteger(string $attribute, $value, array $parameters = []): bool
     {
+        if (isset($parameters[0]) && strtolower($parameters[0]) == 'strict' && gettype($value) != 'integer') {
+            return false;
+        }
+
         return filter_var($value, FILTER_VALIDATE_INT) !== false;
     }
 

tests/Cases/ValidationValidatorTest.php

@@ -1471,6 +1471,116 @@ public function testValidateInt()
         $this->assertTrue($v->passes());
     }
 
+    public function testValidateIntStrict()
+    {
+        $translator = $this->getIlluminateArrayTranslator();
+
+        $validator = new Validator($translator, ['foo' => '1'], ['foo' => 'Int:strict']);
+        $this->assertFalse($validator->passes());
+
+        $validator = new Validator($translator, ['foo' => '-1'], ['foo' => 'Int:strict']);
+        $this->assertFalse($validator->passes());
+
+        $validator = new Validator($translator, ['foo' => '1.23'], ['foo' => 'Int:strict']);
+        $this->assertFalse($validator->passes());
+
+        $validator = new Validator($translator, ['foo' => 1.23], ['foo' => 'Int:strict']);
+        $this->assertFalse($validator->passes());
+    }
+
+    public function testValidateIntegerStrict()
+    {
+        $translator = $this->getIlluminateArrayTranslator();
+
+        $validator = new Validator($translator, ['foo' => '1'], ['foo' => 'Integer:strict']);
+        $this->assertFalse($validator->passes());
+
+        $validator = new Validator($translator, ['foo' => '-1'], ['foo' => 'Integer:strict']);
+        $this->assertFalse($validator->passes());
+
+        $validator = new Validator($translator, ['foo' => '1.23'], ['foo' => 'Integer:strict']);
+        $this->assertFalse($validator->passes());
+
+        $validator = new Validator($translator, ['foo' => 1.23], ['foo' => 'Integer:strict']);
+        $this->assertFalse($validator->passes());
+    }
+
+    public function testValidateBoolStrict()
+    {
+        $translator = $this->getIlluminateArrayTranslator();
+
+        $validator = new Validator($translator, ['foo' => 'no'], ['foo' => 'Bool:strict']);
+        $this->assertFalse($validator->passes());
+
+        $validator = new Validator($translator, ['foo' => 'yes'], ['foo' => 'Bool:strict']);
+        $this->assertFalse($validator->passes());
+
+        $validator = new Validator($translator, ['foo' => 'false'], ['foo' => 'Bool:strict']);
+        $this->assertFalse($validator->passes());
+
+        $validator = new Validator($translator, ['foo' => 'true'], ['foo' => 'Bool:strict']);
+        $this->assertFalse($validator->passes());
+
+        $validator = new Validator($translator, [], ['foo' => 'Bool:strict']);
+        $this->assertTrue($validator->passes());
+
+        $validator = new Validator($translator, ['foo' => false], ['foo' => 'Bool:strict']);
+        $this->assertTrue($validator->passes());
+
+        $validator = new Validator($translator, ['foo' => true], ['foo' => 'Bool:strict']);
+        $this->assertTrue($validator->passes());
+
+        $validator = new Validator($translator, ['foo' => '1'], ['foo' => 'Bool:strict']);
+        $this->assertFalse($validator->passes());
+
+        $validator = new Validator($translator, ['foo' => 1], ['foo' => 'Bool:strict']);
+        $this->assertFalse($validator->passes());
+
+        $validator = new Validator($translator, ['foo' => '0'], ['foo' => 'Bool:strict']);
+        $this->assertFalse($validator->passes());
+
+        $validator = new Validator($translator, ['foo' => 0], ['foo' => 'Bool:strict']);
+        $this->assertFalse($validator->passes());
+    }
+
+    public function testValidateBooleanStrict()
+    {
+        $translator = $this->getIlluminateArrayTranslator();
+
+        $validator = new Validator($translator, ['foo' => 'no'], ['foo' => 'Boolean:strict']);
+        $this->assertFalse($validator->passes());
+
+        $validator = new Validator($translator, ['foo' => 'yes'], ['foo' => 'Boolean:strict']);
+        $this->assertFalse($validator->passes());
+
+        $validator = new Validator($translator, ['foo' => 'false'], ['foo' => 'Boolean:strict']);
+        $this->assertFalse($validator->passes());
+
+        $validator = new Validator($translator, ['foo' => 'true'], ['foo' => 'Boolean:strict']);
+        $this->assertFalse($validator->passes());
+
+        $validator = new Validator($translator, [], ['foo' => 'Boolean:strict']);
+        $this->assertTrue($validator->passes());
+
+        $validator = new Validator($translator, ['foo' => false], ['foo' => 'Boolean:strict']);
+        $this->assertTrue($validator->passes());
+
+        $validator = new Validator($translator, ['foo' => true], ['foo' => 'Boolean:strict']);
+        $this->assertTrue($validator->passes());
+
+        $validator = new Validator($translator, ['foo' => '1'], ['foo' => 'Boolean:strict']);
+        $this->assertFalse($validator->passes());
+
+        $validator = new Validator($translator, ['foo' => 1], ['foo' => 'Boolean:strict']);
+        $this->assertFalse($validator->passes());
+
+        $validator = new Validator($translator, ['foo' => '0'], ['foo' => 'Boolean:strict']);
+        $this->assertFalse($validator->passes());
+
+        $validator = new Validator($translator, ['foo' => 0], ['foo' => 'Boolean:strict']);
+        $this->assertFalse($validator->passes());
+    }
+
     public function testValidateDigits()
     {
         $trans = $this->getIlluminateArrayTranslator();