Upgraded brick/math to latest version

jbtronics · jbtronics · commit 527c42c22757 · 2026-05-19T21:18:17.000+02:00
diff --git a/composer.json b/composer.json
@@ -17,7 +17,7 @@
         "api-platform/json-api": "^4.0.0",
         "api-platform/symfony": "^4.0.0",
         "beberlei/doctrineextensions": "^1.2",
-        "brick/math": "^0.14.8",
+        "brick/math": "^0.17.0",
         "brick/schema": "^0.2.0",
         "composer/ca-bundle": "^1.5",
         "composer/package-versions-deprecated": "^1.11.99.5",
diff --git a/composer.lock b/composer.lock
diff --git a/src/DataTables/ProjectBomEntriesDataTable.php b/src/DataTables/ProjectBomEntriesDataTable.php
@@ -37,6 +37,7 @@
 use App\Services\Formatters\AmountFormatter;
 use App\Services\Formatters\MoneyFormatter;
 use App\Services\ProjectSystem\ProjectBuildHelper;
+use Brick\Math\BigDecimal;
 use Brick\Math\RoundingMode;
 use Doctrine\ORM\AbstractQuery;
 use Doctrine\ORM\Query;
@@ -93,14 +94,14 @@ public function configure(DataTable $dataTable, array $options): void
                     return htmlspecialchars($this->amountFormatter->format($context->getQuantity(), $context->getPart()->getPartUnit()));
                 },
             ])
