3.0-Dev

composer.json

@@ -31,7 +31,7 @@
   "require-dev": {
     "mockery/mockery": "^1.2",
     "orchestra/testbench": "^3.7",
-    "phpunit/phpunit": "^7.5"
+    "phpunit/phpunit": "^7.5|^8.1"
   },
   "autoload": {
     "psr-4": {

src/Interfaces/Customer.php

@@ -13,15 +13,15 @@ interface Customer extends Wallet
      * @return Transfer
      * @throws
      */
-    public function pay(Product $product, bool $force = false): Transfer;
+    public function pay(Product $product, bool $force = null): Transfer;
 
     /**
      * @param Product $product
      * @param bool $force
      * @return null|Transfer
      * @throws
      */
-    public function safePay(Product $product, bool $force = false): ?Transfer;
+    public function safePay(Product $product, bool $force = null): ?Transfer;
 
     /**
      * @param Product $product
@@ -35,7 +35,7 @@ public function forcePay(Product $product): Transfer;
      * @param bool $gifts
      * @return null|Transfer
      */
-    public function paid(Product $product, bool $gifts = false): ?Transfer;
+    public function paid(Product $product, bool $gifts = null): ?Transfer;
 
     /**
      * @param Product $product
@@ -44,21 +44,21 @@ public function paid(Product $product, bool $gifts = false): ?Transfer;
      * @return bool
      * @throws
      */
-    public function refund(Product $product, bool $force = false, bool $gifts = false): bool;
+    public function refund(Product $product, bool $force = null, bool $gifts = null): bool;
 
     /**
      * @param Product $product
      * @param bool $force
      * @param bool $gifts
      * @return bool
      */
-    public function safeRefund(Product $product, bool $force = false, bool $gifts = false): bool;
+    public function safeRefund(Product $product, bool $force = null, bool $gifts = null): bool;
 
     /**
      * @param Product $product
      * @param bool $gifts
      * @return bool
      */
-    public function forceRefund(Product $product, bool $gifts = false): bool;
+    public function forceRefund(Product $product, bool $gifts = null): bool;
 
 }

src/Interfaces/Product.php

@@ -11,7 +11,7 @@ interface Product extends Wallet
      *
      * @return bool
      */
-    public function canBuy(Customer $customer, bool $force = false): bool;
+    public function canBuy(Customer $customer, bool $force = null): bool;
 
     /**
      * @return int

src/Traits/CanPay.php

@@ -37,7 +37,7 @@ public function payFree(Product $product): Transfer
      * @param bool $force
      * @return Transfer|null
      */
-    public function safePay(Product $product, bool $force = false): ?Transfer
+    public function safePay(Product $product, bool $force = null): ?Transfer
     {
         try {
             return $this->pay($product, $force);
@@ -52,7 +52,7 @@ public function safePay(Product $product, bool $force = false): ?Transfer
      * @return Transfer
      * @throws
      */
-    public function pay(Product $product, bool $force = false): Transfer
+    public function pay(Product $product, bool $force = null): Transfer
     {
         if (!$product->canBuy($this, $force)) {
             throw new ProductEnded(trans('wallet::errors.product_stock'));
@@ -91,7 +91,7 @@ public function forcePay(Product $product): Transfer
      * @param bool $gifts
      * @return bool
      */
-    public function safeRefund(Product $product, bool $force = false, bool $gifts = false): bool
+    public function safeRefund(Product $product, bool $force = null, bool $gifts = null): bool
     {
         try {
             return $this->refund($product, $force, $gifts);
@@ -107,7 +107,7 @@ public function safeRefund(Product $product, bool $force = false, bool $gifts =
      * @return bool
      * @throws
      */
-    public function refund(Product $product, bool $force = false, bool $gifts = false): bool
+    public function refund(Product $product, bool $force = null, bool $gifts = null): bool
     {
         $transfer = $this->paid($product, $gifts);
 
@@ -145,7 +145,7 @@ public function refund(Product $product, bool $force = false, bool $gifts = fals
      * @param bool $gifts
      * @return null|Transfer
      */
-    public function paid(Product $product, bool $gifts = false): ?Transfer
+    public function paid(Product $product, bool $gifts = null): ?Transfer
     {
         $status = [Transfer::STATUS_PAID];
         if ($gifts) {
@@ -156,7 +156,7 @@ public function paid(Product $product, bool $gifts = false): ?Transfer
          * @var Model $product
          * @var Transfer $query
          */
-        $query = $this->holderTransfers();
+        $query = $this->transfers();
         return $query
             ->where('to_type', $product->getMorphClass())
             ->where('to_id', $product->getKey())
@@ -171,7 +171,7 @@ public function paid(Product $product, bool $gifts = false): ?Transfer
      * @return bool
      * @throws
      */
-    public function forceRefund(Product $product, bool $gifts = false): bool
+    public function forceRefund(Product $product, bool $gifts = null): bool
     {
         return $this->refund($product, true, $gifts);
     }
@@ -181,7 +181,7 @@ public function forceRefund(Product $product, bool $gifts = false): bool
      * @param bool $force
      * @return bool
      */
-    public function safeRefundGift(Product $product, bool $force = false): bool
+    public function safeRefundGift(Product $product, bool $force = null): bool
     {
         try {
             return $this->refundGift($product, $force);
@@ -195,7 +195,7 @@ public function safeRefundGift(Product $product, bool $force = false): bool
      * @param bool $force
      * @return bool
      */
-    public function refundGift(Product $product, bool $force = false): bool
+    public function refundGift(Product $product, bool $force = null): bool
     {
         return $this->refund($product, $force, true);
     }

src/Traits/CanPayFloat.php

@@ -17,7 +17,6 @@ trait CanPayFloat
         CanPay::assemble insteadof HasWalletFloat;
         CanPay::change insteadof HasWalletFloat;
         CanPay::transactions insteadof HasWalletFloat;
-        CanPay::holderTransfers insteadof HasWalletFloat;
         CanPay::transfers insteadof HasWalletFloat;
         CanPay::wallet insteadof HasWalletFloat;
         CanPay::getBalanceAttribute insteadof HasWalletFloat;

src/Traits/HasGift.php

@@ -25,7 +25,7 @@ trait HasGift
      * @param bool $force
      * @return Transfer|null
      */
-    public function safeGift(Wallet $to, Product $product, bool $force = false): ?Transfer
+    public function safeGift(Wallet $to, Product $product, bool $force = null): ?Transfer
     {
         try {
             return $this->gift($to, $product, $force);
@@ -44,7 +44,7 @@ public function safeGift(Wallet $to, Product $product, bool $force = false): ?Tr
      * @param bool $force
      * @return Transfer
      */
-    public function gift(Wallet $to, Product $product, bool $force = false): Transfer
+    public function gift(Wallet $to, Product $product, bool $force = null): Transfer
     {
         /**
          * Who's giving? Let's call him Santa Claus

src/Traits/HasWallet.php

@@ -267,8 +267,8 @@ protected function assemble(Wallet $wallet, Transaction $withdraw, Transaction $
             'status' => $status,
             'deposit_id' => $deposit->getKey(),
             'withdraw_id' => $withdraw->getKey(),
-            'from_type' => $this->getMorphClass(),
-            'from_id' => $this->getKey(),
+            'from_type' => ($this instanceof WalletModel ? $this : $this->wallet)->getMorphClass(),
+            'from_id' => ($this instanceof WalletModel ? $this : $this->wallet)->getKey(),
             'to_type' => $wallet->getMorphClass(),
             'to_id' => $wallet->getKey(),
             'fee' => \abs($withdraw->amount) - \abs($deposit->amount),
@@ -296,22 +296,6 @@ 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
-    {
-        if ($this instanceof WalletModel) {
-            return $this->holder->transfers();
-        }
-
-        return $this->transfers();
-    }
-
     /**
      * the transfer table is used to confirm the payment
      * this method receives all transfers
@@ -320,6 +304,10 @@ public function holderTransfers(): MorphMany
      */
     public function transfers(): MorphMany
     {
+        if (!($this instanceof WalletModel)) {
+            return $this->wallet->transfers();
+        }
+
         return $this->morphMany(config('wallet.transfer.model'), 'from');
     }
 
@@ -331,7 +319,7 @@ public function transfers(): MorphMany
      */
     public function wallet(): MorphOne
     {
-        return ($this instanceof WalletModel ? $this->holder : $this)
+        return $this
             ->morphOne(config('wallet.wallet.model'), 'holder')
             ->where('slug', config('wallet.wallet.default.slug'))
             ->withDefault([

src/Traits/HasWallets.php

@@ -29,7 +29,7 @@ trait HasWallets
     /**
      * @var bool
      */
-    private $_loadedWallets = false;
+    private $_loadedWallets;
 
     /**
      * Get wallet by slug

tests/Models/Item.php

@@ -31,7 +31,7 @@ class Item extends Model implements Product
      *
      * @return bool
      */
-    public function canBuy(Customer $customer, bool $force = false): bool
+    public function canBuy(Customer $customer, bool $force = null): bool
     {
         $result = $this->quantity > 0;
 

tests/MultiWalletTest.php

@@ -2,8 +2,11 @@
 
 namespace Bavix\Wallet\Test;
 
+use Bavix\Wallet\Exceptions\AmountInvalid;
+use Bavix\Wallet\Exceptions\BalanceIsEmpty;
 use Bavix\Wallet\Models\Transfer;
 use Bavix\Wallet\Test\Models\UserMulti;
+use Illuminate\Database\QueryException;
 
 class MultiWalletTest extends TestCase
 {
@@ -45,10 +48,11 @@ public function testDeposit(): void
 
     /**
      * @return void
-     * @expectedException \Bavix\Wallet\Exceptions\AmountInvalid
      */
     public function testInvalidDeposit(): void
     {
+        $this->expectException(AmountInvalid::class);
+
         /**
          * @var UserMulti $user
          */
@@ -62,10 +66,11 @@ public function testInvalidDeposit(): void
 
     /**
      * @return void
-     * @expectedException \Bavix\Wallet\Exceptions\BalanceIsEmpty
      */
     public function testWithdraw(): void
     {
+        $this->expectException(BalanceIsEmpty::class);
+
         /**
          * @var UserMulti $user
          */
@@ -93,10 +98,11 @@ public function testWithdraw(): void
 
     /**
      * @return void
-     * @expectedException \Bavix\Wallet\Exceptions\BalanceIsEmpty
      */
     public function testInvalidWithdraw(): void
     {
+        $this->expectException(BalanceIsEmpty::class);
+
         /**
          * @var UserMulti $user
          */
@@ -199,10 +205,11 @@ public function testTransferYourself(): void
 
     /**
      * @return void
-     * @expectedException \Bavix\Wallet\Exceptions\BalanceIsEmpty
      */
     public function testBalanceIsEmpty(): void
     {
+        $this->expectException(BalanceIsEmpty::class);
+
         /**
          * @var UserMulti $user
          */
@@ -241,10 +248,12 @@ public function testConfirmed(): void
     }
 
     /**
-     * @expectedException \Illuminate\Database\QueryException
+     * @return void
      */
     public function testWalletUnique(): void
     {
+        $this->expectException(QueryException::class);
+
         /**
          * @var UserMulti $user
          */

tests/ProductTest.php

@@ -2,6 +2,7 @@
 
 namespace Bavix\Wallet\Test;
 
+use Bavix\Wallet\Exceptions\ProductEnded;
 use Bavix\Wallet\Models\Transaction;
 use Bavix\Wallet\Models\Transfer;
 use Bavix\Wallet\Test\Models\Buyer;
@@ -48,7 +49,7 @@ public function testPay(): void
         $this->assertEquals($buyer->getKey(), $withdraw->payable->getKey());
         $this->assertEquals($product->getKey(), $deposit->payable->getKey());
 
-        $this->assertInstanceOf(Buyer::class, $transfer->from);
+        $this->assertInstanceOf(Buyer::class, $transfer->from->holder);
         $this->assertInstanceOf(Item::class, $transfer->to);
 
         $this->assertEquals($buyer->getKey(), $transfer->from->getKey());
@@ -133,10 +134,11 @@ public function testForceRefund(): void
 
     /**
      * @return void
-     * @expectedException \Bavix\Wallet\Exceptions\ProductEnded
      */
     public function testOutOfStock(): void
     {
+        $this->expectException(ProductEnded::class);
+
         /**
          * @var Buyer $buyer
          * @var Item $product
@@ -204,10 +206,11 @@ public function testPayFree(): void
 
     /**
      * @return void
-     * @expectedException \Bavix\Wallet\Exceptions\ProductEnded
      */
     public function testPayFreeOutOfStock(): void
     {
+        $this->expectException(ProductEnded::class);
+
         /**
          * @var Buyer $buyer
          * @var Item $product