8000 [3.0] Remove more deprecated interfaces in Form and Validator · symfony/symfony@a743fb6 · GitHub
[go: up one dir, main page]
Skip to content

Commit a743fb6

Browse files
nicolas-grekasnicolas-grekas
committed
[3.0] Remove more deprecated interfaces in Form and Validator
1 parent 372be7e commit a743fb6

File tree

22 files changed

+18
-67
lines changed

22 files changed

+18
-67
lines changed

‎src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/Descriptor.php‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
namespace Symfony\Bundle\FrameworkBundle\Console\Descriptor;
1313

1414
use Symfony\Component\Console\Descriptor\DescriptorInterface;
15-
use Symfony\Component\Console\Helper\Table;
1615
use Symfony\Component\Console\Output\OutputInterface;
1716
use Symfony\Component\DependencyInjection\Alias;
1817
use Symfony\Component\DependencyInjection\ContainerBuilder;

‎src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -437,15 +437,6 @@ private function addValidationSection(ArrayNodeDefinition $rootNode)
437437
->end()
438438
->scalarNode('translation_domain')->defaultValue('validators')->end()
439439
->booleanNode('strict_email')->defaultFalse()->end()
440-
->enumNode('api')
441-
->info('Deprecated since version 2.7, to be removed in 3.0')
442-
->values(array('2.4', '2.5', '2.5-bc', 'auto'))
443-
->beforeNormalization()
444-
// XML/YAML parse as numbers, not as strings
445-
->ifTrue(function ($v) { return is_scalar($v); })
446-
->then(function ($v) { return (string) $v; })
447-
->end()
448-
->end()
449440
->end()
450441
->end()
451442
->end()

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

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -72,15 +72,12 @@ class NumberToLocalizedStringTransformer implements DataTransformerInterface
7272
*/
7373
const ROUND_HALF_DOWN = \NumberFormatter::ROUND_HALFDOWN;
7474

75-
/**
76-
* @deprecated since version 2.7, will be replaced by a $scale private property in 3.0.
77-
*/
78-
protected $precision;
79-
8075
protected $grouping;
8176

8277
protected $roundingMode;
8378

