Skip to content

Add support for thecodingmachine safe 3 0 #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
turingal wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Add support for thecodingmachine safe 3 0 #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a38a1c3
update thecodingmachine/safe to 3.0
Feb 4, 2026
ed5576b
fix stan error
Feb 4, 2026
c0c2666
psalm fixes
Feb 4, 2026
ce661e6
fix tests error and psalm error
Feb 4, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,16 +22,16 @@
"ext-bcmath": "*",
"doctrine/dbal": "^4",
"moneyphp/money": "^4.0.3",
"thecodingmachine/safe": "^1.3|^2"
"thecodingmachine/safe": "^3.0"
},
"require-dev": {
"doctrine/coding-standard": "^12.0",
"phpstan/phpstan": "^1.12",
"phpstan/phpstan": "^2.1",
"phpunit/phpunit": "^10.5",
"roave/no-floaters": "^1.11",
"squizlabs/php_codesniffer": "^3.10",
"thecodingmachine/phpstan-safe-rule": "^1.1|^1.2",
"vimeo/psalm": "^5.26"
"thecodingmachine/phpstan-safe-rule": "^1.4",
"vimeo/psalm": "^6.15"
},
"minimum-stability": "stable",
"config": {
Expand Down
6 changes: 5 additions & 1 deletion src/Bitcoin.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,19 +6,23 @@

use Money\Currencies;
use Money\Currencies\BitcoinCurrencies;
use Override;

class Bitcoin extends BaseMoney
final class Bitcoin extends BaseMoney
{
#[Override]
public static function humanReadableName(): string
{
return 'Bitcoin';
}

#[Override]
protected static function classSubunits(): int
{
return 8;
}

#[Override]
protected static function getAllowedCurrencies(): Currencies
{
return new BitcoinCurrencies();
Expand Down
13 changes: 7 additions & 6 deletions src/Currency.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,36 +7,37 @@
use Money\Currencies;
use Money\Currency as LibCurrency;

/** @psalm-api */
class Currency
{
/** @psalm-param non-empty-string $code */
final private function __construct(private string $code)
final protected function __construct(private string $code)
{
}

/** @psalm-param non-empty-string $code */
final public static function create(string $code): self
public static function create(string $code): self
{
return new static($code);
}

/** @psalm-return non-empty-string */
final public function getCode(): string
public function getCode(): string
{
return $this->getLibCurrency()->getCode();
}

final public function equals(self $other): bool
public function equals(self $other): bool
{
return $this->getLibCurrency()->equals($other->getLibCurrency());
}

final public function isAvailableWithin(Currencies $currencies): bool
public function isAvailableWithin(Currencies $currencies): bool
{
return $currencies->contains($this->getLibCurrency());
}

final public function jsonSerialize(): string
public function jsonSerialize(): string
{
return $this->getLibCurrency()->jsonSerialize();
}
Expand Down
5 changes: 4 additions & 1 deletion src/GaapMoney.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,17 @@

use Money\Currencies;
use Money\Currencies\ISOCurrencies;
use Override;

class GaapMoney extends BaseMoney
final class GaapMoney extends BaseMoney
{
#[Override]
protected static function classSubunits(): int
{
return 4;
}

#[Override]
protected static function getAllowedCurrencies(): Currencies
{
return new ISOCurrencies();
Expand Down
6 changes: 5 additions & 1 deletion src/Money.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,20 @@
use Money\Currencies;
use Money\Currencies\CurrencyList;
use Money\Currencies\ISOCurrencies;
use Override;

/** @psalm-api */
class Money extends BaseMoney
{
private static Currencies|null $currencies = null;

#[Override]
protected static function classSubunits(): int
{
return 2;
}

#[Override]
protected static function getAllowedCurrencies(): Currencies
{
if (self::$currencies !== null) {
Expand All @@ -41,7 +45,7 @@ private static function initializeCurrencies(): Currencies
$twoOrLessSubUnitCurrencies[$currency->getCode()] = $subUnit;
}

/** @psalm-var array<non-empty-string, positive-int|0> $twoOrLessSubUnitCurrencies */
/** @psalm-var array<non-empty-string, int<0, 2>> $twoOrLessSubUnitCurrencies */
$currencies = new CurrencyList($twoOrLessSubUnitCurrencies);

self::$currencies = $currencies;
Expand Down
6 changes: 5 additions & 1 deletion src/Type/BTCMoneyType.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,18 @@

use Doctrine\DBAL\Platforms\AbstractPlatform;
use Doctrine\DBAL\Types\Type;
use Override;

use function array_merge;
use function bcdiv;
use function bcmul;

class BTCMoneyType extends Type
final class BTCMoneyType extends Type
{
public const TYPE_NAME = 'btc_money';

/** @param mixed[] $column */
#[Override]
public function getSQLDeclaration(array $column, AbstractPlatform $platform): string
{
return $platform->getDecimalTypeDeclarationSQL(
Expand All @@ -29,6 +31,7 @@ public function getSQLDeclaration(array $column, AbstractPlatform $platform): st
);
}

#[Override]
public function convertToPHPValue(mixed $value, AbstractPlatform $platform): string|null
{
if ($value === null) {
Expand All @@ -41,6 +44,7 @@ public function convertToPHPValue(mixed $value, AbstractPlatform $platform): str
return bcmul($value, '100000000', 0);
}

#[Override]
public function convertToDatabaseValue(mixed $value, AbstractPlatform $platform): string|null
{
if ($value === null) {
Expand Down
4 changes: 3 additions & 1 deletion src/Type/CurrencyType.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,16 @@

use Doctrine\DBAL\Platforms\AbstractPlatform;
use Doctrine\DBAL\Types\Type;
use Override;

use function array_merge;

class CurrencyType extends Type
final class CurrencyType extends Type
{
public const TYPE_NAME = 'currency';

/** @param mixed[] $column */
#[Override]
public function getSQLDeclaration(array $column, AbstractPlatform $platform): string
{
return $platform->getStringTypeDeclarationSQL(
Expand Down
6 changes: 5 additions & 1 deletion src/Type/GaapMoneyType.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,18 @@

use Doctrine\DBAL\Platforms\AbstractPlatform;
use Doctrine\DBAL\Types\Type;
use Override;

use function array_merge;
use function bcdiv;
use function bcmul;

class GaapMoneyType extends Type
final class GaapMoneyType extends Type
{
public const TYPE_NAME = 'gaap_money';

/** @param mixed[] $column */
#[Override]
public function getSQLDeclaration(array $column, AbstractPlatform $platform): string
{
return $platform->getDecimalTypeDeclarationSQL(
Expand All @@ -29,6 +31,7 @@ public function getSQLDeclaration(array $column, AbstractPlatform $platform): st
);
}

#[Override]
public function convertToPHPValue(mixed $value, AbstractPlatform $platform): string|null
{
if ($value === null) {
Expand All @@ -41,6 +44,7 @@ public function convertToPHPValue(mixed $value, AbstractPlatform $platform): str
return bcmul($value, '10000', 0);
}

#[Override]
public function convertToDatabaseValue(mixed $value, AbstractPlatform $platform): string|null
{
if ($value === null) {
Expand Down
6 changes: 5 additions & 1 deletion src/Type/MoneyType.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,18 @@

use Doctrine\DBAL\Platforms\AbstractPlatform;
use Doctrine\DBAL\Types\Type;
use Override;

use function array_merge;
use function bcdiv;
use function bcmul;

class MoneyType extends Type
final class MoneyType extends Type
{
public const TYPE_NAME = 'money';

/** @param mixed[] $column */
#[Override]
public function getSQLDeclaration(array $column, AbstractPlatform $platform): string
{
return $platform->getDecimalTypeDeclarationSQL(
Expand All @@ -29,6 +31,7 @@ public function getSQLDeclaration(array $column, AbstractPlatform $platform): st
);
}

#[Override]
public function convertToPHPValue(mixed $value, AbstractPlatform $platform): string|null
{
if ($value === null) {
Expand All @@ -41,6 +44,7 @@ public function convertToPHPValue(mixed $value, AbstractPlatform $platform): str
return bcmul($value, '100', 0);
}

#[Override]
public function convertToDatabaseValue(mixed $value, AbstractPlatform $platform): string|null
{
if ($value === null) {
Expand Down
Loading