Added default values to avoid upgrade errors

Babichev Maxim · Babichev Maxim · commit 57e1d214f1ee · 2019-10-03T14:24:41.000+03:00
diff --git a/src/Commands/RefreshBalance.php b/src/Commands/RefreshBalance.php
@@ -39,7 +39,7 @@ public function handle(): void
     {
         app(ProxyService::class)->fresh();
         app(DbService::class)->transaction(function () {
-            $wallet = config('wallet.wallet.table');
+            $wallet = config('wallet.wallet.table', 'wallets');
             app(DbService::class)
                 ->connection()
                 ->table($wallet)
@@ -72,8 +72,8 @@ protected function sqliteUpdate(): void
      */
     protected function multiUpdate(): void
     {
-        $wallet = config('wallet.wallet.table');
-        $trans = config('wallet.transaction.table');
+        $wallet = config('wallet.wallet.table', 'wallets');
+        $trans = config('wallet.transaction.table', 'transactions');
         $availableBalance = app(DbService::class)
             ->connection()
             ->table($trans)
diff --git a/src/Models/Transaction.php b/src/Models/Transaction.php
@@ -58,7 +58,7 @@ class Transaction extends Model
     public function getTable(): string
     {
         if (!$this->table) {
-            $this->table = config('wallet.transaction.table');
+            $this->table = config('wallet.transaction.table', 'transactions');
         }
 
         return parent::getTable();
@@ -77,7 +77,7 @@ public function payable(): MorphTo
      */
     public function wallet(): BelongsTo
     {
-        return $this->belongsTo(config('wallet.wallet.model'));
+        return $this->belongsTo(config('wallet.wallet.model', WalletModel::class));
     }
 
 }
diff --git a/src/Models/Transfer.php b/src/Models/Transfer.php
@@ -54,7 +54,7 @@ class Transfer extends Model
     public function getTable(): string
     {
         if (!$this->table) {
-            $this->table = config('wallet.transfer.table');
+            $this->table = config('wallet.transfer.table', 'transfers');
         }
 
         return parent::getTable();
diff --git a/src/Models/Wallet.php b/src/Models/Wallet.php
@@ -64,7 +64,7 @@ class Wallet extends Model implements Customer, WalletFloat, Confirmable, Exchan
     public function getTable(): string
     {
         if (!$this->table) {
-            $this->table = config('wallet.wallet.table');
+            $this->table = config('wallet.wallet.table', 'wallets');
         }
 
         return parent::getTable();
diff --git a/src/Traits/HasWallet.php b/src/Traits/HasWallet.php
@@ -85,7 +85,7 @@ public function getBalanceAttribute(): int
     public function transactions(): MorphMany
     {
         return ($this instanceof WalletModel ? $this->holder : $this)
-            ->morphMany(config('wallet.transaction.model'), 'payable');
+            ->morphMany(config('wallet.transaction.model', Transaction::class), 'payable');
     }
 
     /**
@@ -202,7 +202,7 @@ public function transfers(): MorphMany
     {
         return app(WalletService::class)
             ->getWallet($this, false)
-            ->morphMany(config('wallet.transfer.model'), 'from');
+            ->morphMany(config('wallet.transfer.model', Transfer::class), 'from');
     }
 
 }
diff --git a/src/Traits/HasWallets.php b/src/Traits/HasWallets.php
@@ -74,7 +74,7 @@ public function getWallet(string $slug): ?WalletModel
      */
     public function wallets(): MorphMany
     {
-        return $this->morphMany(config('wallet.wallet.model'), 'holder');
+        return $this->morphMany(config('wallet.wallet.model', WalletModel::class), 'holder');
     }
 
     /**
diff --git a/src/Traits/MorphOneWallet.php b/src/Traits/MorphOneWallet.php
@@ -22,11 +22,11 @@ trait MorphOneWallet
     public function wallet(): MorphOne
     {
         return ($this instanceof WalletModel ? $this->holder : $this)
-            ->morphOne(config('wallet.wallet.model'), 'holder')
-            ->where('slug', config('wallet.wallet.default.slug'))
+            ->morphOne(config('wallet.wallet.model', WalletModel::class), 'holder')
+            ->where('slug', config('wallet.wallet.default.slug', 'default'))
             ->withDefault([
-                'name' => config('wallet.wallet.default.name'),
-                'slug' => config('wallet.wallet.default.slug'),
+                'name' => config('wallet.wallet.default.name', 'Default Wallet'),
+                'slug' => config('wallet.wallet.default.slug', 'default'),
                 'balance' => 0,
             ]);
     }
diff --git a/src/WalletServiceProvider.php b/src/WalletServiceProvider.php
@@ -18,6 +18,8 @@
 use Bavix\Wallet\Services\LockService;
 use Bavix\Wallet\Services\ProxyService;
 use Bavix\Wallet\Services\WalletService;
+use Bavix\Wallet\Simple\Rate;
+use Bavix\Wallet\Simple\Store;
 use Illuminate\Support\ServiceProvider;
 use function config;
 use function dirname;
@@ -83,25 +85,25 @@ public function register(): void
         );
 
         // Bind eloquent models to IoC container
-        $this->app->singleton(Rateable::class, config('wallet.package.rateable'));
-        $this->app->singleton(Storable::class, config('wallet.package.storable'));
-        $this->app->singleton(DbService::class, config('wallet.services.db'));
-        $this->app->singleton(ExchangeService::class, config('wallet.services.exchange'));
-        $this->app->singleton(CommonService::class, config('wallet.services.common'));
-        $this->app->singleton(ProxyService::class, config('wallet.services.proxy'));
-        $this->app->singleton(WalletService::class, config('wallet.services.wallet'));
-        $this->app->singleton(LockService::class, config('wallet.services.lock'));
+        $this->app->singleton(Rateable::class, config('wallet.package.rateable', Rate::class));
+        $this->app->singleton(Storable::class, config('wallet.package.storable', Store::class));
+        $this->app->singleton(DbService::class, config('wallet.services.db', DbService::class));
+        $this->app->singleton(ExchangeService::class, config('wallet.services.exchange', ExchangeService::class));
+        $this->app->singleton(CommonService::class, config('wallet.services.common', CommonService::class));
+        $this->app->singleton(ProxyService::class, config('wallet.services.proxy', ProxyService::class));
+        $this->app->singleton(WalletService::class, config('wallet.services.wallet', WalletService::class));
+        $this->app->singleton(LockService::class, config('wallet.services.lock', LockService::class));
 
         // models
-        $this->app->bind(Transaction::class, config('wallet.transaction.model'));
-        $this->app->bind(Transfer::class, config('wallet.transfer.model'));
-        $this->app->bind(Wallet::class, config('wallet.wallet.model'));
+        $this->app->bind(Transaction::class, config('wallet.transaction.model', Transaction::class));
+        $this->app->bind(Transfer::class, config('wallet.transfer.model', Transfer::class));
+        $this->app->bind(Wallet::class, config('wallet.wallet.model', Wallet::class));
 
         // object's
-        $this->app->bind(Bring::class, config('wallet.objects.bring'));
-        $this->app->bind(Cart::class, config('wallet.objects.cart'));
-        $this->app->bind(EmptyLock::class, config('wallet.objects.emptyLock'));
-        $this->app->bind(Operation::class, config('wallet.objects.operation'));
+        $this->app->bind(Bring::class, config('wallet.objects.bring', Bring::class));
+        $this->app->bind(Cart::class, config('wallet.objects.cart', Cart::class));
+        $this->app->bind(EmptyLock::class, config('wallet.objects.emptyLock', EmptyLock::class));
+        $this->app->bind(Operation::class, config('wallet.objects.operation', Operation::class));
     }
 
 }

Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ class Transaction extends Model`
`58`	`58`	`public function getTable(): string`
`59`	`59`	`{`
`60`	`60`	`if (!$this->table) {`
`61`		`- $this->table = config('wallet.transaction.table');`
	`61`	`+ $this->table = config('wallet.transaction.table', 'transactions');`
`62`	`62`	`}`
`63`	`63`
`64`	`64`	`return parent::getTable();`
`@@ -77,7 +77,7 @@ public function payable(): MorphTo`
`77`	`77`	`*/`
`78`	`78`	`public function wallet(): BelongsTo`
`79`	`79`	`{`
`80`		`- return $this->belongsTo(config('wallet.wallet.model'));`
	`80`	`+ return $this->belongsTo(config('wallet.wallet.model', WalletModel::class));`
`81`	`81`	`}`
`82`	`82`
`83`	`83`	`}`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ class Transfer extends Model`
`54`	`54`	`public function getTable(): string`
`55`	`55`	`{`
`56`	`56`	`if (!$this->table) {`
`57`		`- $this->table = config('wallet.transfer.table');`
	`57`	`+ $this->table = config('wallet.transfer.table', 'transfers');`
`58`	`58`	`}`
`59`	`59`
`60`	`60`	`return parent::getTable();`
Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ class Wallet extends Model implements Customer, WalletFloat, Confirmable, Exchan`
`64`	`64`	`public function getTable(): string`
`65`	`65`	`{`
`66`	`66`	`if (!$this->table) {`
`67`		`- $this->table = config('wallet.wallet.table');`
	`67`	`+ $this->table = config('wallet.wallet.table', 'wallets');`
`68`	`68`	`}`
`69`	`69`
`70`	`70`	`return parent::getTable();`
Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,7 @@ public function getBalanceAttribute(): int`
`85`	`85`	`public function transactions(): MorphMany`
`86`	`86`	`{`
`87`	`87`	`return ($this instanceof WalletModel ? $this->holder : $this)`
`88`		`- ->morphMany(config('wallet.transaction.model'), 'payable');`
	`88`	`+ ->morphMany(config('wallet.transaction.model', Transaction::class), 'payable');`
`89`	`89`	`}`
`90`	`90`
`91`	`91`	`/**`
`@@ -202,7 +202,7 @@ public function transfers(): MorphMany`
`202`	`202`	`{`
`203`	`203`	`return app(WalletService::class)`
`204`	`204`	`->getWallet($this, false)`
`205`		`- ->morphMany(config('wallet.transfer.model'), 'from');`
	`205`	`+ ->morphMany(config('wallet.transfer.model', Transfer::class), 'from');`
`206`	`206`	`}`
`207`	`207`
`208`	`208`	`}`
Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ public function getWallet(string $slug): ?WalletModel`
`74`	`74`	`*/`
`75`	`75`	`public function wallets(): MorphMany`
`76`	`76`	`{`
`77`		`- return $this->morphMany(config('wallet.wallet.model'), 'holder');`
	`77`	`+ return $this->morphMany(config('wallet.wallet.model', WalletModel::class), 'holder');`
`78`	`78`	`}`
`79`	`79`
`80`	`80`	`/**`