79+
private $scale;
80+
8481
public function __construct($scale = null, $grouping = false, $roundingMode = self::ROUND_HALF_UP)
8582
{
8683
if (null === $grouping) {
@@ -91,7 +88,7 @@ public function __construct($scale = null, $grouping = false, $roundingMode = se
9188
$roundingMode = self::ROUND_HALF_UP;
9289
}
9390

94-
$this->precision = $scale;
91+
$this->scale = $scale;
9592
$this->grouping = $grouping;
9693
$this->roundingMode = $roundingMode;
9794
}
@@ -211,8 +208,8 @@ protected function getNumberFormatter()
211208
{
212209
$formatter = new \NumberFormatter(\Locale::getDefault(), \NumberFormatter::DECIMAL);
213210

214-
if (null !== $this->precision) {
215-
$formatter->setAttribute(\NumberFormatter::FRACTION_DIGITS, $this->precision);
211+
if (null !== $this->scale) {
212+
$formatter->setAttribute(\NumberFormatter::FRACTION_DIGITS, $this->scale);
216213
$formatter->setAttribute(\NumberFormatter::ROUNDING_MODE, $this->roundingMode);
217214
}
218215

@@ -230,9 +227,9 @@ protected function getNumberFormatter()
230227
*/
231228
private function round($number)
232229
{
233-
if (null !== $this->precision && null !== $this->roundingMode) {
230+
if (null !== $this->scale && null !== $this->roundingMode) {
234231
// shift number to maintain the correct scale during rounding
235-
$roundingCoef = pow(10, $this->precision);
232+
$roundingCoef = pow(10, $this->scale);
236233
$number *= $roundingCoef;
237234

238235
switch ($this->roundingMode) {

‎src/Symfony/Component/Form/Extension/Core/Type/DateType.php‎

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -283,11 +283,7 @@ private function formatTimestamps(\IntlDateFormatter $formatter, $regex, array $
283283
$pattern = $formatter->getPattern();
284284
$timezone = $formatter->getTimezoneId();
285285

286-
if ($setTimeZone = PHP_VERSION_ID >= 50500 || method_exists($formatter, 'setTimeZone')) {
287-
$formatter->setTimeZone('UTC');
288-
} else {
289-
$formatter->setTimeZoneId('UTC');
290-
}
286+
$formatter->setTimeZone('UTC');
291287

292288
if (preg_match($regex, $pattern, $matches)) {
293289
$formatter->setPattern($matches[0]);
@@ -301,11 +297,7 @@ private function formatTimestamps(\IntlDateFormatter $formatter, $regex, array $
301297
$formatter->setPattern($pattern);
302298
}
303299

304-
if ($setTimeZone) {
305-
$formatter->setTimeZone($timezone);
306-
} else {
307-
$formatter->setTimeZoneId($timezone);
308-
}
300+
$formatter->setTimeZone($timezone);
309301

310302
return $timestamps;
311303
}

‎src/Symfony/Component/Form/Extension/Core/Type/IntegerType.php‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
use Symfony\Component\Form\AbstractType;
1515
use Symfony\Component\Form\FormBuilderInterface;
1616
use Symfony\Component\Form\Extension\Core\DataTransformer\IntegerToLocalizedStringTransformer;
17-
use Symfony\Component\OptionsResolver\Options;
1817
use Symfony\Component\OptionsResolver\OptionsResolver;
1918

2019
class IntegerType extends AbstractType

‎src/Symfony/Component/Form/Extension/Core/Type/MoneyType.php‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
use Symfony\Component\Form\FormBuilderInterface;
1717
use Symfony\Component\Form\Extension\Core\DataTransformer\MoneyToLocalizedStringTransformer;
1818
use Symfony\Component\Form\FormView;
19-
use Symfony\Component\OptionsResolver\Options;
2019
use Symfony\Component\OptionsResolver\OptionsResolver;
2120

2221
class MoneyType extends AbstractType

‎src/Symfony/Component/Form/Extension/Core/Type/NumberType.php‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
use Symfony\Component\Form\AbstractType;
1515
use Symfony\Component\Form\FormBuilderInterface;
1616
use Symfony\Component\Form\Extension\Core\DataTransformer\NumberToLocalizedStringTransformer;
17-
use Symfony\Component\OptionsResolver\Options;
1817
use Symfony\Component\OptionsResolver\OptionsResolver;
1918

2019
class NumberType extends AbstractType

‎src/Symfony/Component/Form/Extension/Core/Type/PercentType.php‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
use Symfony\Component\Form\AbstractType;
1515
use Symfony\Component\Form\FormBuilderInterface;
1616
use Symfony\Component\Form\Extension\Core\DataTransformer\PercentToLocalizedStringTransformer;
17-
use Symfony\Component\OptionsResolver\Options;
1817
use Symfony\Component\OptionsResolver\OptionsResolver;
1918

2019
class PercentType extends AbstractType

‎src/Symfony/Component/Form/Extension/Core/Type/TimeType.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ public function configureOptions(OptionsResolver $resolver)
171171
return $options['widget'] !== 'single_text';
172172
};
173173

174-
$placeholder = $placeholderDefault = function (Options $options) {
174+
$placeholderDefault = function (Options $options) {
175175
return $options['required'] ? null : '';
176176
};
177177

@@ -219,7 +219,7 @@ public function configureOptions(OptionsResolver $resolver)
219219
'with_seconds' => false,
220220
'model_timezone' => null,
221221
'view_timezone' => null,
222-
'placeholder' => $placeholder,
222+
'placeholder' => $placeholderDefault,
223223
'html5' => true,
224224
// Don't modify \DateTime classes by reference, we treat
225225
// them like immutable value objects

‎src/Symfony/Component/Form/Extension/DependencyInjection/DependencyInjectionExtension.php‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,7 @@ class DependencyInjectionExtension implements FormExtensionInterface
2525
private $guesser;
2626
private $guesserLoaded = false;
2727

28-
public function __construct(ContainerInterface $container,
29-
array $typeServiceIds, array $typeExtensionServiceIds,
30-
array $guesserServiceIds)
28+
public function __construct(ContainerInterface $container, array $typeServiceIds, array $typeExtensionServiceIds, array $guesserServiceIds)
3129
{
3230
$this->container = $container;
3331
$this->typeServiceIds = $typeServiceIds;

0 commit comments

Comments
 (0)
0