Merge remote-tracking branch 'remotes/origin/master' into storable

# Conflicts:
#	src/Services/WalletService.php
#	src/WalletServiceProvider.php

Author: Babichev Maxim

.phpstorm.meta.php

@@ -7,12 +7,20 @@
     use Bavix\Wallet\Models\Transaction;
     use Bavix\Wallet\Models\Transfer;
     use Bavix\Wallet\Models\Wallet;
+    use Bavix\Wallet\Objects\Bring;
+    use Bavix\Wallet\Objects\Cart;
+    use Bavix\Wallet\Objects\EmptyLock;
+    use Bavix\Wallet\Objects\Operation;
     use Bavix\Wallet\Services\CommonService;
     use Bavix\Wallet\Services\ExchangeService;
     use Bavix\Wallet\Services\ProxyService;
     use Bavix\Wallet\Services\WalletService;
 
     override(\app(0), map([
+        Cart::class => Cart::class,
+        Bring::class => Bring::class,
+        Operation::class => Operation::class,
+        EmptyLock::class => EmptyLock::class,
         ExchangeService::class => ExchangeService::class,
         CommonService::class => CommonService::class,
         ProxyService::class => ProxyService::class,

changelog.md

@@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [3.3.0] - 2019-09-10
+### Added
+- Added the ability to easily overload the main classes #106
+
 ## [3.2.1] - 2019-09-10
 ### Fixed
 - Fixed calculation of commission for exchange #101 @haojingliu 
@@ -399,7 +403,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/3.2.1...HEAD
+[Unreleased]: https://github.com/bavix/laravel-wallet/compare/3.3.0...HEAD
+[3.3.0]: https://github.com/bavix/laravel-wallet/compare/3.2.1...3.3.0
 [3.2.1]: https://github.com/bavix/laravel-wallet/compare/3.2.0...3.2.1
 [3.2.0]: https://github.com/bavix/laravel-wallet/compare/3.1.6...3.2.0
 [3.1.6]: https://github.com/bavix/laravel-wallet/compare/3.1.5...3.1.6

config/config.php

@@ -1,5 +1,9 @@
 <?php
 
+use Bavix\Wallet\Objects\Bring;
+use Bavix\Wallet\Objects\Cart;
+use Bavix\Wallet\Objects\EmptyLock;
+use Bavix\Wallet\Objects\Operation;
 use Bavix\Wallet\Services\ExchangeService;
 use Bavix\Wallet\Services\CommonService;
 use Bavix\Wallet\Services\ProxyService;
@@ -53,6 +57,13 @@
         'lock' => LockService::class,
     ],
 
+    'objects' => [
+        'bring' => Bring::class,
+        'cart' => Cart::class,
+        'emptyLock' => EmptyLock::class,
+        'operation' => Operation::class,
+    ],
+
     /**
      * Transaction model configuration.
      */

src/Commands/RefreshBalance.php

@@ -13,7 +13,7 @@
 /**
  * Class RefreshBalance
  * @package Bavix\Wallet\Commands
- * @codeCoverageIgnore 
+ * @codeCoverageIgnore
  */
 class RefreshBalance extends Command
 {

src/Objects/Cart.php

@@ -25,6 +25,7 @@ class Cart implements Countable
 
     /**
      * @return static
+     * @deprecated use app(Cart::class)
      */
     public static function make(): self
     {

src/Objects/EmptyLock.php

@@ -16,7 +16,7 @@ class EmptyLock implements Lock
     /**
      * Attempt to acquire the lock.
      *
-     * @param  callable|null  $callback
+     * @param callable|null $callback
      * @return mixed
      */
     public function get($callback = null)
@@ -31,8 +31,8 @@ public function get($callback = null)
     /**
      * Attempt to acquire the lock for the given number of seconds.
      *
-     * @param  int  $seconds
-     * @param  callable|null  $callback
+     * @param int $seconds
+     * @param callable|null $callback
      * @return bool
      */
     public function block($seconds, $callback = null): bool

src/Services/CommonService.php

@@ -54,7 +54,7 @@ public function forceTransfer(Wallet $from, Wallet $to, int $amount, ?array $met
                 ->getWallet($from);
 
             $transfers = $this->multiBrings([
-                (new Bring())
+                app(Bring::class)
                     ->setStatus($status)
                     ->setDeposit($deposit)
                     ->setWithdraw($withdraw)
@@ -85,7 +85,7 @@ public function forceWithdraw(Wallet $wallet, int $amount, ?array $meta, bool $c
             $wallet = $walletService->getWallet($wallet);
 
             $transactions = $this->multiOperation($wallet, [
-                (new Operation())
+                app(Operation::class)
                     ->setType(Transaction::TYPE_WITHDRAW)
                     ->setConfirmed($confirmed)
                     ->setAmount(-$amount)
@@ -115,7 +115,7 @@ public function deposit(Wallet $wallet, int $amount, ?array $meta, bool $confirm
             $wallet = $walletService->getWallet($wallet);
 
             $transactions = $this->multiOperation($wallet, [
-                (new Operation())
+                app(Operation::class)
                     ->setType(Transaction::TYPE_DEPOSIT)
                     ->setConfirmed($confirmed)
                     ->setAmount($amount)

src/Services/LockService.php

@@ -34,7 +34,7 @@ public function __construct()
      */
     public function lock($self, string $name, \Closure $closure)
     {
-        return $this->lockProvider($self, $name, (int) config('wallet.lock.seconds'))
+        return $this->lockProvider($self, $name, (int)config('wallet.lock.seconds'))
             ->get($this->bindTo($self, $closure));
     }
 
@@ -88,7 +88,7 @@ protected function lockProvider($self, string $name, int $seconds): Lock
         }
         // @codeCoverageIgnoreEnd
 
-        return new EmptyLock();
+        return app(EmptyLock::class);
     }
 
 }

src/Services/WalletService.php

@@ -35,7 +35,7 @@ public function fee(Wallet $wallet, int $amount): int
     {
         $fee = 0;
         if ($wallet instanceof Taxable) {
-            $fee = (int) ($amount * $wallet->getFeePercent() / 100);
+            $fee = (int)($amount * $wallet->getFeePercent() / 100);
         }
 
         /**

src/Traits/CanExchange.php

@@ -62,7 +62,7 @@ public function forceExchange(Wallet $to, int $amount, ?array $meta = null): Tra
                     ->deposit($to, $amount * $rate, $meta);
 
                 $transfers = app(CommonService::class)->multiBrings([
-                    (new Bring())
+                    app(Bring::class)
                         ->setStatus(Transfer::STATUS_EXCHANGE)
                         ->setDeposit($deposit)
                         ->setWithdraw($withdraw)