Merge pull request #99 from ariaieboy/psalm

fix psalm errors
akaunting · Mar 29, 2024 · 11d61be · 11d61be
2 parents c6710ee + ae58ada
commit 11d61be
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 7 deletions.
diff --git a/.github/workflows/psalm.yml b/.github/workflows/psalm.yml
@@ -21,7 +21,7 @@ jobs:
           coverage: none
 
       - name: Cache composer dependencies
-        uses: actions/cache@v1
+        uses: actions/cache@v4
         with:
           path: vendor
           key: composer-${{ hashFiles('composer.lock') }}

diff --git a/src/Casts/CurrencyCast.php b/src/Casts/CurrencyCast.php
@@ -7,8 +7,7 @@
 use UnexpectedValueException;
 
 /**
- * @template TGet
- * @template TSet
+ * @template-implements CastsAttributes<Currency,Currency>
  */
 class CurrencyCast implements CastsAttributes
 {

diff --git a/src/Casts/MoneyCast.php b/src/Casts/MoneyCast.php
@@ -8,8 +8,7 @@
 use UnexpectedValueException;
 
 /**
- * @template TGet
- * @template TSet
+ * @template-implements CastsAttributes<Money,Money>
  */
 class MoneyCast implements CastsAttributes
 {

diff --git a/src/Currency.php b/src/Currency.php
@@ -179,6 +179,7 @@
  * @method static Currency ZAR()
  * @method static Currency ZMW()
  * @method static Currency ZWL()
+ * @template-implements Arrayable<string,array>
  */
 class Currency implements Arrayable, Castable, Jsonable, JsonSerializable, Renderable
 {

diff --git a/src/Money.php b/src/Money.php
@@ -11,6 +11,7 @@
 use Illuminate\Contracts\Support\Arrayable;
 use Illuminate\Contracts\Support\Jsonable;
 use Illuminate\Contracts\Support\Renderable;
+use Illuminate\Support\Arr;
 use Illuminate\Support\Traits\Macroable;
 use InvalidArgumentException;
 use JsonSerializable;
@@ -183,6 +184,7 @@
  * @method static Money ZAR(mixed $amount, bool $convert = false)
  * @method static Money ZMW(mixed $amount, bool $convert = false)
  * @method static Money ZWL(mixed $amount, bool $convert = false)
+ * @template-implements Arrayable<string,int|float|Currency>
  */
 class Money implements Arrayable, Castable, Jsonable, JsonSerializable, Renderable
 {
@@ -606,7 +608,7 @@ public function formatForHumans(?string $locale = null, ?Closure $callback = nul
         $prefix = $this->currency->getPrefix();
         $suffix = $this->currency->getSuffix();
 
-        $formatter = new \NumberFormatter($locale ?: static::getLocale(), \NumberFormatter::PADDING_POSITION);
+        $formatter = new \NumberFormatter(is_null($locale) ? static::getLocale():$locale, \NumberFormatter::PADDING_POSITION);
 
         $formatter->setSymbol(\NumberFormatter::DECIMAL_SEPARATOR_SYMBOL, $this->currency->getDecimalMark());
         $formatter->setSymbol(\NumberFormatter::GROUPING_SEPARATOR_SYMBOL, $this->currency->getThousandsSeparator());
@@ -632,7 +634,7 @@ public function formatLocale(?string $locale = null, ?Closure $callback = null):
         }
         // @codeCoverageIgnoreEnd
 
-        $formatter = new \NumberFormatter($locale ?: static::getLocale(), \NumberFormatter::CURRENCY);
+        $formatter = new \NumberFormatter(is_null($locale) ? static::getLocale():$locale, \NumberFormatter::CURRENCY);
 
         $formatter->setSymbol(\NumberFormatter::DECIMAL_SEPARATOR_SYMBOL, $this->currency->getDecimalMark());
         $formatter->setSymbol(\NumberFormatter::GROUPING_SEPARATOR_SYMBOL, $this->currency->getThousandsSeparator());

diff --git a/src/Rules/CurrencyRule.php b/src/Rules/CurrencyRule.php
@@ -5,6 +5,9 @@
 use Akaunting\Money\Currency;
 use Illuminate\Contracts\Validation\Rule;
 
+/**
+ * @psalm-suppress DeprecatedInterface
+ */
 class CurrencyRule implements Rule
 {
     public function passes($attribute, $value): bool