Skip to content

Commit

Permalink
feature #13809 [OptionsResolver] add missing deprecation triggers (To…
Browse files Browse the repository at this point in the history 
…bion)

This PR was merged into the 2.7 branch.

Discussion
----------

[OptionsResolver] add missing deprecation triggers

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets |
| License       | MIT
| Doc PR        | -

Commits
-------

9607e82 replace deprecated options resolver uses by new ones
7e9d2e6 [OptionsResolver] add missing deprecation triggers
  • Loading branch information
@Tobion
Tobion committed Feb 28, 2015
2 parents 469e70d + 9607e82 commit c498389
Show file tree
Hide file tree
Showing 17 changed files with 102 additions and 140 deletions.
10 changes: 3 additions & 7 deletions src/Symfony/Bridge/Doctrine/Form/Type/DoctrineType.php
View file
Expand Up @@ -175,14 +175,10 @@ public function configureOptions(OptionsResolver $resolver)

$resolver->setRequired(array('class'));

$resolver->setNormalizers(array(
'em' => $emNormalizer,
));
$resolver->setNormalizer('em', $emNormalizer);

$resolver->setAllowedTypes(array(
'em' => array('null', 'string', 'Doctrine\Common\Persistence\ObjectManager'),
'loader' => array('null', 'Symfony\Bridge\Doctrine\Form\ChoiceList\EntityLoaderInterface'),
));
$resolver->setAllowedTypes('em', array('null', 'string', 'Doctrine\Common\Persistence\ObjectManager'));
$resolver->setAllowedTypes('loader', array('null', 'Symfony\Bridge\Doctrine\Form\ChoiceList\EntityLoaderInterface'));
}

/**
Expand Down
4 changes: 1 addition & 3 deletions src/Symfony/Component/Form/Extension/Core/Type/BaseType.php
View file
Expand Up @@ -123,8 +123,6 @@ public function configureOptions(OptionsResolver $resolver)
'auto_initialize' => true,
));

$resolver->setAllowedTypes(array(
'attr' => 'array',
));
$resolver->setAllowedTypes('attr', 'array');
}
}
8 changes: 2 additions & 6 deletions src/Symfony/Component/Form/Extension/Core/Type/BirthdayType.php
View file
Expand Up @@ -21,13 +21,9 @@ class BirthdayType extends AbstractType
*/
public function configureOptions(OptionsResolver $resolver)
{
$resolver->setDefaults(array(
'years' => range(date('Y') - 120, date('Y')),
));
$resolver->setDefault('years', range(date('Y') - 120, date('Y')));

$resolver->setAllowedTypes(array(
'years' => 'array',
));
$resolver->setAllowedTypes('years', 'array');
}

