contrib/php-uuid
1
0
Fork 0
mirror of https://github.com/ramsey/uuid.git synced 2026-06-15 16:07:55 +03:00
Code Issues Packages Projects Releases Wiki Activity

Support microtime in returned DateTimeInterface instances

Browse Source 
Fixes #90 and supersedes #93.
This commit is contained in:
Ben Ramsey
2020-01-19 22:06:42 -06:00
parent 124e267553
commit a8d52100de
19 changed files with 308 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Math/BrickMathCalculator.php
+20 -8
View File
@@ -14,12 +14,15 @@ declare(strict_types=1);
namespace Ramsey\Uuid\Math;
use Brick\Math\BigDecimal;
use Brick\Math\BigInteger;
use Brick\Math\Exception\MathException;
use Brick\Math\RoundingMode as BrickMathRounding;
use Ramsey\Uuid\Exception\InvalidArgumentException;
use Ramsey\Uuid\Type\Decimal;
use Ramsey\Uuid\Type\Hexadecimal;
use Ramsey\Uuid\Type\IntegerValue;
use Ramsey\Uuid\Type\NumberInterface;
/**
* A calculator using the brick/math library for arbitrary-precision arithmetic
@@ -41,7 +44,7 @@ final class BrickMathCalculator implements CalculatorInterface
RoundingMode::HALF_EVEN => BrickMathRounding::HALF_EVEN,
];
public function add(IntegerValue $augend, IntegerValue ...$addends): IntegerValue
public function add(NumberInterface $augend, NumberInterface ...$addends): NumberInterface
{
/** @psalm-suppress ImpureMethodCall */
$sum = BigInteger::of($augend->toString());
@@ -54,7 +57,7 @@ final class BrickMathCalculator implements CalculatorInterface
return new IntegerValue((string) $sum);
}
public function subtract(IntegerValue $minuend, IntegerValue ...$subtrahends): IntegerValue
public function subtract(NumberInterface $minuend, NumberInterface ...$subtrahends): NumberInterface
{
/** @psalm-suppress ImpureMethodCall */
$difference = BigInteger::of($minuend->toString());
@@ -67,7 +70,7 @@ final class BrickMathCalculator implements CalculatorInterface
return new IntegerValue((string) $difference);
}
public function multiply(IntegerValue $multiplicand, IntegerValue ...$multipliers): IntegerValue
public function multiply(NumberInterface $multiplicand, NumberInterface ...$multipliers): NumberInterface
{
/** @psalm-suppress ImpureMethodCall */
$product = BigInteger::of($multiplicand->toString());
@@ -80,19 +83,28 @@ final class BrickMathCalculator implements CalculatorInterface
return new IntegerValue((string) $product);
}
public function divide(int $roundingMode, IntegerValue $dividend, IntegerValue ...$divisors): IntegerValue
{
public function divide(
int $roundingMode,
int $scale,
NumberInterface $dividend,
NumberInterface ...$divisors
): NumberInterface {
$brickRounding = $this->getBrickRoundingMode($roundingMode);
/** @psalm-suppress ImpureMethodCall */
$quotient = BigInteger::of($dividend->toString());
$quotient = BigDecimal::of($dividend->toString());
foreach ($divisors as $divisor) {
/** @psalm-suppress ImpureMethodCall */
$quotient = $quotient->dividedBy($divisor->toString(), $brickRounding);
$quotient = $quotient->dividedBy($divisor->toString(), $scale, $brickRounding);
}
return new IntegerValue((string) $quotient);
if ($scale === 0) {
/** @psalm-suppress ImpureMethodCall */
return new IntegerValue((string) $quotient->toBigInteger());
}
return new Decimal((string) $quotient);
}
public function fromBase(string $value, int $base): IntegerValue