Merge in main

pelmered · May 8, 2024 · 3d52c98 · 3d52c98
2 parents b43c9d9 + bd8a698
commit 3d52c98
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 28 deletions.
diff --git a/composer.json b/composer.json
@@ -32,7 +32,8 @@
     "require-dev": {
         "phpunit/phpunit": "^10 || ^11",
         "filament/filament": "^3.0",
-        "orchestra/testbench": "8.x-dev"
+        "orchestra/testbench": "8.x-dev",
+        "phpstan/phpstan": "^1.10"
     },
     "extra": {
         "laravel": {
@@ -42,6 +43,7 @@
         }
     },
     "scripts": {
+        "phpstan": "vendor/bin/phpstan analyse src --level=9",
         "post-autoload-dump": [
             "@clear",
             "@prepare"

diff --git a/composer.lock b/composer.lock
diff --git a/phpunit.xml b/phpunit.xml
@@ -12,12 +12,12 @@
       <directory>tests</directory>
     </testsuite>
   </testsuites>
-  <php>
-    <env name="XDEBUG_MODE" value="debug,develop,coverage"/>
-  </php>
   <source>
     <include>
       <directory suffix=".php">./src</directory>
     </include>
   </source>
+  <php>
+    <env name="XDEBUG_MODE" value="debug,develop,coverage"/>
+  </php>
 </phpunit>
diff --git a/src/Forms/Components/MoneyInput.php b/src/Forms/Components/MoneyInput.php
@@ -7,12 +7,12 @@
 use Illuminate\Support\Facades\Config;
 use Pelmered\FilamentMoneyField\Forms\Rules\MaxValueRule;
 use Pelmered\FilamentMoneyField\Forms\Rules\MinValueRule;
-use Pelmered\FilamentMoneyField\hasMoneyAttributes;
+use Pelmered\FilamentMoneyField\HasMoneyAttributes;
 use Pelmered\FilamentMoneyField\MoneyFormatter;
 
 class MoneyInput extends TextInput
 {
-    use hasMoneyAttributes;
+    use HasMoneyAttributes;
 
     protected function setUp(): void
     {

diff --git a/src/hasMoneyAttributes.php → src/HasMoneyAttributes.php b/src/hasMoneyAttributes.php → src/HasMoneyAttributes.php
@@ -6,7 +6,7 @@
 use Money\Currencies\ISOCurrencies;
 use Money\Currency;
 
-trait hasMoneyAttributes
+trait HasMoneyAttributes
 {
     protected Currency $currency;
     protected string $locale;
@@ -24,7 +24,7 @@ public function getLocale(): string
 
     public function currency(string|\Closure|null $currencyCode = null): static
     {
-        $this->currency = new Currency($currencyCode);
+        $this->currency = new Currency($this->evaluate($currencyCode));
         $currencies = new ISOCurrencies();
 
         if (!$currencies->contains($this->currency)) {
@@ -36,7 +36,7 @@ public function currency(string|\Closure|null $currencyCode = null): static
 
     public function locale(string|\Closure|null $locale = null): static
     {
-        $this->locale = $locale;
+        $this->locale = $this->evaluate($locale);
 
         return $this;
     }

diff --git a/src/Infolists/Components/MoneyEntry.php b/src/Infolists/Components/MoneyEntry.php
@@ -3,12 +3,12 @@
 namespace Pelmered\FilamentMoneyField\Infolists\Components;
 
 use Filament\Infolists\Components\TextEntry;
-use Pelmered\FilamentMoneyField\hasMoneyAttributes;
+use Pelmered\FilamentMoneyField\HasMoneyAttributes;
 use Pelmered\FilamentMoneyField\MoneyFormatter;
 
 class MoneyEntry extends TextEntry
 {
-    use hasMoneyAttributes;
+    use HasMoneyAttributes;
 
     protected function setUp(): void
     {

diff --git a/src/Tables/Columns/MoneyColumn.php b/src/Tables/Columns/MoneyColumn.php
@@ -3,12 +3,12 @@
 namespace Pelmered\FilamentMoneyField\Tables\Columns;
 
 use Filament\Tables\Columns\TextColumn;
-use Pelmered\FilamentMoneyField\hasMoneyAttributes;
+use Pelmered\FilamentMoneyField\HasMoneyAttributes;
 use Pelmered\FilamentMoneyField\MoneyFormatter;
 
 class MoneyColumn extends TextColumn
 {
-    use hasMoneyAttributes;
+    use HasMoneyAttributes;
 
     protected function setUp(): void
     {