/**
Expand Down
10 changes: 3 additions & 7 deletions src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php
View file
Expand Up @@ -233,14 +233,10 @@ public function configureOptions(OptionsResolver $resolver)
'data_class' => null,
));

$resolver->setNormalizers(array(
'empty_value' => $placeholderNormalizer,
'placeholder' => $placeholderNormalizer,
));
$resolver->setNormalizer('empty_value', $placeholderNormalizer);
$resolver->setNormalizer('placeholder', $placeholderNormalizer);

$resolver->setAllowedTypes(array(
'choice_list' => array('null', 'Symfony\Component\Form\Extension\Core\ChoiceList\ChoiceListInterface'),
));
$resolver->setAllowedTypes('choice_list', array('null', 'Symfony\Component\Form\Extension\Core\ChoiceList\ChoiceListInterface'));
}

/**
Expand Down
4 changes: 1 addition & 3 deletions src/Symfony/Component/Form/Extension/Core/Type/CollectionType.php
View file
Expand Up @@ -90,9 +90,7 @@ public function configureOptions(OptionsResolver $resolver)
'delete_empty' => false,
));

$resolver->setNormalizers(array(
'options' => $optionsNormalizer,
));
$resolver->setNormalizer('options', $optionsNormalizer);
}

/**
Expand Down
50 changes: 24 additions & 26 deletions src/Symfony/Component/Form/Extension/Core/Type/DateTimeType.php
View file
Expand Up @@ -253,32 +253,30 @@ public function configureOptions(OptionsResolver $resolver)
'seconds',
));

$resolver->setAllowedValues(array(
'input' => array(
'datetime',
'string',
'timestamp',
'array',
),
'date_widget' => array(
null, // inherit default from DateType
'single_text',
'text',
'choice',
),
'time_widget' => array(
null, // inherit default from TimeType
'single_text',
'text',
'choice',
),
// This option will overwrite "date_widget" and "time_widget" options
'widget' => array(
null, // default, don't overwrite options
'single_text',
'text',
'choice',
),
$resolver->setAllowedValues('input', array(
'datetime',
'string',
'timestamp',
'array',
));
$resolver->setAllowedValues('date_widget', array(
null, // inherit default from DateType
'single_text',
'text',
'choice',
));
$resolver->setAllowedValues('time_widget', array(
null, // inherit default from TimeType
'single_text',
'text',
'choice',
));
// This option will overwrite "date_widget" and "time_widget" options
$resolver->setAllowedValues('widget', array(
null, // default, don't overwrite options
'single_text',
'text',
'choice',
));
}

Expand Down
38 changes: 16 additions & 22 deletions src/Symfony/Component/Form/Extension/Core/Type/DateType.php
View file
Expand Up @@ -224,31 +224,25 @@ public function configureOptions(OptionsResolver $resolver)
'compound' => $compound,
));

$resolver->setNormalizers(array(
'empty_value' => $placeholderNormalizer,
'placeholder' => $placeholderNormalizer,
$resolver->setNormalizer('empty_value', $placeholderNormalizer);
$resolver->setNormalizer('placeholder', $placeholderNormalizer);

$resolver->setAllowedValues('input', array(
'datetime',
'string',
'timestamp',
'array',
));

$resolver->setAllowedValues(array(
'input' => array(
'datetime',
'string',
'timestamp',
'array',
),
'widget' => array(
'single_text',
'text',
'choice',
),
$resolver->setAllowedValues('widget', array(
'single_text',
'text',
'choice',
));

$resolver->setAllowedTypes(array(
'format' => array('int', 'string'),
'years' => 'array',
'months' => 'array',
'days' => 'array',
));
$resolver->setAllowedTypes('format', array('int', 'string'));
$resolver->setAllowedTypes('years', 'array');
$resolver->setAllowedTypes('months', 'array');
$resolver->setAllowedTypes('days', 'array');
}

/**
Expand Down
4 changes: 1 addition & 3 deletions src/Symfony/Component/Form/Extension/Core/Type/FormType.php
View file
Expand Up @@ -209,9 +209,7 @@ public function configureOptions(OptionsResolver $resolver)
'post_max_size_message' => 'The uploaded file was too large. Please try to upload a smaller file.',
));

$resolver->setAllowedTypes(array(
'label_attr' => 'array',
));
$resolver->setAllowedTypes('label_attr', 'array');
}

/**
Expand Down
18 changes: 8 additions & 10 deletions src/Symfony/Component/Form/Extension/Core/Type/IntegerType.php
View file
Expand Up @@ -45,16 +45,14 @@ public function configureOptions(OptionsResolver $resolver)
'compound' => false,
));

$resolver->setAllowedValues(array(
'rounding_mode' => array(
IntegerToLocalizedStringTransformer::ROUND_FLOOR,
IntegerToLocalizedStringTransformer::ROUND_DOWN,
IntegerToLocalizedStringTransformer::ROUND_HALF_DOWN,
IntegerToLocalizedStringTransformer::ROUND_HALF_EVEN,
IntegerToLocalizedStringTransformer::ROUND_HALF_UP,
IntegerToLocalizedStringTransformer::ROUND_UP,
IntegerToLocalizedStringTransformer::ROUND_CEILING,
),
$resolver->setAllowedValues('rounding_mode', array(
IntegerToLocalizedStringTransformer::ROUND_FLOOR,
IntegerToLocalizedStringTransformer::ROUND_DOWN,
IntegerToLocalizedStringTransformer::ROUND_HALF_DOWN,
IntegerToLocalizedStringTransformer::ROUND_HALF_EVEN,
IntegerToLocalizedStringTransformer::ROUND_HALF_UP,
IntegerToLocalizedStringTransformer::ROUND_UP,
IntegerToLocalizedStringTransformer::ROUND_CEILING,
));
}

Expand Down
18 changes: 8 additions & 10 deletions src/Symfony/Component/Form/Extension/Core/Type/NumberType.php
View file
Expand Up @@ -43,16 +43,14 @@ public function configureOptions(OptionsResolver $resolver)
'compound' => false,
));

$resolver->setAllowedValues(array(
'rounding_mode' => array(
NumberToLocalizedStringTransformer::ROUND_FLOOR,
NumberToLocalizedStringTransformer::ROUND_DOWN,
NumberToLocalizedStringTransformer::ROUND_HALF_DOWN,
NumberToLocalizedStringTransformer::ROUND_HALF_EVEN,
NumberToLocalizedStringTransformer::ROUND_HALF_UP,
NumberToLocalizedStringTransformer::ROUND_UP,
NumberToLocalizedStringTransformer::ROUND_CEILING,
),
$resolver->setAllowedValues('rounding_mode', array(
NumberToLocalizedStringTransformer::ROUND_FLOOR,
NumberToLocalizedStringTransformer::ROUND_DOWN,
NumberToLocalizedStringTransformer::ROUND_HALF_DOWN,
NumberToLocalizedStringTransformer::ROUND_HALF_EVEN,
NumberToLocalizedStringTransformer::ROUND_HALF_UP,
NumberToLocalizedStringTransformer::ROUND_UP,
NumberToLocalizedStringTransformer::ROUND_CEILING,
));
}

Expand Down
8 changes: 3 additions & 5 deletions src/Symfony/Component/Form/Extension/Core/Type/PercentType.php
View file
Expand Up @@ -37,11 +37,9 @@ public function configureOptions(OptionsResolver $resolver)
'compound' => false,
));

$resolver->setAllowedValues(array(
'type' => array(
'fractional',
'integer',
),
$resolver->setAllowedValues('type', array(
'fractional',
'integer',
));
}

Expand Down
8 changes: 3 additions & 5 deletions src/Symfony/Component/Form/Extension/Core/Type/RepeatedType.php
View file
Expand Up @@ -56,11 +56,9 @@ public function configureOptions(OptionsResolver $resolver)
'error_bubbling' => false,
));

$resolver->setAllowedTypes(array(
'options' => 'array',
'first_options' => 'array',
'second_options' => 'array',
));
$resolver->setAllowedTypes('options', 'array');
$resolver->setAllowedTypes('first_options', 'array');
$resolver->setAllowedTypes('second_options', 'array');
}

/**
Expand Down
36 changes: 15 additions & 21 deletions src/Symfony/Component/Form/Extension/Core/Type/TimeType.php
View file
Expand Up @@ -214,30 +214,24 @@ public function configureOptions(OptionsResolver $resolver)
'compound' => $compound,
));

$resolver->setNormalizers(array(
'empty_value' => $placeholderNormalizer,
'placeholder' => $placeholderNormalizer,
$resolver->setNormalizer('empty_value', $placeholderNormalizer);
$resolver->setNormalizer('placeholder', $placeholderNormalizer);

$resolver->setAllowedValues('input', array(
'datetime',
'string',
'timestamp',
'array',
));

$resolver->setAllowedValues(array(
'input' => array(
'datetime',
'string',
'timestamp',
'array',
),
'widget' => array(
'single_text',
'text',
'choice',
),
$resolver->setAllowedValues('widget', array(
'single_text',
'text',
'choice',
));

$resolver->setAllowedTypes(array(
'hours' => 'array',
'minutes' => 'array',
'seconds' => 'array',
));
$resolver->setAllowedTypes('hours', 'array');
$resolver->setAllowedTypes('minutes', 'array');
$resolver->setAllowedTypes('seconds', 'array');
}

/**
Expand Down
8 changes: 2 additions & 6 deletions src/Symfony/Component/Form/Extension/Core/Type/UrlType.php
View file
Expand Up @@ -33,13 +33,9 @@ public function buildForm(FormBuilderInterface $builder, array $options)
*/
public function configureOptions(OptionsResolver $resolver)
{
$resolver->setDefaults(array(
'default_protocol' => 'http',
));
$resolver->setDefault('default_protocol', 'http');

$resolver->setAllowedTypes(array(
'default_protocol' => array('null', 'string'),
));
$resolver->setAllowedTypes('default_protocol', array('null', 'string'));
}

