8000 minor #52660 [Form] Clean unused code (alamirault) · symfony/symfony@8e0f304 · GitHub
[go: up one dir, main page]
Skip to content

Commit 8e0f304

Browse files
fabpotfabpot
committed
minor #52660 [Form] Clean unused code (alamirault)
This PR was squashed before being merged into the 7.1 branch. Discussion ---------- [Form] Clean unused code | Q | A | ------------- | --- | Branch? | 7.1 | Bug fix? | no | New feature? | no <!-- please update src/**/CHANGELOG.md files --> | Deprecations? | no <!-- please update UPGRADE-*.md and src/**/CHANGELOG.md files --> | Issues | Fix #... <!-- prefix each issue number with "Fix #", no need to create an issue if none exists, explain below instead --> | License | MIT Remove unused code Commits ------- 1b4a246 [Form] Clean unused code
2 parents 37f04cf + 1b4a246 commit 8e0f304

File tree

4 files changed

+29
-73
lines changed

4 files changed

+29
-73
lines changed

‎src/Symfony/Component/Form/Extension/Core/DataTransformer/NumberToLocalizedStringTransformer.php

Lines changed: 10 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -183,35 +183,21 @@ protected function castParsedValue(int|float $value): int|float
183183
*/
184184
private function round(int|float $number): int|float
185185
{
186-
if (null !== $this->scale && null !== $this->roundingMode) {
186+
if (null !== $this->scale) {
187187
// shift number to maintain the correct scale during rounding
188188
$roundingCoef = 10 ** $this->scale;
189189
// string representation to avoid rounding errors, similar to bcmul()
190190
$number = (string) ($number * $roundingCoef);
191191

192-
switch ($this->roundingMode) {
193-
case \NumberFormatter::ROUND_CEILING:
194-
$number = ceil($number);
195-
break;
196-
case \NumberFormatter::ROUND_FLOOR:
197-
$number = floor($number);
198-
break;
199-
case \NumberFormatter::ROUND_UP:
200-
$number = $number > 0 ? ceil($number) : floor($number);
201-
break;
202-
case \NumberFormatter::ROUND_DOWN:
203-
$number = $number > 0 ? floor($number) : ceil($number);
204-
break;
205-
case \NumberFormatter::ROUND_HALFEVEN:
206-
$number = round($number, 0, \PHP_ROUND_HALF_EVEN);
207-
break;
208-
case \NumberFormatter::ROUND_HALFUP:
209-
$number = round($number, 0, \PHP_ROUND_HALF_UP);
210-
break;
211-
case \NumberFormatter::ROUND_HALFDOWN:
212-
$number = round($number, 0, \PHP_ROUND_HALF_DOWN);
213-
break;
214-
}
192+
$number = match ($this->roundingMode) {
193+
\NumberFormatter::ROUND_CEILING => ceil($number),
194+
\NumberFormatter::ROUND_FLOOR => floor($number),
195+
\NumberFormatter::ROUND_UP => $number > 0 ? ceil($number) : floor($number),
196+
\NumberFormatter::ROUND_DOWN => $number > 0 ? floor($number) : ceil($number),
197+
\NumberFormatter::ROUND_HALFEVEN => round($number, 0, \PHP_ROUND_HALF_EVEN),
198+
\NumberFormatter::ROUND_HALFUP => round($number, 0, \PHP_ROUND_HALF_UP),
199+
\NumberFormatter::ROUND_HALFDOWN => round($number, 0, \PHP_ROUND_HALF_DOWN),
200+
};
215201

216202
$number = 1 === $roundingCoef ? (int) $number : $number / $roundingCoef;
217203
}

‎src/Symfony/Component/Form/Extension/Core/DataTransformer/PercentToLocalizedStringTransformer.php

Lines changed: 19 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -180,9 +180,7 @@ protected function getNumberFormatter(): \NumberFormatter
180180

181181
$formatter->setAttribute(\NumberFormatter::FRACTION_DIGITS, $this->scale);
182182

183-
if (null !== $this->roundingMode) {
184-
$formatter->setAttribute(\NumberFormatter::ROUNDING_MODE, $this->roundingMode);
185-
}
183+
$formatter->setAttribute(\NumberFormatter::ROUNDING_MODE, $this->roundingMode);
186184

187185
return $formatter;
188186
}
@@ -192,43 +190,27 @@ protected function getNumberFormatter(): \NumberFormatter
192190
*/
193191
private function round(int|float $number): int|float
194192
{
195-
if (null !== $this->scale && null !== $this->roundingMode) {
196-
// shift number to maintain the correct scale during rounding
197-
$roundingCoef = 10 ** $this->scale;
193+
// shift number to maintain the correct scale during rounding
194+
$roundingCoef = 10 ** $this->scale;
198195

199-
if (self::FRACTIONAL == $this->type) {
200-
$roundingCoef *= 100;
201-
}
196+
if (self::FRACTIONAL === $this->type) {
197+
$roundingCoef *= 100;
198+
}
202199

203-
// string representation to avoid rounding errors, similar to bcmul()
204-
$number = (string) ($number * $roundingCoef);
205-
206-
switch ($this->roundingMode) {
207-
case \NumberFormatter::ROUND_CEILING:
208-
$number = ceil($number);
209-
break;
210-
case \NumberFormatter::ROUND_FLOOR:
211-
$number = floor($number);
212-
break;
213-
case \NumberFormatter::ROUND_UP:
214-
$number = $number > 0 ? ceil($number) : floor($number);
215-
break;
216-
case \NumberFormatter::ROUND_DOWN:
217-
$number = $number > 0 ? floor($number) : ceil($number);
218-
break;
219-
case \NumberFormatter::ROUND_HALFEVEN:
220-
$number = round($number, 0, \PHP_ROUND_HALF_EVEN);
221-
break;
222-
case \NumberFormatter::ROUND_HALFUP:
223-
$number = round($number, 0, \PHP_ROUND_HALF_UP);
224-
break;
225-
case \NumberFormatter::ROUND_HALFDOWN:
226-
$number = round($number, 0, \PHP_ROUND_HALF_DOWN);
227-
break;
228-
}
200+
// string representation to avoid rounding errors, similar to bcmul()
201+
$number = (string) ($number * $roundingCoef);
229202

230-
$number = 1 === $roundingCoef ? (int) $number : $number / $roundingCoef;
231-
}
203+
$number = match ($this->roundingMode) {
204+
\NumberFormatter::ROUND_CEILING => ceil($number),
205+
\NumberFormatter::ROUND_FLOOR => floor($number),
206+
\NumberFormatter::ROUND_UP => $number > 0 ? ceil($number) : floor($number),
207+
\NumberFormatter::ROUND_DOWN => $number > 0 ? floor($number) : ceil($number),
208+
\NumberFormatter::ROUND_HALFEVEN => round($number, 0, \PHP_ROUND_HALF_EVEN),
209+
\NumberFormatter::ROUND_HALFUP => round($number, 0, \PHP_ROUND_HALF_UP),
210+
\NumberFormatter::ROUND_HALFDOWN => round($number, 0, \PHP_ROUND_HALF_DOWN),
211+
};
212+
213+
$number = 1 === $roundingCoef ? (int) $number : $number / $roundingCoef;
232214

233215
return $number;
234216
}

‎src/Symfony/Component/Form/Form.php

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
use Symfony\Component\Form\Exception\OutOfBoundsException;
2222
use Symfony\Component\Form\Exception\RuntimeException;
2323
use Symfony\Component\Form\Exception\TransformationFailedException;
24-
use Symfony\Component\Form\Exception\UnexpectedTypeException;
2524
use Symfony\Component\Form\Extension\Core\Type\TextType;
2625
use Symfony\Component\Form\Util\FormUtil;
2726
use Symfony\Component\Form\Util\InheritDataAwareIterator;
@@ -727,12 +726,6 @@ public function add(FormInterface|string $child, string $type = null, array $opt
727726
}
728727

729728
if (!$child instanceof FormInterface) {
730-
if (!\is_string($child) && !\is_int($child)) {
731-
throw new UnexpectedTypeException($child, 'string or Symfony\Component\Form\FormInterface');
732-
}
733-
734-
$child = (string) $child;
735-
736729
// Never initialize child forms automatically
737730
$options['auto_initialize'] = false;
738731

‎src/Symfony/Component/Form/FormBuilder.php

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
use Symfony\Component\EventDispatcher\EventDispatcherInterface;
1515
use Symfony\Component\Form\Exception\BadMethodCallException;
1616
use Symfony\Component\Form\Exception\InvalidArgumentException;
17-
use Symfony\Component\Form\Exception\UnexpectedTypeException;
1817
use Symfony\Component\Form\Extension\Core\Type\TextType;
1918

2019
/**
@@ -60,10 +59,6 @@ public function add(FormBuilderInterface|string $child, string $type = null, arr
6059
return $this;
6160
}
6261

63-
if (!\is_string($child) && !\is_int($child)) {
64-
throw new UnexpectedTypeException($child, 'string or Symfony\Component\Form\FormBuilderInterface');
65-
}
66-
6762
// Add to "children" to maintain order
6863
$this->children[$child] = null;
6964
$this->unresolvedChildren[$child] = [$type, $options];

0 commit comments

Comments
 (0)
0