fixes laravel#14647 by correct digits validation (laravel#14650)

tillkruss · Aug 30, 2016 · 1020b31 · 1020b31
1 parent a0d89c0
commit 1020b31
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/src/Illuminate/Validation/Validator.php b/src/Illuminate/Validation/Validator.php
@@ -1149,7 +1149,7 @@ protected function validateDigits($attribute, $value, $parameters)
     {
         $this->requireParameterCount(1, $parameters, 'digits');
 
-        return $this->validateNumeric($attribute, $value)
+        return ! preg_match('/[^0-9]/', $value)
             && strlen((string) $value) == $parameters[0];
     }
 
@@ -1167,7 +1167,7 @@ protected function validateDigitsBetween($attribute, $value, $parameters)
 
         $length = strlen((string) $value);
 
-        return $this->validateNumeric($attribute, $value)
+        return ! preg_match('/[^0-9]/', $value)
           && $length >= $parameters[0] && $length <= $parameters[1];
     }
 

diff --git a/tests/Validation/ValidationValidatorTest.php b/tests/Validation/ValidationValidatorTest.php
@@ -1016,6 +1016,12 @@ public function testValidateDigits()
         $v = new Validator($trans, ['foo' => '123'], ['foo' => 'Digits:200']);
         $this->assertFalse($v->passes());
 
+        $v = new Validator($trans, ['foo' => '+2.37'], ['foo' => 'Digits:5']);
+        $this->assertTrue($v->fails());
+
+        $v = new Validator($trans, ['foo' => '2e7'], ['foo' => 'Digits:3']);
+        $this->assertTrue($v->fails());
+
         $trans = $this->getRealTranslator();
         $v = new Validator($trans, ['foo' => '12345'], ['foo' => 'digits_between:1,6']);
         $this->assertTrue($v->passes());
@@ -1025,6 +1031,9 @@ public function testValidateDigits()
 
         $v = new Validator($trans, ['foo' => '123'], ['foo' => 'digits_between:4,5']);
         $this->assertFalse($v->passes());
+
+        $v = new Validator($trans, ['foo' => '+12.3'], ['foo' => 'digits_between:1,6']);
+        $this->assertFalse($v->passes());
     }
 
     public function testValidateSize()