tweak behavior of decimal rule

laravel · Dec 19, 2022 · e89b2b0 · e89b2b0
1 parent 5e9cd3b
commit e89b2b0
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 4 deletions.
diff --git a/src/Illuminate/Validation/Concerns/ReplacesAttributes.php b/src/Illuminate/Validation/Concerns/ReplacesAttributes.php
@@ -70,6 +70,26 @@ protected function replaceDateFormat($message, $attribute, $rule, $parameters)
         return str_replace(':format', $parameters[0], $message);
     }
 
+    /**
+     * Replace all place-holders for the decimal rule.
+     *
+     * @param  string  $message
+     * @param  string  $attribute
+     * @param  string  $rule
+     * @param  array<int,int>  $parameters
+     * @return string
+     */
+    protected function replaceDecimal($message, $attribute, $rule, $parameters)
+    {
+        return str_replace(
+            ':decimal',
+            isset($parameters[1])
+                ? $parameters[0].'-'.$parameters[1]
+                : $parameters[0],
+            $message
+        );
+    }
+
     /**
      * Replace all place-holders for the different rule.
      *

diff --git a/src/Illuminate/Validation/Concerns/ValidatesAttributes.php b/src/Illuminate/Validation/Concerns/ValidatesAttributes.php
@@ -576,8 +576,12 @@ public function validateDecimal($attribute, $value, $parameters)
 
         $decimals = strlen(end($matches));
 
+        if (! isset($parameters[1])) {
+            return $decimals == $parameters[0];
+        }
+
         return $decimals >= $parameters[0] &&
-               (! isset($parameters[1]) || $decimals <= $parameters[1]);
+               $decimals <= $parameters[1];
     }
 
     /**

diff --git a/tests/Validation/ValidationValidatorTest.php b/tests/Validation/ValidationValidatorTest.php
@@ -2466,12 +2466,12 @@ public function testValidateDecimal()
         $v = new Validator($trans, ['foo' => '1.2'], ['foo' => 'Decimal:2,3']);
         $this->assertFalse($v->passes());
 
-        $v = new Validator($trans, ['foo' => '1.234'], ['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());
+
         $v = new Validator($trans, ['foo' => '1.2'], ['foo' => 'Decimal:2']);
         $this->assertFalse($v->passes());