Merge pull request #432 from bavix/8.x-fix

8.0.1 fix service provider (custom cache)

Author: rez1dent3

.github/workflows/phpunits.yaml

@@ -29,7 +29,7 @@ jobs:
           --health-cmd "redis-cli ping"
           --health-interval 10s
           --health-timeout 5s
-          --health-retries 5
+          --health-retries 10
         ports:
           - 6379:6379
 
@@ -39,7 +39,7 @@ jobs:
           --health-cmd "timeout 5 bash -c 'cat < /dev/null > /dev/udp/127.0.0.1/11211'"
           --health-interval 10s
           --health-timeout 5s
-          --health-retries 5
+          --health-retries 10
         ports:
           - 11211:11211
 
@@ -53,7 +53,7 @@ jobs:
           --health-cmd pg_isready
           --health-interval 10s
           --health-timeout 5s
-          --health-retries 3
+          --health-retries 10
         ports:
           - 5432:5432
 
@@ -67,7 +67,7 @@ jobs:
           --health-cmd="mysqladmin ping"
           --health-interval 10s
           --health-timeout 5s
-          --health-retries 3
+          --health-retries 10
         ports:
           - 3306:3306
 
@@ -80,7 +80,7 @@ jobs:
           --health-cmd="mysqladmin ping"
           --health-interval 10s
           --health-timeout 5s
-          --health-retries 3
+          --health-retries 10
         ports:
           - 3307:3306
 

changelog.md

@@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [8.0.1] - 2022-02-12
+### Fixed
+- Fixed bug preventing redis from being used #429 @mattvb91
+
 ## [8.0.0] - 2022-02-08
 ### Added
 - Add support laravel ^9.0
@@ -768,7 +772,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/8.0.0...develop
+[Unreleased]: https://github.com/bavix/laravel-wallet/compare/8.0.1...develop
+[8.0.1]: https://github.com/bavix/laravel-wallet/compare/8.0.0...8.0.1
 [8.0.0]: https://github.com/bavix/laravel-wallet/compare/7.3.0...8.0.0
 [7.3.0]: https://github.com/bavix/laravel-wallet/compare/7.2.0...7.3.0
 [7.2.0]: https://github.com/bavix/laravel-wallet/compare/7.1.0...7.2.0

src/WalletServiceProvider.php

@@ -136,10 +136,8 @@ public function register(): void
 
         $configure = config('wallet', []);
 
-        $this->contextBinding($configure['cache'] ?? []);
-
         $this->internal($configure['internal'] ?? []);
-        $this->services($configure['services'] ?? []);
+        $this->services($configure['services'] ?? [], $configure['cache'] ?? []);
         $this->legacySingleton(); // without configuration
 
         $this->repositories($configure['repositories'] ?? []);
@@ -176,32 +174,6 @@ private function shouldMigrate(): bool
         return WalletConfigure::isRunsMigrations();
     }
 
-    /** @codeCoverageIgnore */
-    private function contextBinding(array $bookkeeperStore): void
-    {
-        $this->app->when(BookkeeperServiceInterface::class)
-            ->needs(StorageServiceInterface::class)
-            ->give(fn () => $this->app->make(
-                StorageServiceInterface::class,
-                [
-                    'cacheRepository' => $this->app->make(CacheManager::class)
-                        ->driver($bookkeeperStore['driver'] ?? 'array'),
-                ],
-            ))
-        ;
-
-        $this->app->when(RegulatorServiceInterface::class)
-            ->needs(StorageServiceInterface::class)
-            ->give(fn () => $this->app->make(
-                StorageServiceInterface::class,
-                [
-                    'cacheRepository' => $this->app->make(CacheManager::class)
-                        ->driver('array'),
-                ],
-            ))
-        ;
-    }
-
     private function internal(array $configure): void
     {
         $this->app->bind(StorageServiceInterface::class, $configure['storage'] ?? StorageService::class);
@@ -216,14 +188,12 @@ private function internal(array $configure): void
         $this->app->singleton(UuidFactoryServiceInterface::class, $configure['uuid'] ?? UuidFactoryService::class);
     }
 
-    private function services(array $configure): void
+    private function services(array $configure, array $cache): void
     {
         $this->app->singleton(AssistantServiceInterface::class, $configure['assistant'] ?? AssistantService::class);
         $this->app->singleton(AtmServiceInterface::class, $configure['atm'] ?? AtmService::class);
         $this->app->singleton(AtomicServiceInterface::class, $configure['atomic'] ?? AtomicService::class);
         $this->app->singleton(BasketServiceInterface::class, $configure['basket'] ?? BasketService::class);
-        $this->app->singleton(BookkeeperServiceInterface::class, $configure['bookkeeper'] ?? BookkeeperService::class);
-        $this->app->singleton(RegulatorServiceInterface::class, $configure['regulator'] ?? RegulatorService::class);
         $this->app->singleton(CastServiceInterface::class, $configure['cast'] ?? CastService::class);
         $this->app->singleton(ConsistencyServiceInterface::class, $configure['consistency'] ?? ConsistencyService::class);
         $this->app->singleton(DiscountServiceInterface::class, $configure['discount'] ?? DiscountService::class);
@@ -232,6 +202,32 @@ private function services(array $configure): void
         $this->app->singleton(PurchaseServiceInterface::class, $configure['purchase'] ?? PurchaseService::class);
         $this->app->singleton(TaxServiceInterface::class, $configure['tax'] ?? TaxService::class);
         $this->app->singleton(WalletServiceInterface::class, $configure['wallet'] ?? WalletService::class);
+
+        $this->app->singleton(BookkeeperServiceInterface::class, fn () => $this->app->make(
+            $configure['bookkeeper'] ?? BookkeeperService::class,
+            [
+                $this->app->make(
+                    StorageServiceInterface::class,
+                    [
+                        $this->app->make(CacheManager::class)
+                            ->driver($cache['driver'] ?? 'array'),
+                    ],
+                ),
+            ]
+        ));
+
+        $this->app->singleton(RegulatorServiceInterface::class, fn () => $this->app->make(
+            $configure['regulator'] ?? RegulatorService::class,
+            [
+                $this->app->make(
+                    StorageServiceInterface::class,
+                    [
+                        $this->app->make(CacheManager::class)
+                            ->driver('array'),
+                    ],
+                ),
+            ]
+        ));
     }
 
     private function assemblers(array $configure): void