update to elegantly money

finller · Aug 27, 2024 · b2c57c9 · b2c57c9
1 parent 89b997e
commit b2c57c9
Show file tree

Hide file tree

Showing 15 changed files with 98 additions and 21 deletions.
diff --git a/composer.json b/composer.json
@@ -19,7 +19,7 @@
     "require": {
         "php": "^8.1",
         "barryvdh/laravel-dompdf": "^2.0.1",
-        "finller/laravel-money": "^0.1.3|^1.0.0",
+        "elegantly/laravel-money": "^2.0.0",
         "illuminate/contracts": "^10.0|^11.0",
         "spatie/laravel-package-tools": "^1.14"
     },

diff --git a/database/factories/InvoiceFactory.php b/database/factories/InvoiceFactory.php
@@ -7,6 +7,9 @@
 use Finller\Invoice\InvoiceType;
 use Illuminate\Database\Eloquent\Factories\Factory;
 
+/**
+ * @extends Factory<Invoice>
+ */
 class InvoiceFactory extends Factory
 {
     protected $model = Invoice::class;

diff --git a/database/factories/InvoiceItemFactory.php b/database/factories/InvoiceItemFactory.php
@@ -6,6 +6,9 @@
 use Finller\Invoice\InvoiceItem;
 use Illuminate\Database\Eloquent\Factories\Factory;
 
+/**
+ * @extends Factory<InvoiceItem>
+ */
 class InvoiceItemFactory extends Factory
 {
     protected $model = InvoiceItem::class;

diff --git a/phpstan.neon.dist b/phpstan.neon.dist
@@ -2,7 +2,7 @@ includes:
     - phpstan-baseline.neon
 
 parameters:
-    level: 4
+    level: 5
     paths:
         - src
         - config

diff --git a/src/Casts/Discounts.php b/src/Casts/Discounts.php
@@ -2,21 +2,25 @@
 
 namespace Finller\Invoice\Casts;
 
+use Finller\Invoice\InvoiceDiscount;
 use Illuminate\Contracts\Database\Eloquent\CastsAttributes;
 use Illuminate\Database\Eloquent\Casts\Json;
 use Illuminate\Database\Eloquent\Model;
 
+/**
+ * @implements CastsAttributes<null|InvoiceDiscount[], array<string, mixed>>
+ */
 class Discounts implements CastsAttributes
 {
     /**
-     * Cast the given value.
-     *
      * @param  array<string, mixed>  $attributes
+     * @return null|InvoiceDiscount[]
      */
     public function get(Model $model, string $key, mixed $value, array $attributes): mixed
     {
         $data = Json::decode(data_get($attributes, $key, ''));
 
+        /** @var string $class */
         $class = config('invoices.discount_class');
 
         return is_array($data) ? array_map(fn (?array $item) => $class::fromArray($item), $data) : null;
@@ -25,7 +29,9 @@ public function get(Model $model, string $key, mixed $value, array $attributes):
     /**
      * Prepare the given value for storage.
      *
+     * @param  null|InvoiceDiscount[]  $value
      * @param  array<string, mixed>  $attributes
+     * @return array<string, mixed>
      */
     public function set(Model $model, string $key, mixed $value, array $attributes): mixed
     {

diff --git a/src/Commands/DenormalizeInvoicesCommand.php b/src/Commands/DenormalizeInvoicesCommand.php
@@ -17,10 +17,14 @@ public function handle(): int
     {
         $ids = $this->argument('ids');
 
+        /**
+         * @var string $model
+         */
         $model = config('invoices.model_invoice');
 
-        /** @var Builder $query */
+        /** @var Builder<Invoice> $query */
         $query = $model::query();
+
         $query
             ->with(['items'])
             ->when($ids, fn (Builder $q) => $q->whereIn('id', $ids));
@@ -31,7 +35,7 @@ public function handle(): int
         $bar = $this->output->createProgressBar($total);
 
         $query
-            ->chunk(200, function (Collection $invoices) use ($bar) {
+            ->chunk(2_000, function (Collection $invoices) use ($bar) {
                 $invoices->each(function (Invoice $invoice) use ($bar) {
                     $invoice->denormalize()->saveQuietly();
                     $bar->advance();

diff --git a/src/GenerateSerialNumber.php b/src/GenerateSerialNumber.php
@@ -14,5 +14,14 @@ public function generate(
         string|int|null $month = null,
     ): string;
 
+    /**
+     * @return array{
+     *      prefix: ?string,
+     *      serie: ?int,
+     *      month: ?int,
+     *      year: ?int,
+     *      count: ?int,
+     * }
+     */
     public function parse(string $serialNumber): array;
 }
diff --git a/src/Invoice.php b/src/Invoice.php
@@ -4,9 +4,10 @@
 
 use Brick\Money\Money;
 use Carbon\Carbon;
+use Elegantly\Money\MoneyCast;
 use Exception;
 use Finller\Invoice\Casts\Discounts;
-use Finller\Money\MoneyCast;
+use Finller\Invoice\Database\Factories\InvoiceFactory;
 use Illuminate\Contracts\Mail\Attachable;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Casts\ArrayObject;
@@ -65,6 +66,9 @@
  */
 class Invoice extends Model implements Attachable
 {
+    /**
+     * @use HasFactory<InvoiceFactory>
+     */
     use HasFactory;
 
     protected $attributes = [

diff --git a/src/InvoiceDiscount.php b/src/InvoiceDiscount.php
@@ -7,7 +7,11 @@
 use Illuminate\Contracts\Support\Arrayable;
 use JsonSerializable;
 
-/** @phpstan-consistent-constructor */
+/**
+ * @implements Arrayable<string, mixed>
+ *
+ * @phpstan-consistent-constructor
+ */
 class InvoiceDiscount implements Arrayable, JsonSerializable
 {
     use FormatForPdf;
@@ -34,7 +38,10 @@ public function computeDiscountAmountOn(Money $amout): Money
         return Money::of(0, $amout->getCurrency());
     }
 
-    public static function fromArray(?array $array)
+    /**
+     * @param  ?array<int|string, mixed>  $array
+     */
+    public static function fromArray(?array $array): static
     {
         $currency = data_get($array, 'currency', config('invoices.default_currency'));
         $amount_off = data_get($array, 'amount_off');
@@ -48,7 +55,16 @@ public static function fromArray(?array $array)
         );
     }
 
-    public function toArray()
+    /**
+     * @return array{
+     *      name: ?string,
+     *      code: ?string,
+     *      amount_off: ?int,
+     *      currency: ?string,
+     *      percent_off: ?float,
+     * }
+     */
+    public function toArray(): array
     {
         return [
             'name' => $this->name,
@@ -59,17 +75,44 @@ public function toArray()
         ];
     }
 
-    public function jsonSerialize(): mixed
+    /**
+     * @return array{
+     *      name: ?string,
+     *      code: ?string,
+     *      amount_off: ?int,
+     *      currency: ?string,
+     *      percent_off: ?float,
+     * }
+     */
+    public function jsonSerialize(): array
     {
         return $this->toArray();
     }
 
-    public function toLivewire()
+    /**
+     * @return array{
+     *      name: ?string,
+     *      code: ?string,
+     *      amount_off: ?int,
+     *      currency: ?string,
+     *      percent_off: ?float,
+     * }
+     */
+    public function toLivewire(): array
     {
         return $this->toArray();
     }
 
-    public static function fromLivewire($value)
+    /**
+     * @param ?array{
+     *      name: ?string,
+     *      code: ?string,
+     *      amount_off: ?int,
+     *      currency: ?string,
+     *      percent_off: ?float,
+     * } $value
+     */
+    public static function fromLivewire(?array $value): static
     {
         return static::fromArray($value);
     }

diff --git a/src/InvoiceItem.php b/src/InvoiceItem.php
@@ -4,7 +4,8 @@
 
 use Brick\Money\Money;
 use Carbon\Carbon;
-use Finller\Money\MoneyCast;
+use Elegantly\Money\MoneyCast;
+use Finller\Invoice\Database\Factories\InvoiceItemFactory;
 use Illuminate\Database\Eloquent\Casts\ArrayObject;
 use Illuminate\Database\Eloquent\Casts\AsArrayObject;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
@@ -28,6 +29,9 @@
  */
 class InvoiceItem extends Model
 {
+    /**
+     * @use HasFactory<InvoiceItemFactory>
+     */
     use HasFactory;
 
     protected $guarded = [];

diff --git a/src/InvoiceState.php b/src/InvoiceState.php
@@ -9,7 +9,7 @@ enum InvoiceState: string
     case Paid = 'paid';
     case Refunded = 'refunded';
 
-    public function trans()
+    public function trans(): string
     {
         return match ($this) {
             self::Draft => __('invoices::invoice.states.draft'),

diff --git a/src/InvoiceType.php b/src/InvoiceType.php
@@ -9,7 +9,7 @@ enum InvoiceType: string
     case Credit = 'credit';
     case Proforma = 'proforma';
 
-    public function trans()
+    public function trans(): string
     {
         return match ($this) {
             self::Invoice => __('invoices::invoice.types.invoice'),

diff --git a/src/PdfInvoice.php b/src/PdfInvoice.php
@@ -14,6 +14,8 @@ class PdfInvoice
     use FormatForPdf;
 
     /**
+     * @param  null|array<string, mixed>  $buyer
+     * @param  null|array<string, mixed>  $seller
      * @param  null|PdfInvoiceItem[]  $items
      * @param  null|InvoiceDiscount[]  $discounts
      */

diff --git a/src/PdfInvoiceItem.php b/src/PdfInvoiceItem.php
@@ -2,6 +2,7 @@
 
 namespace Finller\Invoice;
 
+use Brick\Math\RoundingMode;
 use Brick\Money\Currency;
 use Brick\Money\Money;
 use Exception;
@@ -45,9 +46,7 @@ public function totalTaxAmount(): Money
         }
 
         if ($this->tax_percentage) {
-            [$tax] = $this->subTotalAmount()->allocate($this->tax_percentage, 100 - $this->tax_percentage);
-
-            return $tax;
+            return $this->subTotalAmount()->multipliedBy($this->tax_percentage / 100, roundingMode: RoundingMode::HALF_EVEN);
         }
 
         return Money::ofMinor(0, $this->currency);

diff --git a/src/SerialNumberGenerator.php b/src/SerialNumberGenerator.php
@@ -33,7 +33,7 @@ public function generate(
                     );
 
                     return str_pad(
-                        $serie,
+                        (string) $serie,
                         $slotLength,
                         '0',
                         STR_PAD_LEFT
@@ -51,7 +51,7 @@ public function generate(
                     );
 
                     return str_pad(
-                        $count,
+                        (string) $count,
                         $slotLength,
                         '0',
                         STR_PAD_LEFT