Fix formatting of attribute string in validation error messages

pelmered · Nov 6, 2024 · e511a36 · e511a36
1 parent 5987528
commit e511a36
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/src/Forms/Rules/MaxValueRule.php b/src/Forms/Rules/MaxValueRule.php
@@ -4,6 +4,7 @@
 
 use Closure;
 use Illuminate\Contracts\Validation\ValidationRule;
+use Illuminate\Support\Str;
 use Money\Exception\ParserException;
 use Pelmered\FilamentMoneyField\Forms\Components\MoneyInput;
 use Pelmered\FilamentMoneyField\MoneyFormatter;
@@ -29,7 +30,7 @@ public function validate(string $attribute, mixed $value, Closure $fail): void
                     strtr(
                         'The {attribute} must be less than or equal to {value}.',
                         [
-                            '{attribute}' => $attribute,
+                            '{attribute}' => Str::of($attribute)->afterLast('.')->snake(' ')->title(),
                             '{value}'     => MoneyFormatter::formatAsDecimal($this->max, $currencyCode, $locale),
                         ]
                     )
@@ -40,7 +41,7 @@ public function validate(string $attribute, mixed $value, Closure $fail): void
                 strtr(
                     'The {attribute} must be a valid numeric value.',
                     [
-                        '{attribute}' => $attribute,
+                        '{attribute}' => Str::of($attribute)->afterLast('.')->snake(' ')->title(),
                     ]
                 )
             );

diff --git a/src/Forms/Rules/MinValueRule.php b/src/Forms/Rules/MinValueRule.php
@@ -4,6 +4,7 @@
 
 use Closure;
 use Illuminate\Contracts\Validation\ValidationRule;
+use Illuminate\Support\Str;
 use Money\Exception\ParserException;
 use Pelmered\FilamentMoneyField\Forms\Components\MoneyInput;
 use Pelmered\FilamentMoneyField\MoneyFormatter;
@@ -29,7 +30,7 @@ public function validate(string $attribute, mixed $value, Closure $fail): void
                     strtr(
                         'The {attribute} must be at least {value}.',
                         [
-                            '{attribute}' => $attribute,
+                            '{attribute}' => Str::of($attribute)->afterLast('.')->snake(' ')->title(),
                             '{value}'     => MoneyFormatter::formatAsDecimal($this->min, $currencyCode, $locale),
                         ]
                     )
@@ -40,7 +41,7 @@ public function validate(string $attribute, mixed $value, Closure $fail): void
                 strtr(
                     'The {attribute} must be a valid numeric value.',
                     [
-                        '{attribute}' => $attribute,
+                        '{attribute}' => Str::of($attribute)->afterLast('.')->snake(' ')->title(),
                     ]
                 )
             );

diff --git a/tests/ValidationRulesTest.php b/tests/ValidationRulesTest.php
@@ -17,16 +17,16 @@ public function testMinValueRule(): void
         });
 
         $rule->validate('amount', 'invalid', function ($message) {
-            $this->assertEquals('The Total Amount must be a valid numeric value.', $message);
+            $this->assertEquals('The Amount must be a valid numeric value.', $message);
         });
     }
 
     public function testMaxValueRule(): void
     {
         $rule = new MaxValueRule(10000, new MoneyInput('amount'));
 
-        $rule->validate('amount', 30000, function ($message) {
-            $this->assertEquals('The Amount must be less than or equal to 100.00.', $message);
+        $rule->validate('totalAmount', 30000, function ($message) {
+            $this->assertEquals('The Total Amount must be less than or equal to 100.00.', $message);
         });
 
         $rule->validate('amount', 'invalid', function ($message) {