Skip to content

Prevent using deprecated brick/math functions #2220

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

Merged
norberttech merged 1 commit into from
Feb 20, 2026
Merged

Prevent using deprecated brick/math functions #2220

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
57 changes: 26 additions & 31 deletions src/core/etl/src/Flow/Calculator/Calculator.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ final class Calculator
*/
public function add(int|float|string $a, int|float|string $b) : int|float
{
$result = BigDecimal::of($a)->plus(BigDecimal::of($b));
$result = BigDecimal::of((string) $a)->plus(BigDecimal::of((string) $b));

if (\in_array(\rtrim($result->getFractionalPart(), '0'), ['0', ''], true)) {
if (!$result->hasNonZeroFractionalPart()) {
return $result->toInt();
}

Expand All @@ -39,34 +39,29 @@ public function divide(int|float|string $a, int|float|string $b, ?int $scale = n
{
try {
if ($scale === null && $rounding === null) {
$result = BigDecimal::of($a)->exactlyDividedBy(BigDecimal::of($b));
$result = BigDecimal::of($a)->dividedByExact(BigDecimal::of($b));

if (\in_array(\rtrim($result->getFractionalPart(), '0'), ['0', ''], true)) {
if (!$result->hasNonZeroFractionalPart()) {
return $result->toInt();
}
}

if ($rounding === null) {
$brickMode = RoundingMode::UNNECESSARY;
} else {

$brickMode = match ($rounding) {
Rounding::UNNECESSARY => RoundingMode::UNNECESSARY,
Rounding::UP => RoundingMode::UP,
Rounding::DOWN => RoundingMode::DOWN,
Rounding::CEILING => RoundingMode::CEILING,
Rounding::FLOOR => RoundingMode::FLOOR,
Rounding::HALF_UP => RoundingMode::HALF_UP,
Rounding::HALF_DOWN => RoundingMode::HALF_DOWN,
Rounding::HALF_CEILING => RoundingMode::HALF_CEILING,
Rounding::HALF_FLOOR => RoundingMode::HALF_FLOOR,
Rounding::HALF_EVEN => RoundingMode::HALF_EVEN,
};
}

$result = BigDecimal::of($a)->dividedBy(BigDecimal::of($b), $scale, $brickMode);

if (\in_array(\rtrim($result->getFractionalPart(), '0'), ['0', ''], true)) {
$brickMode = match ($rounding) {
Rounding::UP => RoundingMode::Up,
Rounding::DOWN => RoundingMode::Down,
Rounding::CEILING => RoundingMode::Ceiling,
Rounding::FLOOR => RoundingMode::Floor,
Rounding::HALF_UP => RoundingMode::HalfUp,
Rounding::HALF_DOWN => RoundingMode::HalfDown,
Rounding::HALF_CEILING => RoundingMode::HalfCeiling,
Rounding::HALF_FLOOR => RoundingMode::HalfFloor,
Rounding::HALF_EVEN => RoundingMode::HalfEven,
default => RoundingMode::Unnecessary,
};

$result = BigDecimal::of((string) $a)->dividedBy(BigDecimal::of((string) $b), $scale, $brickMode);

if (!$result->hasNonZeroFractionalPart()) {
return $result->toInt();
}

Expand All @@ -93,9 +88,9 @@ public function modulus(int|string $a, int|string $b) : int
*/
public function multiply(int|float|string $a, int|float|string $b) : int|float
{
$result = BigDecimal::of($a)->multipliedBy(BigDecimal::of($b));
$result = BigDecimal::of((string) $a)->multipliedBy(BigDecimal::of((string) $b));

if (\in_array(\rtrim($result->getFractionalPart(), '0'), ['0', ''], true)) {
if (!$result->hasNonZeroFractionalPart()) {
return $result->toInt();
}

Expand All @@ -108,9 +103,9 @@ public function multiply(int|float|string $a, int|float|string $b) : int|float
*/
public function power(int|float|string $a, int|string $b) : int|float
{
$result = BigDecimal::of($a)->power(BigInteger::of($b)->toInt());
$result = BigDecimal::of((string) $a)->power(BigInteger::of((string) $b)->toInt());

if (\in_array($result->getFractionalPart(), ['0', ''], true)) {
if (!$result->hasNonZeroFractionalPart()) {
return $result->toInt();
}

Expand All @@ -123,9 +118,9 @@ public function power(int|float|string $a, int|string $b) : int|float
*/
public function subtract(int|float|string $a, int|float|string $b) : int|float
{
$result = BigDecimal::of($a)->minus(BigDecimal::of($b));
$result = BigDecimal::of((string) $a)->minus(BigDecimal::of((string) $b));

if (\in_array(\rtrim($result->getFractionalPart(), '0'), ['0', ''], true)) {
if (!$result->hasNonZeroFractionalPart()) {
return $result->toInt();
}

Expand Down
Loading