breaking backward compatibility

changelog.md

@@ -6,6 +6,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [8.1.0] - 2022-03-13
+### Removed
+- Method `getAvailableBalance`.
+
+### Added
+- Methods `withItems`, `withItem`, `withMeta` on Cart-object.
+
+### Deprecated
+- Method `addItems`, `addItem`, `setMeta` on Cart-Object.
+
 ## [8.0.6] - 2022-02-26
 ### Updated
 - Replaced an object with an interface (Events) #444 @ysfkaya
@@ -801,7 +811,8 @@ The operation is now executed in the transaction and updates the new `refund` fi
 - Exceptions: AmountInvalid, BalanceIsEmpty.
 - Models: Transfer, Transaction.
 
-[Unreleased]: https://github.com/bavix/laravel-wallet/compare/8.0.6...develop
+[Unreleased]: https://github.com/bavix/laravel-wallet/compare/8.1.0...develop
+[8.0.6]: https://github.com/bavix/laravel-wallet/compare/8.0.6...8.1.0
 [8.0.6]: https://github.com/bavix/laravel-wallet/compare/8.0.5...8.0.6
 [8.0.5]: https://github.com/bavix/laravel-wallet/compare/8.0.4...8.0.5
 [8.0.4]: https://github.com/bavix/laravel-wallet/compare/8.0.3...8.0.4

config/config.php

@@ -47,14 +47,18 @@
     /**
      * Arbitrary Precision Calculator.
      *
-     *  'scale' - length of the mantissa
+     * 'scale' - length of the mantissa
      */
-    'math' => ['scale' => 64],
+    'math' => [
+        'scale' => 64,
+    ],
 
     /**
      * Storage of the state of the balance of wallets.
      */
