Skip to content

Allow brick math 0.15 and 0.16 #633

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

Closed
BackEndTea wants to merge 4 commits into from
+79 −27
Closed

Allow brick math 0.15 and 0.16 #633

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ae622b3
Allow brick math 0.15 and 0.16
BackEndTea Mar 12, 2026
03db20e
Merge branch '4.x' into brick-math
ramsey Apr 15, 2026
5fdede4
Add phpstan ignores to the BC layer
BackEndTea Apr 15, 2026
bdcd9cb
Do not ignore test
BackEndTea Apr 15, 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
2 changes: 1 addition & 1 deletion composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
],
"require": {
"php": "^8.0",
"brick/math": "^0.8.16 || ^0.9 || ^0.10 || ^0.11 || ^0.12 || ^0.13 || ^0.14",
"brick/math": "^0.8.16 || ^0.9 || ^0.10 || ^0.11 || ^0.12 || ^0.13 || ^0.14 || ^0.15 || ^0.16",
"ramsey/collection": "^1.2 || ^2.0"
},
"require-dev": {
Expand Down
17 changes: 8 additions & 9 deletions composer.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

56 changes: 43 additions & 13 deletions src/Math/BrickMathCalculator.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,18 +31,10 @@
*/
final class BrickMathCalculator implements CalculatorInterface
{
private const ROUNDING_MODE_MAP = [

@talkinnl talkinnl Apr 23, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more. 

    private const ROUNDING_MODE_MAP = [
        RoundingMode::UNNECESSARY => BrickMathRounding::Unnecessary ?? BrickMathRounding::UNNECESSARY,
        ...

Alternatively and a matter of taste, but this could also work instead of the static $roundingModeMap.
With this approach, you don't need defined(). The whole compat layer would be these 10 lines.

RoundingMode::UNNECESSARY => BrickMathRounding::UNNECESSARY,
RoundingMode::UP => BrickMathRounding::UP,
RoundingMode::DOWN => BrickMathRounding::DOWN,
RoundingMode::CEILING => BrickMathRounding::CEILING,
RoundingMode::FLOOR => BrickMathRounding::FLOOR,
RoundingMode::HALF_UP => BrickMathRounding::HALF_UP,
RoundingMode::HALF_DOWN => BrickMathRounding::HALF_DOWN,
RoundingMode::HALF_CEILING => BrickMathRounding::HALF_CEILING,
RoundingMode::HALF_FLOOR => BrickMathRounding::HALF_FLOOR,
RoundingMode::HALF_EVEN => BrickMathRounding::HALF_EVEN,
];
/**
* @var array<int, BrickMathRounding::*>|null $roundingModeMap
*/
private static ?array $roundingModeMap = null;

Check failure on line 37 in src/Math/BrickMathCalculator.php

View workflow job for this annotation

GitHub Actions / Static analysis 

`@readonly` property cannot have a default value.

public function add(NumberInterface $augend, NumberInterface ...$addends): NumberInterface
{
Expand Down Expand Up @@ -92,7 +84,7 @@
$quotient = BigDecimal::of($dividend->toString());

foreach ($divisors as $divisor) {
$quotient = $quotient->dividedBy($divisor->toString(), $scale, $brickRounding);

Check failure on line 87 in src/Math/BrickMathCalculator.php

View workflow job for this annotation

GitHub Actions / Static analysis 

Parameter #2 $scale of method Brick\Math\BigDecimal::dividedBy() expects int<0, max>, int given.
}

if ($scale === 0) {
Expand All @@ -108,11 +100,11 @@
{
try {
/** @phpstan-ignore possiblyImpure.new */
return new IntegerObject((string) BigInteger::fromBase($value, $base));

Check failure on line 103 in src/Math/BrickMathCalculator.php

View workflow job for this annotation

GitHub Actions / Static analysis 

Parameter #2 $base of static method Brick\Math\BigInteger::fromBase() expects int<2, 36>, int given.

Check failure on line 103 in src/Math/BrickMathCalculator.php

View workflow job for this annotation

GitHub Actions / Static analysis 

Parameter #1 $number of static method Brick\Math\BigInteger::fromBase() expects non-empty-string, string given.
} catch (MathException | \InvalidArgumentException $exception) {
throw new InvalidArgumentException(
$exception->getMessage(),

Check failure on line 106 in src/Math/BrickMathCalculator.php

View workflow job for this annotation

GitHub Actions / Static analysis 

Possibly impure call to method Throwable::getMessage() in pure method Ramsey\Uuid\Math\BrickMathCalculator::fromBase().
(int) $exception->getCode(),

Check failure on line 107 in src/Math/BrickMathCalculator.php

View workflow job for this annotation

GitHub Actions / Static analysis 

Possibly impure call to method Throwable::getCode() in pure method Ramsey\Uuid\Math\BrickMathCalculator::fromBase().
$exception
);
}
Expand All @@ -121,11 +113,11 @@
public function toBase(IntegerObject $value, int $base): string
{
try {
return BigInteger::of($value->toString())->toBase($base);

Check failure on line 116 in src/Math/BrickMathCalculator.php

View workflow job for this annotation

GitHub Actions / Static analysis 

Parameter #1 $base of method Brick\Math\BigInteger::toBase() expects int<2, 36>, int given.
} catch (MathException | \InvalidArgumentException $exception) {
throw new InvalidArgumentException(
$exception->getMessage(),

Check failure on line 119 in src/Math/BrickMathCalculator.php

View workflow job for this annotation

GitHub Actions / Static analysis 

Possibly impure call to method Throwable::getMessage() in pure method Ramsey\Uuid\Math\BrickMathCalculator::toBase().
(int) $exception->getCode(),

Check failure on line 120 in src/Math/BrickMathCalculator.php

View workflow job for this annotation

GitHub Actions / Static analysis 

Possibly impure call to method Throwable::getCode() in pure method Ramsey\Uuid\Math\BrickMathCalculator::toBase().
$exception
);
}
Expand All @@ -149,6 +141,44 @@
*/
private function getBrickRoundingMode(int $roundingMode)
{
return self::ROUNDING_MODE_MAP[$roundingMode] ?? BrickMathRounding::UNNECESSARY;
return self::getRoundingMap()[$roundingMode] ?? self::getRoundingMap()[0];
}

/**
* @return array<int, BrickMathRounding::*>
*/
private static function getRoundingMap(): array
{
if (self::$roundingModeMap === null) {
if (defined(BrickMathRounding::class . '::UNNECESSARY')) {
self::$roundingModeMap = [

Check failure on line 154 in src/Math/BrickMathCalculator.php

View workflow job for this annotation

GitHub Actions / Static analysis 

Static property Ramsey\Uuid\Math\BrickMathCalculator::$roundingModeMap (array<int, Brick\Math\RoundingMode::Ceiling|Brick\Math\RoundingMode::Down|Brick\Math\RoundingMode::Floor|Brick\Math\RoundingMode::HalfCeiling|Brick\Math\RoundingMode::HalfDown|Brick\Math\RoundingMode::HalfEven|Brick\Math\RoundingMode::HalfFloor|Brick\Math\RoundingMode::HalfUp|Brick\Math\RoundingMode::Unnecessary|Brick\Math\RoundingMode::Up>|null) does not accept array<int, mixed>.
RoundingMode::UNNECESSARY => BrickMathRounding::UNNECESSARY,
RoundingMode::UP => BrickMathRounding::UP,
RoundingMode::DOWN => BrickMathRounding::DOWN,
RoundingMode::CEILING => BrickMathRounding::CEILING,
RoundingMode::FLOOR => BrickMathRounding::FLOOR,
RoundingMode::HALF_UP => BrickMathRounding::HALF_UP,
RoundingMode::HALF_DOWN => BrickMathRounding::HALF_DOWN,
RoundingMode::HALF_CEILING => BrickMathRounding::HALF_CEILING,
RoundingMode::HALF_FLOOR => BrickMathRounding::HALF_FLOOR,
RoundingMode::HALF_EVEN => BrickMathRounding::HALF_EVEN,
];
} else {
self::$roundingModeMap = [
RoundingMode::UNNECESSARY => BrickMathRounding::Unnecessary,
RoundingMode::UP => BrickMathRounding::Up,
RoundingMode::DOWN => BrickMathRounding::Down,
RoundingMode::CEILING => BrickMathRounding::Ceiling,
RoundingMode::FLOOR => BrickMathRounding::Floor,
RoundingMode::HALF_UP => BrickMathRounding::HalfUp,
RoundingMode::HALF_DOWN => BrickMathRounding::HalfDown,
RoundingMode::HALF_CEILING => BrickMathRounding::HalfCeiling,
RoundingMode::HALF_FLOOR => BrickMathRounding::HalfFloor,
RoundingMode::HALF_EVEN => BrickMathRounding::HalfEven,
];
}
}

return self::$roundingModeMap;
}
}
74 changes: 35 additions & 39 deletions tests/Builder/FallbackBuilderTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,11 @@

namespace Ramsey\Uuid\Test\Builder;

use Mockery;
use Ramsey\Uuid\Builder\FallbackBuilder;
use Ramsey\Uuid\Builder\UuidBuilderInterface;
use Ramsey\Uuid\Codec\CodecInterface;
use Ramsey\Uuid\Codec\StringCodec;
use Ramsey\Uuid\Converter\Number\GenericNumberConverter;
use Ramsey\Uuid\Converter\Time\GenericTimeConverter;
use Ramsey\Uuid\Converter\Time\PhpTimeConverter;
use Ramsey\Uuid\Exception\BuilderNotFoundException;
use Ramsey\Uuid\Exception\UnableToBuildUuidException;
use Ramsey\Uuid\Guid\GuidBuilder;
use Ramsey\Uuid\Math\BrickMathCalculator;
Expand All @@ -25,41 +21,41 @@

class FallbackBuilderTest extends TestCase
{
public function testBuildThrowsExceptionAfterAllConfiguredBuildersHaveErrored(): void
{
$codec = Mockery::mock(CodecInterface::class);
$bytes = 'foobar';

$builder1 = Mockery::mock(UuidBuilderInterface::class);
$builder1
->shouldReceive('build')
->once()
->with($codec, $bytes)
->andThrow(UnableToBuildUuidException::class);

$builder2 = Mockery::mock(UuidBuilderInterface::class);
$builder2
->shouldReceive('build')
->once()
->with($codec, $bytes)
->andThrow(UnableToBuildUuidException::class);

$builder3 = Mockery::mock(UuidBuilderInterface::class);
$builder3
->shouldReceive('build')
->once()
->with($codec, $bytes)
->andThrow(UnableToBuildUuidException::class);

$fallbackBuilder = new FallbackBuilder([$builder1, $builder2, $builder3]);

$this->expectException(BuilderNotFoundException::class);
$this->expectExceptionMessage(
'Could not find a suitable builder for the provided codec and fields'
);

$fallbackBuilder->build($codec, $bytes);
}
// public function testBuildThrowsExceptionAfterAllConfiguredBuildersHaveErrored(): void

@ramsey ramsey Apr 15, 2026

Copy link
Copy Markdown
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why are these tests commented out?

@BackEndTea BackEndTea Apr 15, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

My bad, i think i commented them out to debug something. It should be fine to uncomment them again

// {
// $codec = Mockery::mock(CodecInterface::class);
// $bytes = 'foobar';
//
// $builder1 = Mockery::mock(UuidBuilderInterface::class);
// $builder1
// ->shouldReceive('build')
// ->once()
// ->with($codec, $bytes)
// ->andThrow(UnableToBuildUuidException::class);
//
// $builder2 = Mockery::mock(UuidBuilderInterface::class);
// $builder2
// ->shouldReceive('build')
// ->once()
// ->with($codec, $bytes)
// ->andThrow(UnableToBuildUuidException::class);
//
// $builder3 = Mockery::mock(UuidBuilderInterface::class);
// $builder3
// ->shouldReceive('build')
// ->once()
// ->with($codec, $bytes)
// ->andThrow(UnableToBuildUuidException::class);
//
// $fallbackBuilder = new FallbackBuilder([$builder1, $builder2, $builder3]);
//
// $this->expectException(BuilderNotFoundException::class);
// $this->expectExceptionMessage(
// 'Could not find a suitable builder for the provided codec and fields'
// );
//
// $fallbackBuilder->build($codec, $bytes);
// }

/**
* @dataProvider provideBytes
Expand Down
2 changes: 1 addition & 1 deletion tests/Converter/Number/BigNumberConverterTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ public function testFromHexThrowsExceptionWhenStringDoesNotContainOnlyHexadecima
$converter = new BigNumberConverter();

$this->expectException(InvalidArgumentException::class);
$this->expectExceptionMessage('"." is not a valid character in base 16');
$this->expectExceptionMessageMatches('/"\." is not (a )?valid (character )?in base 16/');

$converter->fromHex('123.34');
}
Expand Down
2 changes: 1 addition & 1 deletion tests/Math/BrickMathCalculatorTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ public function testFromBaseThrowsException(): void
$calculator = new BrickMathCalculator();

$this->expectException(InvalidArgumentException::class);
$this->expectExceptionMessage('"o" is not a valid character in base 16');
$this->expectExceptionMessageMatches('/"o" is not (a )?valid (character )?in base 16/');

$calculator->fromBase('foobar', 16);
}
Expand Down
12 changes: 10 additions & 2 deletions tests/UuidTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1213,9 +1213,17 @@ public function test32BitMatch64BitForOneHourPeriod(): void
. "; 32-bit: {$uuid32->toString()}, 64-bit: {$uuid64->toString()}"
);

if (defined(RoundingMode::class . '::HALF_UP')) {
$halfUp = RoundingMode::HALF_UP;
$down = RoundingMode::DOWN;
} else {
$halfUp = RoundingMode::HalfUp;
$down = RoundingMode::Down;
}

// Assert that the time matches
$usecAdd = BigDecimal::of($usec)->dividedBy('1000000', 14, RoundingMode::HALF_UP);
$testTime = BigDecimal::of($currentTime)->plus($usecAdd)->toScale(0, RoundingMode::DOWN);
$usecAdd = BigDecimal::of($usec)->dividedBy('1000000', 14, $halfUp);
$testTime = BigDecimal::of($currentTime)->plus($usecAdd)->toScale(0, $down);
$this->assertSame((string) $testTime, (string) $uuid64->getDateTime()->getTimestamp());
$this->assertSame((string) $testTime, (string) $uuid32->getDateTime()->getTimestamp());
}
Expand Down