Merge pull request #39 from bavix/dev

2.5-Dev: Bug fixes

Author: rez1dent3

README.md

@@ -87,6 +87,7 @@ Add the `HasWallet` trait and `Product` interface to `Item` model.
 ```php
 use Bavix\Wallet\Traits\HasWallet;
 use Bavix\Wallet\Interfaces\Product;
+use Bavix\Wallet\Interfaces\Customer;
 
 class Item extends Model implements Product
 {

changelog.md

@@ -237,7 +237,7 @@ 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/2.4.0...HEAD
+[Unreleased]: https://github.com/bavix/laravel-wallet/compare/2.4.0...dev
 [2.4.0]: https://github.com/bavix/laravel-wallet/compare/2.3.2...2.4.0
 [2.3.2]: https://github.com/bavix/laravel-wallet/compare/2.3.1...2.3.2
 [2.3.1]: https://github.com/bavix/laravel-wallet/compare/2.3.0...2.3.1

composer.json

@@ -50,7 +50,7 @@
       ]
     },
     "branch-alias": {
-      "dev-master": "2.5-dev"
+      "3.0.x-dev": "alpha"
     }
   },
   "config": {

src/Models/Wallet.php

@@ -74,8 +74,18 @@ public function setNameAttribute(string $name): void
 
     /**
      * @return bool
+     * @deprecated
+     * @see refreshBalance
      */
     public function calculateBalance(): bool
+    {
+        return $this->refreshBalance();
+    }
+
+    /**
+     * @return bool
+     */
+    public function refreshBalance(): bool
     {
         $balance = $this->getAvailableBalance();
         WalletProxy::set($this->getKey(), $balance);

src/Traits/CanPay.php

@@ -5,7 +5,6 @@
 use Bavix\Wallet\Exceptions\ProductEnded;
 use Bavix\Wallet\Interfaces\Product;
 use Bavix\Wallet\Models\Transfer;
-use Bavix\Wallet\Models\Wallet;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Support\Facades\DB;

src/Traits/HasWallet.php

@@ -300,6 +300,8 @@ public function forceTransfer(Wallet $wallet, int $amount, ?array $meta = null,
      * holder transfers
      *
      * @return MorphMany
+     * @deprecated since laravel-wallet 2.5
+     * @see transfers
      */
     public function holderTransfers(): MorphMany
     {

src/WalletServiceProvider.php

@@ -24,9 +24,16 @@ public function boot(): void
             return;
         }
 
-        $this->publishes([
-            \dirname(__DIR__) . '/config/config.php' => config_path('wallet.php'),
-        ], 'laravel-wallet-config');
+        $this->loadMigrationsFrom([
+            __DIR__.'/../database/migrations_v1',
+            __DIR__.'/../database/migrations_v2',
+        ]);
+
+        if (\function_exists('config_path')) {
+            $this->publishes([
+                \dirname(__DIR__) . '/config/config.php' => config_path('wallet.php'),
+            ], 'laravel-wallet-config');
+        }
 
         $this->publishes([
             \dirname(__DIR__) . '/database/migrations_v1/' => database_path('migrations'),

tests/MultiWalletTest.php

@@ -293,4 +293,25 @@ public function testGetWallet(): void
         );
     }
 
+    /**
+     * @return void
+     */
+    public function testGetWalletOptimize(): void
+    {
+        /**
+         * @var UserMulti $user
+         */
+        $user = factory(UserMulti::class)->create();
+        $names = \range('a', 'z');
+        foreach ($names as $name) {
+            $user->createWallet(\compact('name'));
+        }
+
+        $user->load('wallets'); // optimize
+
+        foreach ($names as $name) {
+            $this->assertEquals($name, $user->getWallet($name)->name);
+        }
+    }
+
 }

tests/WalletTest.php

@@ -208,6 +208,7 @@ public function testRecalculate(): void
         $this->assertEquals($user->balance, 100);
 
         $user->withdraw($user->balance);
+        $this->assertEquals($user->balance, 0);
     }
 
 }