/**
Expand Down
4 changes: 1 addition & 3 deletions src/Symfony/Component/Form/Extension/Validator/Type/BaseValidatorExtension.php
View file
Expand Up @@ -49,8 +49,6 @@ public function configureOptions(OptionsResolver $resolver)
'validation_groups' => null,
));

$resolver->setNormalizers(array(
'validation_groups' => $validationGroupsNormalizer,
));
$resolver->setNormalizer('validation_groups', $validationGroupsNormalizer);
}
}
4 changes: 1 addition & 3 deletions src/Symfony/Component/Form/Extension/Validator/Type/FormTypeValidatorExtension.php
View file
Expand Up @@ -77,9 +77,7 @@ public function configureOptions(OptionsResolver $resolver)
'extra_fields_message' => 'This form should not contain extra fields.',
));

$resolver->setNormalizers(array(
'constraints' => $constraintsNormalizer,
));
$resolver->setNormalizer('constraints', $constraintsNormalizer);
}

/**
Expand Down
10 changes: 10 additions & 0 deletions src/Symfony/Component/OptionsResolver/OptionsResolver.php
View file
Expand Up @@ -428,6 +428,8 @@ public function setNormalizer($option, \Closure $normalizer)
*/
public function setNormalizers(array $normalizers)
{
trigger_error('The '.__METHOD__.' method is deprecated since version 2.6 and will be removed in 3.0. Use setNormalizer() instead.', E_USER_DEPRECATED);

foreach ($normalizers as $option => $normalizer) {
$this->setNormalizer($option, $normalizer);
}
Expand Down Expand Up @@ -464,6 +466,8 @@ public function setAllowedValues($option, $allowedValues = null)

// BC
if (is_array($option) && null === $allowedValues) {
trigger_error('Calling the '.__METHOD__.' method with an array of options is deprecated since version 2.6 and will be removed in 3.0. Use the new signature with a single option instead.', E_USER_DEPRECATED);

foreach ($option as $optionName => $optionValues) {
$this->setAllowedValues($optionName, $optionValues);
}
Expand Down Expand Up @@ -518,6 +522,8 @@ public function addAllowedValues($option, $allowedValues = null)

// BC
if (is_array($option) && null === $allowedValues) {
trigger_error('Calling the '.__METHOD__.' method with an array of options is deprecated since version 2.6 and will be removed in 3.0. Use the new signature with a single option instead.', E_USER_DEPRECATED);

foreach ($option as $optionName => $optionValues) {
$this->addAllowedValues($optionName, $optionValues);
}
Expand Down Expand Up @@ -570,6 +576,8 @@ public function setAllowedTypes($option, $allowedTypes = null)

// BC
if (is_array($option) && null === $allowedTypes) {
trigger_error('Calling the '.__METHOD__.' method with an array of options is deprecated since version 2.6 and will be removed in 3.0. Use the new signature with a single option instead.', E_USER_DEPRECATED);

foreach ($option as $optionName => $optionTypes) {
$this->setAllowedTypes($optionName, $optionTypes);
}
Expand Down Expand Up @@ -618,6 +626,8 @@ public function addAllowedTypes($option, $allowedTypes = null)

// BC
if (is_array($option) && null === $allowedTypes) {
trigger_error('Calling the '.__METHOD__.' method with an array of options is deprecated since version 2.6 and will be removed in 3.0. Use the new signature with a single option instead.', E_USER_DEPRECATED);

foreach ($option as $optionName => $optionTypes) {
$this->addAllowedTypes($optionName, $optionTypes);
}
Expand Down

0 comments on commit c498389

Please sign in to comment.