Update decimal validation rule to allow validation of signed numbers

laravel · Dec 23, 2022 · 24a48b2 · 24a48b2
1 parent e3546de
commit 24a48b2
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/src/Illuminate/Validation/Concerns/ValidatesAttributes.php b/src/Illuminate/Validation/Concerns/ValidatesAttributes.php
@@ -572,7 +572,7 @@ public function validateDecimal($attribute, $value, $parameters)
 
         $matches = [];
 
-        preg_match('/^\d*.(\d*)$/', $value, $matches);
+        preg_match('/^[+-]?\d*.(\d*)$/', $value, $matches);
 
         $decimals = strlen(end($matches));
 

diff --git a/tests/Validation/ValidationValidatorTest.php b/tests/Validation/ValidationValidatorTest.php
@@ -2457,10 +2457,10 @@ public function testValidateDecimal()
         $v = new Validator($trans, ['foo' => '1.2345'], ['foo' => 'Decimal:2,3']);
         $this->assertFalse($v->passes());
 
-        $v = new Validator($trans, ['foo' => '1.234'], ['foo' => 'Decimal:2,3']);
+        $v = new Validator($trans, ['foo' => '-1.234'], ['foo' => 'Decimal:2,3']);
         $this->assertTrue($v->passes());
 
-        $v = new Validator($trans, ['foo' => '1.23'], ['foo' => 'Decimal:2,3']);
+        $v = new Validator($trans, ['foo' => '+1.23'], ['foo' => 'Decimal:2,3']);
         $this->assertTrue($v->passes());
 
         $v = new Validator($trans, ['foo' => '1.2'], ['foo' => 'Decimal:2,3']);
@@ -2469,6 +2469,9 @@ public function testValidateDecimal()
         $v = new Validator($trans, ['foo' => '1.23'], ['foo' => 'Decimal:2']);
         $this->assertTrue($v->passes());
 
+        $v = new Validator($trans, ['foo' => '-1.23'], ['foo' => 'Decimal:2']);
+        $this->assertTrue($v->passes());
+
         $v = new Validator($trans, ['foo' => '1.233'], ['foo' => 'Decimal:2']);
         $this->assertFalse($v->passes());
 
@@ -2478,7 +2481,7 @@ public function testValidateDecimal()
         $v = new Validator($trans, ['foo' => '1'], ['foo' => 'Decimal:0,1']);
         $this->assertTrue($v->passes());
 
-        $v = new Validator($trans, ['foo' => '1.2'], ['foo' => 'Decimal:0,1']);
+        $v = new Validator($trans, ['foo' => '-1.2'], ['foo' => 'Decimal:0,1']);
         $this->assertTrue($v->passes());
 
         $v = new Validator($trans, ['foo' => '1.23'], ['foo' => 'Decimal:0,1']);