Revert "draft config"

rez1dent3 · rez1dent3 · commit f2ca3bb52a25 · 2022-09-03T21:09:56.000+03:00
This reverts commit 0a42314.
diff --git a/config/config.php b/config/config.php
@@ -19,7 +19,6 @@
 use Bavix\Wallet\Internal\Repository\TransferRepository;
 use Bavix\Wallet\Internal\Repository\WalletRepository;
 use Bavix\Wallet\Internal\Service\ClockService;
-use Bavix\Wallet\Internal\Service\ConfigService;
 use Bavix\Wallet\Internal\Service\DatabaseService;
 use Bavix\Wallet\Internal\Service\DispatcherService;
 use Bavix\Wallet\Internal\Service\JsonService;
@@ -81,7 +80,6 @@
      */
     'internal' => [
         'clock' => ClockService::class,
-        'config' => ConfigService::class,
         'database' => DatabaseService::class,
         'dispatcher' => DispatcherService::class,
         'json' => JsonService::class,
diff --git a/deptrac.yaml b/deptrac.yaml
@@ -201,7 +201,7 @@ parameters:
       - RepositoryInterface
       - TransformInterface
       - InternalException
-      - ServiceInterface # json&config service only
+      - ServiceInterface # json service only
       - QueryInterface
       - DtoInterface
       - UIException
diff --git a/src/Internal/Repository/WalletRepository.php b/src/Internal/Repository/WalletRepository.php
@@ -6,14 +6,12 @@
 
 use Bavix\Wallet\Internal\Exceptions\ExceptionInterface;
 use Bavix\Wallet\Internal\Exceptions\ModelNotFoundException;
-use Bavix\Wallet\Internal\Service\ConfigServiceInterface;
 use Bavix\Wallet\Models\Wallet;
 use Illuminate\Database\Eloquent\ModelNotFoundException as EloquentModelNotFoundException;
 
 final class WalletRepository implements WalletRepositoryInterface
 {
     public function __construct(
-        private ConfigServiceInterface $configService,
         private Wallet $wallet
     ) {
     }
@@ -93,7 +91,7 @@ public function getBySlug(string $holderType, int|string $holderId, string $slug
     public function findDefaultAll(string $holderType, array $holderIds): array
     {
         return $this->wallet->newQuery()
-            ->where('slug', $this->configService->getString('wallet.wallet.default.slug', 'default'))
+            ->where('slug', config('wallet.wallet.default.slug', 'default'))
             ->where('holder_type', $holderType)
             ->whereIn('holder_id', $holderIds)
             ->get()
diff --git a/src/Internal/Service/ConfigService.php b/src/Internal/Service/ConfigService.php
diff --git a/src/Internal/Service/ConfigServiceInterface.php b/src/Internal/Service/ConfigServiceInterface.php
diff --git a/src/Models/Transaction.php b/src/Models/Transaction.php
@@ -5,10 +5,10 @@
 namespace Bavix\Wallet\Models;
 
 use Bavix\Wallet\Interfaces\Wallet;
-use Bavix\Wallet\Internal\Service\ConfigServiceInterface;
 use Bavix\Wallet\Internal\Service\MathServiceInterface;
 use Bavix\Wallet\Models\Wallet as WalletModel;
 use Bavix\Wallet\Services\CastServiceInterface;
+use function config;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\MorphTo;
@@ -61,7 +61,7 @@ class Transaction extends Model
     public function getTable(): string
     {
         if ((string) $this->table === '') {
-            $this->table = app(ConfigServiceInterface::class)->getString('wallet.transaction.table', 'transactions');
+            $this->table = config('wallet.transaction.table', 'transactions');
         }
 
         return parent::getTable();
@@ -74,9 +74,7 @@ public function payable(): MorphTo
 
     public function wallet(): BelongsTo
     {
-        return $this->belongsTo(
-            app(ConfigServiceInterface::class)->getClass('wallet.wallet.model', WalletModel::class)
-        );
+        return $this->belongsTo(config('wallet.wallet.model', WalletModel::class));
     }
 
     public function getAmountIntAttribute(): int
diff --git a/src/Models/Transfer.php b/src/Models/Transfer.php
@@ -4,7 +4,7 @@
 
 namespace Bavix\Wallet\Models;
 
-use Bavix\Wallet\Internal\Service\ConfigServiceInterface;
+use function config;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\MorphTo;
@@ -67,7 +67,7 @@ class Transfer extends Model
     public function getTable(): string
     {
         if ((string) $this->table === '') {
-            $this->table = app(ConfigServiceInterface::class)->getString('wallet.transfer.table', 'transfers');
+            $this->table = config('wallet.transfer.table', 'transfers');
         }
 
         return parent::getTable();
diff --git a/src/Models/Wallet.php b/src/Models/Wallet.php
@@ -13,7 +13,6 @@
 use Bavix\Wallet\Internal\Exceptions\ExceptionInterface;
 use Bavix\Wallet\Internal\Exceptions\LockProviderNotFoundException;
 use Bavix\Wallet\Internal\Exceptions\TransactionFailedException;
-use Bavix\Wallet\Internal\Service\ConfigServiceInterface;
 use Bavix\Wallet\Internal\Service\MathServiceInterface;
 use Bavix\Wallet\Internal\Service\UuidFactoryServiceInterface;
 use Bavix\Wallet\Services\AtomicServiceInterface;
@@ -22,6 +21,7 @@
 use Bavix\Wallet\Traits\CanExchange;
 use Bavix\Wallet\Traits\CanPayFloat;
 use Bavix\Wallet\Traits\HasGift;
+use function config;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\MorphTo;
 use Illuminate\Database\RecordsNotFoundException;
@@ -83,7 +83,7 @@ class Wallet extends Model implements Customer, WalletFloat, Confirmable, Exchan
     public function getTable(): string
     {
         if ((string) $this->table === '') {
-            $this->table = app(ConfigServiceInterface::class)->getString('wallet.wallet.table', 'wallets');
+            $this->table = config('wallet.wallet.table', 'wallets');
         }
 
         return parent::getTable();
diff --git a/src/Services/AtomicServiceInterface.php b/src/Services/AtomicServiceInterface.php
@@ -14,6 +14,7 @@ interface AtomicServiceInterface
 {
     /**
      * @template T
+     * @param Wallet $object
      * @param callable(): T $callback
      * @return T
      *
diff --git a/src/Services/WalletService.php b/src/Services/WalletService.php
@@ -7,7 +7,6 @@
 use Bavix\Wallet\Internal\Assembler\WalletCreatedEventAssemblerInterface;
 use Bavix\Wallet\Internal\Exceptions\ModelNotFoundException;
 use Bavix\Wallet\Internal\Repository\WalletRepositoryInterface;
-use Bavix\Wallet\Internal\Service\ConfigServiceInterface;
 use Bavix\Wallet\Internal\Service\DispatcherServiceInterface;
 use Bavix\Wallet\Internal\Service\UuidFactoryServiceInterface;
 use Bavix\Wallet\Models\Wallet;
@@ -22,15 +21,14 @@ public function __construct(
         private WalletCreatedEventAssemblerInterface $walletCreatedEventAssembler,
         private UuidFactoryServiceInterface $uuidFactoryService,
         private DispatcherServiceInterface $dispatcherService,
-        private WalletRepositoryInterface $walletRepository,
-        private ConfigServiceInterface $configService
+        private WalletRepositoryInterface $walletRepository
     ) {
     }
 
     public function create(Model $model, array $data): Wallet
     {
         $wallet = $this->walletRepository->create(array_merge(
-            $this->configService->getArray('wallet.wallet.creating'),
+            config('wallet.wallet.creating', []),
             [
                 'uuid' => $this->uuidFactoryService->uuid4(),
             ],
diff --git a/src/Traits/HasWallet.php b/src/Traits/HasWallet.php
@@ -13,7 +13,6 @@
 use Bavix\Wallet\Internal\Exceptions\ExceptionInterface;
 use Bavix\Wallet\Internal\Exceptions\LockProviderNotFoundException;
 use Bavix\Wallet\Internal\Exceptions\TransactionFailedException;
-use Bavix\Wallet\Internal\Service\ConfigServiceInterface;
 use Bavix\Wallet\Internal\Service\MathServiceInterface;
 use Bavix\Wallet\Models\Transaction;
 use Bavix\Wallet\Models\Transfer;
@@ -25,6 +24,7 @@
 use Bavix\Wallet\Services\RegulatorServiceInterface;
 use Bavix\Wallet\Services\TransactionServiceInterface;
 use Bavix\Wallet\Services\TransferServiceInterface;
+use function config;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\Relations\MorphMany;
 use Illuminate\Database\RecordsNotFoundException;
@@ -82,10 +82,7 @@ public function walletTransactions(): HasMany
     {
         return app(CastServiceInterface::class)
             ->getWallet($this, false)
-            ->hasMany(
-                app(ConfigServiceInterface::class)->getClass('wallet.transaction.model', Transaction::class),
-                'wallet_id'
-            )
+            ->hasMany(config('wallet.transaction.model', Transaction::class), 'wallet_id')
         ;
     }
 
@@ -96,10 +93,7 @@ public function transactions(): MorphMany
     {
         return app(CastServiceInterface::class)
             ->getHolder($this)
-            ->morphMany(
-                app(ConfigServiceInterface::class)->getClass('wallet.transaction.model', Transaction::class),
-                'payable'
-            )
+            ->morphMany(config('wallet.transaction.model', Transaction::class), 'payable')
         ;
     }
 
@@ -223,7 +217,7 @@ public function transfers(): MorphMany
         /** @var Wallet $this */
         return app(CastServiceInterface::class)
             ->getWallet($this, false)
-            ->morphMany(app(ConfigServiceInterface::class)->getClass('wallet.transfer.model', Transfer::class), 'from')
+            ->morphMany(config('wallet.transfer.model', Transfer::class), 'from')
         ;
     }
 }
diff --git a/src/Traits/HasWallets.php b/src/Traits/HasWallets.php
@@ -6,7 +6,6 @@
 
 use function array_key_exists;
 use Bavix\Wallet\Internal\Exceptions\ModelNotFoundException;
-use Bavix\Wallet\Internal\Service\ConfigServiceInterface;
 use Bavix\Wallet\Models\Wallet as WalletModel;
 use Bavix\Wallet\Services\WalletServiceInterface;
 use function config;
@@ -83,10 +82,7 @@ public function getWalletOrFail(string $slug): WalletModel
      */
     public function wallets(): MorphMany
     {
-        return $this->morphMany(
-            app(ConfigServiceInterface::class)->getClass('wallet.wallet.model', WalletModel::class),
-            'holder'
-        );
+        return $this->morphMany(config('wallet.wallet.model', WalletModel::class), 'holder');
     }
 
     public function createWallet(array $data): WalletModel
diff --git a/src/Traits/MorphOneWallet.php b/src/Traits/MorphOneWallet.php
@@ -4,7 +4,6 @@
 
 namespace Bavix\Wallet\Traits;
 
-use Bavix\Wallet\Internal\Service\ConfigServiceInterface;
 use Bavix\Wallet\Models\Wallet as WalletModel;
 use Bavix\Wallet\Services\CastServiceInterface;
 use Illuminate\Database\Eloquent\Relations\MorphOne;
@@ -22,21 +21,24 @@ trait MorphOneWallet
      */
     public function wallet(): MorphOne
     {
-        $configService = app(ConfigServiceInterface::class);
         $castService = app(CastServiceInterface::class);
-        $related = $configService->getClass('wallet.wallet.model', WalletModel::class);
-        $slug = $configService->getString('wallet.wallet.default.slug', 'default');
+        /** @var class-string $related */
+        $related = config('wallet.wallet.model', WalletModel::class);
+        assert(is_string($related));
+
+        $slug = config('wallet.wallet.default.slug', 'default');
+        assert(is_string($slug));
 
         return $castService
             ->getHolder($this)
             ->morphOne($related, 'holder')
             ->where('slug', $slug)
-            ->withDefault(static function (WalletModel $wallet, object $holder) use ($configService, $castService) {
+            ->withDefault(static function (WalletModel $wallet, object $holder) use ($castService) {
                 $model = $castService->getModel($holder);
-                $wallet->forceFill(array_merge($configService->getArray('wallet.wallet.creating'), [
-                    'name' => $configService->getString('wallet.wallet.default.name', 'Default Wallet'),
-                    'slug' => $configService->getString('wallet.wallet.default.slug', 'default'),
-                    'meta' => $configService->getArray('wallet.wallet.default.meta'),
+                $wallet->forceFill(array_merge((array) config('wallet.wallet.creating', []), [
+                    'name' => config('wallet.wallet.default.name', 'Default Wallet'),
+                    'slug' => config('wallet.wallet.default.slug', 'default'),
+                    'meta' => config('wallet.wallet.default.meta', []),
                     'balance' => 0,
                 ]));
 
diff --git a/src/WalletServiceProvider.php b/src/WalletServiceProvider.php
@@ -41,8 +41,6 @@
 use Bavix\Wallet\Internal\Repository\WalletRepositoryInterface;
 use Bavix\Wallet\Internal\Service\ClockService;
 use Bavix\Wallet\Internal\Service\ClockServiceInterface;
-use Bavix\Wallet\Internal\Service\ConfigService;
-use Bavix\Wallet\Internal\Service\ConfigServiceInterface;
 use Bavix\Wallet\Internal\Service\DatabaseService;
 use Bavix\Wallet\Internal\Service\DatabaseServiceInterface;
 use Bavix\Wallet\Internal\Service\DispatcherService;
@@ -205,7 +203,6 @@ private function internal(array $configure): void
         $this->app->bind(StorageServiceInterface::class, $configure['storage'] ?? StorageService::class);
 
         $this->app->singleton(ClockServiceInterface::class, $configure['clock'] ?? ClockService::class);
-        $this->app->singleton(ConfigServiceInterface::class, $configure['config'] ?? ConfigService::class);
         $this->app->singleton(DatabaseServiceInterface::class, $configure['database'] ?? DatabaseService::class);
         $this->app->singleton(DispatcherServiceInterface::class, $configure['dispatcher'] ?? DispatcherService::class);
         $this->app->singleton(JsonServiceInterface::class, $configure['json'] ?? JsonService::class);

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`
`5`	`5`	`namespace Bavix\Wallet\Models;`
`6`	`6`
`7`		`-use Bavix\Wallet\Internal\Service\ConfigServiceInterface;`
	`7`	`+use function config;`
`8`	`8`	`use Illuminate\Database\Eloquent\Model;`
`9`	`9`	`use Illuminate\Database\Eloquent\Relations\BelongsTo;`
`10`	`10`	`use Illuminate\Database\Eloquent\Relations\MorphTo;`
`@@ -67,7 +67,7 @@ class Transfer extends Model`
`67`	`67`	`public function getTable(): string`
`68`	`68`	`{`
`69`	`69`	`if ((string) $this->table === '') {`
`70`		`- $this->table = app(ConfigServiceInterface::class)->getString('wallet.transfer.table', 'transfers');`
	`70`	`+ $this->table = config('wallet.transfer.table', 'transfers');`
`71`	`71`	`}`
`72`	`72`
`73`	`73`	`return parent::getTable();`
Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,7 @@ interface AtomicServiceInterface`
`14`	`14`	`{`
`15`	`15`	`/**`
`16`	`16`	`* @template T`
	`17`	`+ * @param Wallet $object`
`17`	`18`	`* @param callable(): T $callback`
`18`	`19`	`* @return T`
`19`	`20`	`*`