-			->add('partId', TextColumn::class, [
-				'label' => $this->translator->trans('project.bom.part_id'),
-				'visible' => true,
-				'orderField' => 'part.id',
-				'render' => function ($value, ProjectBOMEntry $context) {
-					return $context->getPart() instanceof Part ? (string) $context->getPart()->getId() : '';
-				},
-			])
+            ->add('partId', TextColumn::class, [
+                'label' => $this->translator->trans('project.bom.part_id'),
+                'visible' => true,
+                'orderField' => 'part.id',
+                'render' => function ($value, ProjectBOMEntry $context) {
+                    return $context->getPart() instanceof Part ? (string) $context->getPart()->getId() : '';
+                },
+            ])
             ->add('name', TextColumn::class, [
                 'label' => $this->translator->trans('part.table.name'),
                 'orderField' => 'NATSORT(part.name)',
@@ -161,7 +162,7 @@ public function configure(DataTable $dataTable, array $options): void
                 'label' => $this->translator->trans('part.table.manufacturingStatus'),
                 'data' => static fn(ProjectBOMEntry $context): ?ManufacturingStatus => $context->getPart()?->getManufacturingStatus(),
                 'orderField' => 'part.manufacturing_status',
-               	'class' => ManufacturingStatus::class,
+                'class' => ManufacturingStatus::class,
                 'render' => function (?ManufacturingStatus $status, ProjectBOMEntry $context): string {
                     if ($status === null) {
                         return '';
@@ -212,7 +213,7 @@ public function configure(DataTable $dataTable, array $options): void
                 'visible' => false,
                 'render' => function ($value, ProjectBOMEntry $context) {
                     $price = $this->projectBuildHelper->getEntryUnitPrice($context);
-                    return $this->moneyFormatter->format($price->toScale(2, RoundingMode::UP)->toFloat(), null, 2, true);
+                    return $this->moneyFormatter->format($price->toScale(2, RoundingMode::Up)->toFloat(), null, 2, true);
                 },
             ])
             ->add('ext_price', TextColumn::class, [
@@ -221,7 +222,8 @@ public function configure(DataTable $dataTable, array $options): void
                 'render' => function ($value, ProjectBOMEntry $context) {
                     $price = $this->projectBuildHelper->getEntryUnitPrice($context);
                     return $this->moneyFormatter->format(
-                        $price->multipliedBy($context->getQuantity())->toScale(2, RoundingMode::UP)->toFloat(),
+                        $price->multipliedBy(BigDecimal::fromFloatShortest($context->getQuantity()))
+                            ->toScale(2, RoundingMode::Up)->toFloat(),
                         null,
                         2,
                         true
diff --git a/src/Doctrine/Types/BigDecimalType.php b/src/Doctrine/Types/BigDecimalType.php
@@ -44,7 +44,7 @@ public function convertToPHPValue(mixed $value, AbstractPlatform $platform): ?Bi
 
 
 
-        return BigDecimal::of($value);
+        return BigDecimal::of(is_float($value) ? BigDecimal::fromFloatShortest($value) : $value);
     }
 
     /**
diff --git a/src/Entity/PriceInformations/Currency.php b/src/Entity/PriceInformations/Currency.php
@@ -204,7 +204,7 @@ public function getInverseExchangeRate(): ?BigDecimal
             return null;
         }
 
-        return BigDecimal::one()->dividedBy($tmp, $tmp->getScale(), RoundingMode::HALF_UP);
+        return BigDecimal::one()->dividedBy($tmp, $tmp->getScale(), RoundingMode::HalfUp);
     }
 
     /**
diff --git a/src/Entity/PriceInformations/Pricedetail.php b/src/Entity/PriceInformations/Pricedetail.php
@@ -195,10 +195,10 @@ public function getPrice(): BigDecimal
     #[SerializedName('price_per_unit')]
     public function getPricePerUnit(float|string|BigDecimal $multiplier = 1.0): BigDecimal
     {
-        $tmp = BigDecimal::of($multiplier);
+        $tmp = is_float($multiplier) ? BigDecimal::fromFloatShortest($multiplier) : BigDecimal::of($multiplier);
         $tmp = $tmp->multipliedBy($this->price);
 
-        return $tmp->dividedBy($this->price_related_quantity, static::PRICE_PRECISION, RoundingMode::HALF_UP);
+        return $tmp->dividedBy(BigDecimal::fromFloatShortest($this->price_related_quantity), static::PRICE_PRECISION, RoundingMode::HalfUp);
     }
 
     /**
@@ -317,7 +317,7 @@ public function setCurrency(?Currency $currency): self
      */
     public function setPrice(BigDecimal $new_price): self
     {
-        $tmp = $new_price->toScale(self::PRICE_PRECISION, RoundingMode::HALF_UP);
+        $tmp = $new_price->toScale(self::PRICE_PRECISION, RoundingMode::HalfUp);
         //Only change the object, if the value changes, so that doctrine does not detect it as changed.
         if ((string) $tmp !== (string) $this->price) {
             $this->price = $tmp;
diff --git a/src/Services/ImportExportSystem/PartKeeprImporter/PKPartImporter.php b/src/Services/ImportExportSystem/PartKeeprImporter/PKPartImporter.php
@@ -286,7 +286,7 @@ protected function importOrderdetails(array $data): void
                 //Partkeepr stores the price per item, we need to convert it to the price per packaging unit
                 $price_per_item = BigDecimal::of($partdistributor['price']);
                 $packaging_unit = (float) ($partdistributor['packagingUnit'] ?? 1);
-                $pricedetail->setPrice($price_per_item->multipliedBy($packaging_unit));
+                $pricedetail->setPrice($price_per_item->multipliedBy(BigDecimal::fromFloatShortest($packaging_unit)));
                 $pricedetail->setPriceRelatedQuantity($packaging_unit);
                 //We have to set the minimum discount quantity to the packaging unit (PartKeepr does not know this concept)
                 //But in Part-DB the minimum discount qty have to be unique across a orderdetail
diff --git a/src/Services/LogSystem/TimeTravel.php b/src/Services/LogSystem/TimeTravel.php
@@ -222,7 +222,7 @@ public function applyEntry(AbstractDBElement $element, TimeTravelInterface $logE
             if (isset($metadata->fieldMappings[$field])) {
                 //We need to convert the string to a BigDecimal first
                 if (!$data instanceof BigDecimal && ('big_decimal' === $metadata->getFieldMapping($field)->type)) {
-                    $data = BigDecimal::of($data);
+                    $data = is_float($data) ? BigDecimal::fromFloatShortest($data) : BigDecimal::of($data);
                 }
 
                 if (!$data instanceof \DateTimeInterface
diff --git a/src/Services/Parts/PricedetailHelper.php b/src/Services/Parts/PricedetailHelper.php
@@ -170,7 +170,7 @@ public function calculateAvgPrice(Part $part, ?float $amount = null, ?Currency $
             return null;
         }
 
-        return $avg->dividedBy($count, Pricedetail::PRICE_PRECISION, RoundingMode::HALF_UP);
+        return $avg->dividedBy($count, Pricedetail::PRICE_PRECISION, RoundingMode::HalfUp);
     }
 
     /**
@@ -213,6 +213,6 @@ public function convertMoneyToCurrency(BigDecimal $value, ?Currency $originCurre
             $val_target = $val_base->multipliedBy($targetCurrency->getInverseExchangeRate());
         }
 
-        return $val_target->toScale(Pricedetail::PRICE_PRECISION, RoundingMode::HALF_UP);
+        return $val_target->toScale(Pricedetail::PRICE_PRECISION, RoundingMode::HalfUp);
     }
 }
diff --git a/src/Services/ProjectSystem/ProjectBuildHelper.php b/src/Services/ProjectSystem/ProjectBuildHelper.php
@@ -190,7 +190,7 @@ public function calculateTotalBuildPrice(Project $project, int $number_of_builds
                 continue;
             }
             $has_price = true;
-            $total = $total->plus($unit_price->multipliedBy($entry->getQuantity())->multipliedBy($number_of_builds));
+            $total = $total->plus($unit_price->multipliedBy(BigDecimal::fromFloatShortest($entry->getQuantity()))->multipliedBy($number_of_builds));
         }
 
         return $has_price ? $total : null;
@@ -206,7 +206,7 @@ public function calculateUnitBuildPrice(Project $project, int $number_of_builds
         if ($total === null) {
             return null;
         }
-        return $total->dividedBy($number_of_builds, 10, RoundingMode::HALF_UP);
+        return $total->dividedBy($number_of_builds, 10, RoundingMode::HalfUp);
     }
 
     /**
@@ -215,7 +215,7 @@ public function calculateUnitBuildPrice(Project $project, int $number_of_builds
     public function roundedTotalBuildPrice(Project $project, int $number_of_builds = 1, ?Currency $currency = null): ?BigDecimal
     {
         return $this->calculateTotalBuildPrice($project, $number_of_builds, $currency)
-            ?->toScale(2, RoundingMode::UP);
+            ?->toScale(2, RoundingMode::Up);
     }
 
     /**
@@ -224,7 +224,7 @@ public function roundedTotalBuildPrice(Project $project, int $number_of_builds =
     public function roundedUnitBuildPrice(Project $project, int $number_of_builds = 1, ?Currency $currency = null): ?BigDecimal
     {
         return $this->calculateUnitBuildPrice($project, $number_of_builds, $currency)
-            ?->toScale(2, RoundingMode::UP);
+            ?->toScale(2, RoundingMode::Up);
     }
 
     /**
diff --git a/src/Services/Tools/ExchangeRateUpdater.php b/src/Services/Tools/ExchangeRateUpdater.php
@@ -44,15 +44,15 @@ public function update(Currency $currency): Currency
         try {
             //Try it in the direction QUOTE/BASE first, as most providers provide rates in this direction
             $rate = $this->swap->latest($currency->getIsoCode().'/'.$this->localizationSettings->baseCurrency);
-            $effective_rate = BigDecimal::of($rate->getValue());
+            $effective_rate = BigDecimal::fromFloatShortest($rate->getValue());
         } catch (UnsupportedCurrencyPairException|UnsupportedExchangeQueryException $exception) {
             //Otherwise try to get it inverse and calculate it ourselfes, from the format "BASE/QUOTE"
             $rate = $this->swap->latest($this->localizationSettings->baseCurrency.'/'.$currency->getIsoCode());
             //The rate says how many quote units are worth one base unit
             //So we need to invert it to get the exchange rate
 
-            $rate_bd = BigDecimal::of($rate->getValue());
-            $effective_rate = BigDecimal::one()->dividedBy($rate_bd, Currency::PRICE_SCALE, RoundingMode::HALF_UP);
+            $rate_bd = BigDecimal::fromFloatShortest($rate->getValue());
+            $effective_rate = BigDecimal::one()->dividedBy($rate_bd, Currency::PRICE_SCALE, RoundingMode::HalfUp);
         }
 
         $currency->setExchangeRate($effective_rate);

Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ public function convertToPHPValue(mixed $value, AbstractPlatform $platform): ?Bi`
`44`	`44`
`45`	`45`
`46`	`46`
`47`		`- return BigDecimal::of($value);`
	`47`	`+ return BigDecimal::of(is_float($value) ? BigDecimal::fromFloatShortest($value) : $value);`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -204,7 +204,7 @@ public function getInverseExchangeRate(): ?BigDecimal`
`204`	`204`	`return null;`
`205`	`205`	`}`
`206`	`206`
`207`		`- return BigDecimal::one()->dividedBy($tmp, $tmp->getScale(), RoundingMode::HALF_UP);`
	`207`	`+ return BigDecimal::one()->dividedBy($tmp, $tmp->getScale(), RoundingMode::HalfUp);`
`208`	`208`	`}`
`209`	`209`
`210`	`210`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -195,10 +195,10 @@ public function getPrice(): BigDecimal`
`195`	`195`	`#[SerializedName('price_per_unit')]`
`196`	`196`	`public function getPricePerUnit(float\|string\|BigDecimal $multiplier = 1.0): BigDecimal`
`197`	`197`	`{`
`198`		`- $tmp = BigDecimal::of($multiplier);`
	`198`	`+ $tmp = is_float($multiplier) ? BigDecimal::fromFloatShortest($multiplier) : BigDecimal::of($multiplier);`
`199`	`199`	`$tmp = $tmp->multipliedBy($this->price);`
`200`	`200`
`201`		`- return $tmp->dividedBy($this->price_related_quantity, static::PRICE_PRECISION, RoundingMode::HALF_UP);`
	`201`	`+ return $tmp->dividedBy(BigDecimal::fromFloatShortest($this->price_related_quantity), static::PRICE_PRECISION, RoundingMode::HalfUp);`
`202`	`202`	`}`
`203`	`203`
`204`	`204`	`/**`
`@@ -317,7 +317,7 @@ public function setCurrency(?Currency $currency): self`
`317`	`317`	`*/`
`318`	`318`	`public function setPrice(BigDecimal $new_price): self`
`319`	`319`	`{`
`320`		`- $tmp = $new_price->toScale(self::PRICE_PRECISION, RoundingMode::HALF_UP);`
	`320`	`+ $tmp = $new_price->toScale(self::PRICE_PRECISION, RoundingMode::HalfUp);`
`321`	`321`	`//Only change the object, if the value changes, so that doctrine does not detect it as changed.`
`322`	`322`	`if ((string) $tmp !== (string) $this->price) {`
`323`	`323`	`$this->price = $tmp;`
Original file line number	Diff line number	Diff line change
`@@ -222,7 +222,7 @@ public function applyEntry(AbstractDBElement $element, TimeTravelInterface $logE`
`222`	`222`	`if (isset($metadata->fieldMappings[$field])) {`
`223`	`223`	`//We need to convert the string to a BigDecimal first`
`224`	`224`	`if (!$data instanceof BigDecimal && ('big_decimal' === $metadata->getFieldMapping($field)->type)) {`
`225`		`- $data = BigDecimal::of($data);`
	`225`	`+ $data = is_float($data) ? BigDecimal::fromFloatShortest($data) : BigDecimal::of($data);`
`226`	`226`	`}`
`227`	`227`
`228`	`228`	`if (!$data instanceof \DateTimeInterface`
Original file line number	Diff line number	Diff line change
`@@ -170,7 +170,7 @@ public function calculateAvgPrice(Part $part, ?float $amount = null, ?Currency $`
`170`	`170`	`return null;`
`171`	`171`	`}`
`172`	`172`
`173`		`- return $avg->dividedBy($count, Pricedetail::PRICE_PRECISION, RoundingMode::HALF_UP);`
	`173`	`+ return $avg->dividedBy($count, Pricedetail::PRICE_PRECISION, RoundingMode::HalfUp);`
`174`	`174`	`}`
`175`	`175`
`176`	`176`	`/**`
`@@ -213,6 +213,6 @@ public function convertMoneyToCurrency(BigDecimal $value, ?Currency $originCurre`
`213`	`213`	`$val_target = $val_base->multipliedBy($targetCurrency->getInverseExchangeRate());`
`214`	`214`	`}`
`215`	`215`
`216`		`- return $val_target->toScale(Pricedetail::PRICE_PRECISION, RoundingMode::HALF_UP);`
	`216`	`+ return $val_target->toScale(Pricedetail::PRICE_PRECISION, RoundingMode::HalfUp);`
`217`	`217`	`}`
`218`	`218`	`}`
Original file line number	Diff line number	Diff line change
`@@ -190,7 +190,7 @@ public function calculateTotalBuildPrice(Project $project, int $number_of_builds`
`190`	`190`	`continue;`
`191`	`191`	`}`
`192`	`192`	`$has_price = true;`
`193`		`- $total = $total->plus($unit_price->multipliedBy($entry->getQuantity())->multipliedBy($number_of_builds));`
	`193`	`+ $total = $total->plus($unit_price->multipliedBy(BigDecimal::fromFloatShortest($entry->getQuantity()))->multipliedBy($number_of_builds));`
`194`	`194`	`}`
`195`	`195`
`196`	`196`	`return $has_price ? $total : null;`
`@@ -206,7 +206,7 @@ public function calculateUnitBuildPrice(Project $project, int $number_of_builds`
`206`	`206`	`if ($total === null) {`
`207`	`207`	`return null;`
`208`	`208`	`}`
`209`		`- return $total->dividedBy($number_of_builds, 10, RoundingMode::HALF_UP);`
	`209`	`+ return $total->dividedBy($number_of_builds, 10, RoundingMode::HalfUp);`
`210`	`210`	`}`
`211`	`211`
`212`	`212`	`/**`
`@@ -215,7 +215,7 @@ public function calculateUnitBuildPrice(Project $project, int $number_of_builds`
`215`	`215`	`public function roundedTotalBuildPrice(Project $project, int $number_of_builds = 1, ?Currency $currency = null): ?BigDecimal`
`216`	`216`	`{`
`217`	`217`	`return $this->calculateTotalBuildPrice($project, $number_of_builds, $currency)`
`218`		`- ?->toScale(2, RoundingMode::UP);`
	`218`	`+ ?->toScale(2, RoundingMode::Up);`
`219`	`219`	`}`
`220`	`220`
`221`	`221`	`/**`
`@@ -224,7 +224,7 @@ public function roundedTotalBuildPrice(Project $project, int $number_of_builds =`
`224`	`224`	`public function roundedUnitBuildPrice(Project $project, int $number_of_builds = 1, ?Currency $currency = null): ?BigDecimal`
`225`	`225`	`{`
`226`	`226`	`return $this->calculateUnitBuildPrice($project, $number_of_builds, $currency)`
`227`		`- ?->toScale(2, RoundingMode::UP);`
	`227`	`+ ?->toScale(2, RoundingMode::Up);`
`228`	`228`	`}`
`229`	`229`
`230`	`230`	`/**`