mirror of
https://github.com/Part-DB/Part-DB-server.git
synced 2025-06-21 01:25:55 +02:00
Workaround symfonys issue with NumberType and negative exponential e-notation number
This fixes issue #649
This commit is contained in:
parent
27a28d4adc
commit
1aee0a91c0
3 changed files with 280 additions and 0 deletions
|
@ -11,6 +11,7 @@ parameters:
|
||||||
- src/Configuration/*
|
- src/Configuration/*
|
||||||
- src/Doctrine/Purger/*
|
- src/Doctrine/Purger/*
|
||||||
- src/DataTables/Adapters/TwoStepORMAdapter.php
|
- src/DataTables/Adapters/TwoStepORMAdapter.php
|
||||||
|
- src/Form/Fixes/*
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
51
src/Form/Fixes/FixNumberType.php
Normal file
51
src/Form/Fixes/FixNumberType.php
Normal file
|
@ -0,0 +1,51 @@
|
||||||
|
<?php
|
||||||
|
/*
|
||||||
|
* This file is part of Part-DB (https://github.com/Part-DB/Part-DB-symfony).
|
||||||
|
*
|
||||||
|
* Copyright (C) 2019 - 2024 Jan Böhmer (https://github.com/jbtronics)
|
||||||
|
*
|
||||||
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU Affero General Public License as published
|
||||||
|
* by the Free Software Foundation, either version 3 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU Affero General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU Affero General Public License
|
||||||
|
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
|
||||||
|
namespace App\Form\Fixes;
|
||||||
|
|
||||||
|
use Symfony\Component\Form\AbstractTypeExtension;
|
||||||
|
use Symfony\Component\Form\Extension\Core\Type\NumberType;
|
||||||
|
use Symfony\Component\Form\FormBuilderInterface;
|
||||||
|
|
||||||
|
class FixNumberType extends AbstractTypeExtension
|
||||||
|
{
|
||||||
|
|
||||||
|
public function buildForm(FormBuilderInterface $builder, array $options)
|
||||||
|
{
|
||||||
|
//Remove existing view transformers
|
||||||
|
$builder->resetViewTransformers();
|
||||||
|
|
||||||
|
//And add our fixed version
|
||||||
|
$builder->addViewTransformer(new FixedNumberToLocalizedStringTransformer(
|
||||||
|
$options['scale'],
|
||||||
|
$options['grouping'],
|
||||||
|
$options['rounding_mode'],
|
||||||
|
$options['html5'] ? 'en' : null
|
||||||
|
));
|
||||||
|
}
|
||||||
|
|
||||||
|
public static function getExtendedTypes(): iterable
|
||||||
|
{
|
||||||
|
return [NumberType::class];
|
||||||
|
}
|
||||||
|
}
|
228
src/Form/Fixes/FixedNumberToLocalizedStringTransformer.php
Normal file
228
src/Form/Fixes/FixedNumberToLocalizedStringTransformer.php
Normal file
|
@ -0,0 +1,228 @@
|
||||||
|
<?php
|
||||||
|
/*
|
||||||
|
* This file is part of Part-DB (https://github.com/Part-DB/Part-DB-symfony).
|
||||||
|
*
|
||||||
|
* Copyright (C) 2019 - 2024 Jan Böhmer (https://github.com/jbtronics)
|
||||||
|
*
|
||||||
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU Affero General Public License as published
|
||||||
|
* by the Free Software Foundation, either version 3 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU Affero General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU Affero General Public License
|
||||||
|
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
|
||||||
|
|
||||||
|
namespace App\Form\Fixes;
|
||||||
|
|
||||||
|
use Symfony\Component\Form\DataTransformerInterface;
|
||||||
|
use Symfony\Component\Form\Exception\TransformationFailedException;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Same as the default NumberToLocalizedStringTransformer, but with a fix for the decimal separator.
|
||||||
|
* See https://github.com/symfony/symfony/pull/57861
|
||||||
|
*/
|
||||||
|
class FixedNumberToLocalizedStringTransformer implements DataTransformerInterface
|
||||||
|
{
|
||||||
|
protected $grouping;
|
||||||
|
|
||||||
|
protected $roundingMode;
|
||||||
|
|
||||||
|
private ?int $scale;
|
||||||
|
private ?string $locale;
|
||||||
|
|
||||||
|
public function __construct(?int $scale = null, ?bool $grouping = false, ?int $roundingMode = \NumberFormatter::ROUND_HALFUP, ?string $locale = null)
|
||||||
|
{
|
||||||
|
$this->scale = $scale;
|
||||||
|
$this->grouping = $grouping ?? false;
|
||||||
|
$this->roundingMode = $roundingMode ?? \NumberFormatter::ROUND_HALFUP;
|
||||||
|
$this->locale = $locale;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Transforms a number type into localized number.
|
||||||
|
*
|
||||||
|
* @param int|float|null $value Number value
|
||||||
|
*
|
||||||
|
* @throws TransformationFailedException if the given value is not numeric
|
||||||
|
* or if the value cannot be transformed
|
||||||
|
*/
|
||||||
|
public function transform(mixed $value): string
|
||||||
|
{
|
||||||
|
if (null === $value) {
|
||||||
|
return '';
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!is_numeric($value)) {
|
||||||
|
throw new TransformationFailedException('Expected a numeric.');
|
||||||
|
}
|
||||||
|
|
||||||
|
$formatter = $this->getNumberFormatter();
|
||||||
|
$value = $formatter->format($value);
|
||||||
|
|
||||||
|
if (intl_is_failure($formatter->getErrorCode())) {
|
||||||
|
throw new TransformationFailedException($formatter->getErrorMessage());
|
||||||
|
}
|
||||||
|
|
||||||
|
// Convert non-breaking and narrow non-breaking spaces to normal ones
|
||||||
|
$value = str_replace(["\xc2\xa0", "\xe2\x80\xaf"], ' ', $value);
|
||||||
|
|
||||||
|
return $value;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Transforms a localized number into an integer or float.
|
||||||
|
*
|
||||||
|
* @param string $value The localized value
|
||||||
|
*
|
||||||
|
* @throws TransformationFailedException if the given value is not a string
|
||||||
|
* or if the value cannot be transformed
|
||||||
|
*/
|
||||||
|
public function reverseTransform(mixed $value): int|float|null
|
||||||
|
{
|
||||||
|
if (null !== $value && !\is_string($value)) {
|
||||||
|
throw new TransformationFailedException('Expected a string.');
|
||||||
|
}
|
||||||
|
|
||||||
|
if (null === $value || '' === $value) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (\in_array($value, ['NaN', 'NAN', 'nan'], true)) {
|
||||||
|
throw new TransformationFailedException('"NaN" is not a valid number.');
|
||||||
|
}
|
||||||
|
|
||||||
|
$position = 0;
|
||||||
|
$formatter = $this->getNumberFormatter();
|
||||||
|
$groupSep = $formatter->getSymbol(\NumberFormatter::GROUPING_SEPARATOR_SYMBOL);
|
||||||
|
$decSep = $formatter->getSymbol(\NumberFormatter::DECIMAL_SEPARATOR_SYMBOL);
|
||||||
|
|
||||||
|
if ('.' !== $decSep && (!$this->grouping || '.' !== $groupSep)) {
|
||||||
|
$value = str_replace('.', $decSep, $value);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (',' !== $decSep && (!$this->grouping || ',' !== $groupSep)) {
|
||||||
|
$value = str_replace(',', $decSep, $value);
|
||||||
|
}
|
||||||
|
|
||||||
|
//If the value is in exponential notation with a negative exponent, we end up with a float value too
|
||||||
|
if (str_contains($value, $decSep) || stripos($value, 'e-') !== false) {
|
||||||
|
$type = \NumberFormatter::TYPE_DOUBLE;
|
||||||
|
} else {
|
||||||
|
$type = \PHP_INT_SIZE === 8
|
||||||
|
? \NumberFormatter::TYPE_INT64
|
||||||
|
: \NumberFormatter::TYPE_INT32;
|
||||||
|
}
|
||||||
|
|
||||||
|
$result = $formatter->parse($value, $type, $position);
|
||||||
|
|
||||||
|
if (intl_is_failure($formatter->getErrorCode())) {
|
||||||
|
throw new TransformationFailedException($formatter->getErrorMessage());
|
||||||
|
}
|
||||||
|
|
||||||
|
if ($result >= \PHP_INT_MAX || $result <= -\PHP_INT_MAX) {
|
||||||
|
throw new TransformationFailedException('I don\'t have a clear idea what infinity looks like.');
|
||||||
|
}
|
||||||
|
|
||||||
|
$result = $this->castParsedValue($result);
|
||||||
|
|
||||||
|
if (false !== $encoding = mb_detect_encoding($value, null, true)) {
|
||||||
|
$length = mb_strlen($value, $encoding);
|
||||||
|
$remainder = mb_substr($value, $position, $length, $encoding);
|
||||||
|
} else {
|
||||||
|
$length = \strlen($value);
|
||||||
|
$remainder = substr($value, $position, $length);
|
||||||
|
}
|
||||||
|
|
||||||
|
// After parsing, position holds the index of the character where the
|
||||||
|
// parsing stopped
|
||||||
|
if ($position < $length) {
|
||||||
|
// Check if there are unrecognized characters at the end of the
|
||||||
|
// number (excluding whitespace characters)
|
||||||
|
$remainder = trim($remainder, " \t\n\r\0\x0b\xc2\xa0");
|
||||||
|
|
||||||
|
if ('' !== $remainder) {
|
||||||
|
throw new TransformationFailedException(sprintf('The number contains unrecognized characters: "%s".', $remainder));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// NumberFormatter::parse() does not round
|
||||||
|
return $this->round($result);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Returns a preconfigured \NumberFormatter instance.
|
||||||
|
*/
|
||||||
|
protected function getNumberFormatter(): \NumberFormatter
|
||||||
|
{
|
||||||
|
$formatter = new \NumberFormatter($this->locale ?? \Locale::getDefault(), \NumberFormatter::DECIMAL);
|
||||||
|
|
||||||
|
if (null !== $this->scale) {
|
||||||
|
$formatter->setAttribute(\NumberFormatter::FRACTION_DIGITS, $this->scale);
|
||||||
|
$formatter->setAttribute(\NumberFormatter::ROUNDING_MODE, $this->roundingMode);
|
||||||
|
}
|
||||||
|
|
||||||
|
$formatter->setAttribute(\NumberFormatter::GROUPING_USED, $this->grouping);
|
||||||
|
|
||||||
|
return $formatter;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @internal
|
||||||
|
*/
|
||||||
|
protected function castParsedValue(int|float $value): int|float
|
||||||
|
{
|
||||||
|
if (\is_int($value) && $value === (int) $float = (float) $value) {
|
||||||
|
return $float;
|
||||||
|
}
|
||||||
|
|
||||||
|
return $value;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Rounds a number according to the configured scale and rounding mode.
|
||||||
|
*/
|
||||||
|
private function round(int|float $number): int|float
|
||||||
|
{
|
||||||
|
if (null !== $this->scale && null !== $this->roundingMode) {
|
||||||
|
// shift number to maintain the correct scale during rounding
|
||||||
|
$roundingCoef = 10 ** $this->scale;
|
||||||
|
// string representation to avoid rounding errors, similar to bcmul()
|
||||||
|
$number = (string) ($number * $roundingCoef);
|
||||||
|
|
||||||
|
switch ($this->roundingMode) {
|
||||||
|
case \NumberFormatter::ROUND_CEILING:
|
||||||
|
$number = ceil($number);
|
||||||
|
break;
|
||||||
|
case \NumberFormatter::ROUND_FLOOR:
|
||||||
|
$number = floor($number);
|
||||||
|
break;
|
||||||
|
case \NumberFormatter::ROUND_UP:
|
||||||
|
$number = $number > 0 ? ceil($number) : floor($number);
|
||||||
|
break;
|
||||||
|
case \NumberFormatter::ROUND_DOWN:
|
||||||
|
$number = $number > 0 ? floor($number) : ceil($number);
|
||||||
|
break;
|
||||||
|
case \NumberFormatter::ROUND_HALFEVEN:
|
||||||
|
$number = round($number, 0, \PHP_ROUND_HALF_EVEN);
|
||||||
|
break;
|
||||||
|
case \NumberFormatter::ROUND_HALFUP:
|
||||||
|
$number = round($number, 0, \PHP_ROUND_HALF_UP);
|
||||||
|
break;
|
||||||
|
case \NumberFormatter::ROUND_HALFDOWN:
|
||||||
|
$number = round($number, 0, \PHP_ROUND_HALF_DOWN);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
$number = 1 === $roundingCoef ? (int) $number : $number / $roundingCoef;
|
||||||
|
}
|
||||||
|
|
||||||
|
return $number;
|
||||||
|
}
|
||||||
|
}
|
Loading…
Add table
Add a link
Reference in a new issue