-    'cache' => ['driver' => 'array'],
+    'cache' => [
+        'driver' => 'array',
+    ],
 
     /**
      * A system for dealing with race conditions.

database/2018_11_06_222923_create_transactions_table.php

@@ -18,8 +18,12 @@ public function up(): void
             $table->enum('type', ['deposit', 'withdraw'])->index();
             $table->decimal('amount', 64, 0);
             $table->boolean('confirmed');
-            $table->json('meta')->nullable();
-            $table->uuid('uuid')->unique();
+            $table->json('meta')
+                ->nullable()
+            ;
+            $table->uuid('uuid')
+                ->unique()
+            ;
             $table->timestamps();
 
             $table->index(['payable_type', 'payable_id'], 'payable_type_payable_id_ind');

database/2018_11_07_192923_create_transfers_table.php

@@ -17,18 +17,12 @@ public function up(): void
             $table->morphs('from');
             $table->morphs('to');
             $table
-                ->enum(
-                    'status',
-                    ['exchange', 'transfer', 'paid', 'refund', 'gift']
-                )
+                ->enum('status', ['exchange', 'transfer', 'paid', 'refund', 'gift'])
                 ->default('transfer')
             ;
 
             $table
-                ->enum(
-                    'status_last',
-                    ['exchange', 'transfer', 'paid', 'refund', 'gift']
-                )
+                ->enum('status_last', ['exchange', 'transfer', 'paid', 'refund', 'gift'])
                 ->nullable()
             ;
 
@@ -43,7 +37,9 @@ public function up(): void
                 ->default(0)
             ;
 
-            $table->uuid('uuid')->unique();
+            $table->uuid('uuid')
+                ->unique()
+            ;
             $table->timestamps();
 
             $table->foreign('deposit_id')

database/2018_11_15_124230_create_wallets_table.php

@@ -16,12 +16,24 @@ public function up(): void
             $table->bigIncrements('id');
             $table->morphs('holder');
             $table->string('name');
-            $table->string('slug')->index();
-            $table->uuid('uuid')->unique();
-            $table->string('description')->nullable();
-            $table->json('meta')->nullable();
-            $table->decimal('balance', 64, 0)->default(0);
-            $table->unsignedSmallInteger('decimal_places')->default(2);
+            $table->string('slug')
+                ->index()
+            ;
+            $table->uuid('uuid')
+                ->unique()
+            ;
+            $table->string('description')
+                ->nullable()
+            ;
+            $table->json('meta')
+                ->nullable()
+            ;
+            $table->decimal('balance', 64, 0)
+                ->default(0)
+            ;
+            $table->unsignedSmallInteger('decimal_places')
+                ->default(2)
+            ;
             $table->timestamps();
 
             $table->unique(['holder_type', 'holder_id', 'slug']);

database/2021_11_02_202021_update_wallets_uuid_table.php

@@ -34,7 +34,9 @@ public function up(): void
         });
 
         Schema::table($this->table(), static function (Blueprint $table) {
-            $table->uuid('uuid')->change();
+            $table->uuid('uuid')
+                ->change()
+            ;
         });
     }
 

docs/upgrade-guide.md

@@ -194,3 +194,33 @@ On a basket of 150 products, the acceleration is a whopping 24x.
 All changes can be found in the [pull request](https://github.com/bavix/laravel-wallet/pull/407/files). 
 The kernel has changed globally, I would not recommend switching to version 7.0.0 at the very beginning, there may be bugs. 
 I advise you should at least 7.0.1.
+
+## 7.x.x → 8.0.x
+
+Nothing needs to be done.
+
+## 8.0.x → 8.1.x
+
+Replace `getAvailableBalance` to `getAvailableBalanceAttribute` (method) or `available_balance` (property).
+
+---
+
+Cart methods now support fluent-dto. It is necessary to replace the old code with a new one, for example:
+
+```php
+// old
+$cart = app(\Bavix\Wallet\Objects\Cart::class)
+    ->addItems($products)
+    ->addItem($product)
+    ->setMeta(['hello' => 'world']);
+
+$cart->addItem($product);
+
+// new. fluent
+$cart = app(\Bavix\Wallet\Objects\Cart::class)
+    ->withItems($products)
+    ->withItem($product)
+    ->withMeta(['hello' => 'world']);
+
+$cart = $cart->withItem($product);
+```

ecs.php

@@ -3,10 +3,14 @@
 declare(strict_types=1);
 
 use PhpCsFixer\Fixer\ArrayNotation\ArraySyntaxFixer;
+use PhpCsFixer\Fixer\Import\NoUnusedImportsFixer;
+use PhpCsFixer\Fixer\Operator\NotOperatorWithSuccessorSpaceFixer;
+use PhpCsFixer\Fixer\Phpdoc\GeneralPhpdocAnnotationRemoveFixer;
 use PhpCsFixer\Fixer\Phpdoc\PhpdocToCommentFixer;
 use PhpCsFixer\Fixer\PhpUnit\PhpUnitTestClassRequiresCoversFixer;
 use PhpCsFixer\Fixer\Strict\DeclareStrictTypesFixer;
 use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
+use Symplify\CodingStandard\Fixer\LineLength\LineLengthFixer;
 use Symplify\EasyCodingStandard\ValueObject\Option;
 use Symplify\EasyCodingStandard\ValueObject\Set\SetList;
 
@@ -18,6 +22,7 @@
         ]]);
 
     $services->set(DeclareStrictTypesFixer::class);
+    $services->set(LineLengthFixer::class);
 
     $parameters = $containerConfigurator->parameters();
     $parameters->set(Option::PARALLEL, true);
@@ -31,10 +36,15 @@
 
     $parameters->set(Option::SKIP, [
         PhpdocToCommentFixer::class,
+        NoUnusedImportsFixer::class,
+        GeneralPhpdocAnnotationRemoveFixer::class,
+        NotOperatorWithSuccessorSpaceFixer::class,
         PhpUnitTestClassRequiresCoversFixer::class,
     ]);
 
     $containerConfigurator->import(SetList::CLEAN_CODE);
+    $containerConfigurator->import(SetList::SYMPLIFY);
+    $containerConfigurator->import(SetList::COMMON);
     $containerConfigurator->import(SetList::PSR_12);
     $containerConfigurator->import(SetList::PHP_CS_FIXER);
     $containerConfigurator->import(SetList::CONTROL_STRUCTURES);

src/Interfaces/Customer.php

@@ -115,7 +115,9 @@ public function forceRefundGift(Product $product): bool;
      */
     public function payFreeCart(CartInterface $cart): array;
 
-    /** @return Transfer[] */
+    /**
+     * @return Transfer[]
+     */
     public function safePayCart(CartInterface $cart, bool $force = false): array;
 
     /**

src/Interfaces/Taxable.php

@@ -7,12 +7,9 @@
 interface Taxable
 {
     /**
-     * Specify the percentage of the amount.
-     * For example, the product costs $100, the equivalent of 15%.
-     * That's $115.
+     * Specify the percentage of the amount. For example, the product costs $100, the equivalent of 15%. That's $115.
      *
-     * Minimum 0; Maximum 100
-     * Example: return 7.5; // 7.5%
+     * Minimum 0; Maximum 100 Example: return 7.5; // 7.5%
      *
      * @return float|int
      */

src/Interfaces/Wallet.php

