diff --git a/composer.json b/composer.json index e8d99e14d..dd55a1c12 100644 --- a/composer.json +++ b/composer.json @@ -12,7 +12,8 @@ "wallet", "payments" ], - "minimum-stability": "stable", + "minimum-stability": "dev", + "prefer-stable": true, "homepage": "https://bavix.github.io/laravel-wallet/", "license": "MIT", "authors": [ @@ -26,14 +27,12 @@ "ext-json": "*", "ext-pdo": "*", "brick/math": "~0.10", - "doctrine/dbal": "^3.5", - "illuminate/contracts": "^10.0", - "illuminate/database": "^10.0", + "illuminate/contracts": "^10.0|^11.0", + "illuminate/database": "^10.0|^11.0", "ramsey/uuid": "^4.0" }, "require-dev": { "brianium/paratest": "^7.2", - "cknow/laravel-money": "^7.1", "ergebnis/phpstan-rules": "^1.0", "infection/infection": "~0.27", "laravel/cashier": "^15.0", @@ -47,7 +46,9 @@ }, "suggest": { "bavix/laravel-wallet-swap": "Addition to the laravel-wallet library for quick setting of exchange rates", - "bavix/laravel-wallet-warmup": "Addition to the laravel-wallet library for refresh balance wallets" + "bavix/laravel-wallet-uuid": "Addition to the laravel-wallet library uuid support in laravel-wallet", + "bavix/laravel-wallet-warmup": "Addition to the laravel-wallet library for refresh balance wallets", + "doctrine/dbal": "Required to rename columns and drop SQLite columns (^3.5.1)." }, "autoload": { "psr-4": { diff --git a/tests/Infra/PackageModels/TransactionMoney.php b/tests/Infra/PackageModels/TransactionMoney.php index 13dcd28ed..b9dfc13b4 100644 --- a/tests/Infra/PackageModels/TransactionMoney.php +++ b/tests/Infra/PackageModels/TransactionMoney.php @@ -4,7 +4,7 @@ namespace Bavix\Wallet\Test\Infra\PackageModels; -use Cknow\Money\Money; +use Bavix\Wallet\Test\Infra\Values\Money; /** * Class Transaction. @@ -17,7 +17,7 @@ final class TransactionMoney extends \Bavix\Wallet\Models\Transaction public function getCurrencyAttribute(): Money { - $this->currency ??= \money($this->amount, $this->meta['currency'] ?? 'USD'); + $this->currency ??= new Money($this->amount, $this->meta['currency'] ?? 'USD'); return $this->currency; } diff --git a/tests/Infra/Values/Money.php b/tests/Infra/Values/Money.php new file mode 100644 index 000000000..49cc06be5 --- /dev/null +++ b/tests/Infra/Values/Money.php @@ -0,0 +1,14 @@ +getKey() > 0); self::assertSame($transaction->amountInt, $buyer->balanceInt); self::assertInstanceOf(TransactionMoney::class, $transaction); - self::assertSame('1000', $transaction->currency->getAmount()); - self::assertSame('EUR', $transaction->currency->getCurrency()->getCode()); + self::assertSame('1000', $transaction->currency->amount); + self::assertSame('EUR', $transaction->currency->currency); } public function testNoCustomAttribute(): void