Merge pull request #66 from pelmered/remove-getLabel

Move traits into a folder
pelmered · Nov 6, 2024 · 8fafe70 · 8fafe70
2 parents ceb7a04 + ac196db
commit 8fafe70
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 10 deletions.
diff --git a/src/Concerns/FormatsAttributes.php b/src/Concerns/FormatsAttributes.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace Pelmered\FilamentMoneyField\Concerns;
+
+use Illuminate\Support\Str;
+
+trait FormatsAttributes
+{
+    public function formatAttribute(string $attribute): string
+    {
+        return Str::of($attribute)->afterLast('.')->snake(' ')->title();
+    }
+}
diff --git a/src/HasMoneyAttributes.php → src/Concerns/HasMoneyAttributes.php b/src/HasMoneyAttributes.php → src/Concerns/HasMoneyAttributes.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Pelmered\FilamentMoneyField;
+namespace Pelmered\FilamentMoneyField\Concerns;
 
 use Closure;
 use Filament\Infolists\Infolist;

diff --git a/src/Forms/Components/MoneyInput.php b/src/Forms/Components/MoneyInput.php
@@ -4,9 +4,9 @@
 
 use Filament\Forms\Components\TextInput;
 use Filament\Support\RawJs;
+use Pelmered\FilamentMoneyField\Concerns\HasMoneyAttributes;
 use Pelmered\FilamentMoneyField\Forms\Rules\MaxValueRule;
 use Pelmered\FilamentMoneyField\Forms\Rules\MinValueRule;
-use Pelmered\FilamentMoneyField\HasMoneyAttributes;
 use Pelmered\FilamentMoneyField\MoneyFormatter;
 
 class MoneyInput extends TextInput

diff --git a/src/Forms/Rules/MaxValueRule.php b/src/Forms/Rules/MaxValueRule.php
@@ -4,13 +4,15 @@
 
 use Closure;
 use Illuminate\Contracts\Validation\ValidationRule;
-use Illuminate\Support\Str;
 use Money\Exception\ParserException;
+use Pelmered\FilamentMoneyField\Concerns\FormatsAttributes;
 use Pelmered\FilamentMoneyField\Forms\Components\MoneyInput;
 use Pelmered\FilamentMoneyField\MoneyFormatter;
 
 readonly class MaxValueRule implements ValidationRule
 {
+    use FormatsAttributes;
+
     public function __construct(private int $max, private MoneyInput $component) {}
 
     public function validate(string $attribute, mixed $value, Closure $fail): void
@@ -30,7 +32,7 @@ public function validate(string $attribute, mixed $value, Closure $fail): void
                     strtr(
                         'The {attribute} must be less than or equal to {value}.',
                         [
-                            '{attribute}' => Str::of($attribute)->afterLast('.')->snake(' ')->title(),
+                            '{attribute}' => $this->formatAttribute($attribute),
                             '{value}'     => MoneyFormatter::formatAsDecimal($this->max, $currencyCode, $locale),
                         ]
                     )
@@ -41,7 +43,7 @@ public function validate(string $attribute, mixed $value, Closure $fail): void
                 strtr(
                     'The {attribute} must be a valid numeric value.',
                     [
-                        '{attribute}' => Str::of($attribute)->afterLast('.')->snake(' ')->title(),
+                        '{attribute}' => $this->formatAttribute($attribute),
                     ]
                 )
             );

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

diff --git a/src/Infolists/Components/MoneyEntry.php b/src/Infolists/Components/MoneyEntry.php
@@ -3,7 +3,7 @@
 namespace Pelmered\FilamentMoneyField\Infolists\Components;
 
 use Filament\Infolists\Components\TextEntry;
-use Pelmered\FilamentMoneyField\HasMoneyAttributes;
+use Pelmered\FilamentMoneyField\Concerns\HasMoneyAttributes;
 use Pelmered\FilamentMoneyField\MoneyFormatter;
 
 class MoneyEntry extends TextEntry

diff --git a/src/Tables/Columns/MoneyColumn.php b/src/Tables/Columns/MoneyColumn.php
@@ -3,7 +3,7 @@
 namespace Pelmered\FilamentMoneyField\Tables\Columns;
 
 use Filament\Tables\Columns\TextColumn;
-use Pelmered\FilamentMoneyField\HasMoneyAttributes;
+use Pelmered\FilamentMoneyField\Concerns\HasMoneyAttributes;
 use Pelmered\FilamentMoneyField\MoneyFormatter;
 
 class MoneyColumn extends TextColumn