@@ -66,7 +66,9 @@ public function forceWithdraw($amount, ?array $meta = null, bool $confirmed = tr
      */
     public function transfer(self $wallet, $amount, ?array $meta = null): Transfer;
 
-    /** @param int|string $amount */
+    /**
+     * @param int|string $amount
+     */
     public function safeTransfer(self $wallet, $amount, ?array $meta = null): ?Transfer;
 
     /**

src/Internal/Assembler/BalanceUpdatedEventAssembler.php

@@ -11,8 +11,9 @@
 
 final class BalanceUpdatedEventAssembler implements BalanceUpdatedEventAssemblerInterface
 {
-    public function __construct(private ClockServiceInterface $clockService)
-    {
+    public function __construct(
+        private ClockServiceInterface $clockService
+    ) {
     }
 
     public function create(Wallet $wallet): BalanceUpdatedEventInterface

src/Internal/Assembler/TransactionDtoAssembler.php

@@ -11,8 +11,9 @@
 
 final class TransactionDtoAssembler implements TransactionDtoAssemblerInterface
 {
-    public function __construct(private UuidFactoryServiceInterface $uuidService)
-    {
+    public function __construct(
+        private UuidFactoryServiceInterface $uuidService
+    ) {
     }
 
     public function create(

src/Internal/Assembler/TransactionQueryAssembler.php

@@ -9,7 +9,9 @@
 
 final class TransactionQueryAssembler implements TransactionQueryAssemblerInterface
 {
-    /** @param non-empty-array<int|string, string> $uuids */
+    /**
+     * @param non-empty-array<int|string, string> $uuids
+     */
     public function create(array $uuids): TransactionQueryInterface
     {
         return new TransactionQuery($uuids);

src/Internal/Assembler/TransactionQueryAssemblerInterface.php

@@ -8,6 +8,8 @@
 
 interface TransactionQueryAssemblerInterface
 {
-    /** @param non-empty-array<int|string, string> $uuids */
+    /**
+     * @param non-empty-array<int|string, string> $uuids
+     */
     public function create(array $uuids): TransactionQueryInterface;
 }

src/Internal/Assembler/TransferDtoAssembler.php

@@ -11,8 +11,9 @@
 
 final class TransferDtoAssembler implements TransferDtoAssemblerInterface
 {
-    public function __construct(private UuidFactoryServiceInterface $uuidService)
-    {
+    public function __construct(
+        private UuidFactoryServiceInterface $uuidService
+    ) {
     }
 
     public function create(

src/Internal/Assembler/TransferLazyDtoAssembler.php

@@ -20,14 +20,6 @@ public function create(
         TransactionDtoInterface $depositDto,
         string $status
     ): TransferLazyDtoInterface {
-        return new TransferLazyDto(
-            $fromWallet,
-            $toWallet,
-            $discount,
-            $fee,
-            $withdrawDto,
-            $depositDto,
-            $status
-        );
+        return new TransferLazyDto($fromWallet, $toWallet, $discount, $fee, $withdrawDto, $depositDto, $status);
     }
 }

src/Internal/Assembler/TransferQueryAssembler.php

@@ -9,7 +9,9 @@
 
 final class TransferQueryAssembler implements TransferQueryAssemblerInterface
 {
-    /** @param non-empty-array<int|string, string> $uuids */
+    /**
+     * @param non-empty-array<int|string, string> $uuids
+     */
     public function create(array $uuids): TransferQueryInterface
     {
         return new TransferQuery($uuids);

src/Internal/Assembler/TransferQueryAssemblerInterface.php

@@ -8,6 +8,8 @@
 
 interface TransferQueryAssemblerInterface
 {
-    /** @param non-empty-array<int|string, string> $uuids */
+    /**
+     * @param non-empty-array<int|string, string> $uuids
+     */
     public function create(array $uuids): TransferQueryInterface;
 }

src/Internal/Assembler/WalletCreatedEventAssembler.php

@@ -11,8 +11,9 @@
 
 final class WalletCreatedEventAssembler implements WalletCreatedEventAssemblerInterface
 {
-    public function __construct(private ClockServiceInterface $clockService)
-    {
+    public function __construct(
+        private ClockServiceInterface $clockService
+    ) {
     }
 
     public function create(Wallet $wallet): WalletCreatedEventInterface

src/Internal/Dto/AvailabilityDto.php

@@ -9,8 +9,11 @@
 /** @psalm-immutable */
 final class AvailabilityDto implements AvailabilityDtoInterface
 {
-    public function __construct(private Customer $customer, private BasketDtoInterface $basketDto, private bool $force)
-    {
+    public function __construct(
+        private Customer $customer,
+        private BasketDtoInterface $basketDto,
+        private bool $force
+    ) {
     }
 
     public function getBasketDto(): BasketDtoInterface