Merge pull request #393 from bavix/looping

Looping

Author: rez1dent3

changelog.md

@@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [6.2.1] - 2021-11-02
+### Fixed
+- Fix looping for old configs. #387 @AbdullahFaqeir, #391 @Hussam3bd @alexstewartja
+
 ## [6.2.0] - 2021-10-29
 ### Added
 - ECS
@@ -667,7 +671,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/6.2.0...develop
+[Unreleased]: https://github.com/bavix/laravel-wallet/compare/6.2.1...develop
+[6.2.1]: https://github.com/bavix/laravel-wallet/compare/6.2.0...6.2.1
 [6.2.0]: https://github.com/bavix/laravel-wallet/compare/6.1.0...6.2.0
 [6.1.0]: https://github.com/bavix/laravel-wallet/compare/6.0.4...6.1.0
 [6.0.4]: https://github.com/bavix/laravel-wallet/compare/6.0.3...6.0.4

src/Simple/BrickMath.php

@@ -4,12 +4,13 @@
 
 namespace Bavix\Wallet\Simple;
 
+use Bavix\Wallet\Interfaces\Mathable;
 use Bavix\Wallet\Services\MathService;
 
 /**
  * @deprecated
  * @see MathService
  */
-class BrickMath extends MathService
+class BrickMath extends MathService implements Mathable
 {
 }

src/WalletServiceProvider.php

@@ -128,8 +128,7 @@ private function legacySingleton(): void
         $this->app->singleton(Rateable::class, config('wallet.package.rateable', Rate::class));
         $this->app->singleton(Storable::class, config('wallet.package.storable', Store::class));
 
-        $this->app->alias(MathInterface::class, Mathable::class);
-        $this->app->alias(MathInterface::class, BrickMath::class);
+        $this->app->singleton(Mathable::class, BrickMath::class);
 
         $this->app->singleton(DbService::class, config('wallet.services.db', DbService::class));
         $this->app->singleton(LockService::class, config('wallet.services.lock', LockService::class));

tests/SingletonTest.php

@@ -56,7 +56,7 @@ public function testStorable(): void
 
     public function testMathable(): void
     {
-        self::assertEquals($this->getRefId(Mathable::class), $this->getRefId(MathInterface::class));
+        self::assertEquals($this->getRefId(Mathable::class), $this->getRefId(Mathable::class));
     }
 
     public function testMathInterface(): void