From 7e9d2e618b6d513fb88076cf62739393dc806173 Mon Sep 17 00:00:00 2001 From: Tobias Schultze Date: Fri, 27 Feb 2015 17:11:51 +0100 Subject: [PATCH 1/2] [OptionsResolver] add missing deprecation triggers --- .../Component/OptionsResolver/OptionsResolver.php | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/Symfony/Component/OptionsResolver/OptionsResolver.php b/src/Symfony/Component/OptionsResolver/OptionsResolver.php index f2756cb1472d3..0937c743ca72a 100644 --- a/src/Symfony/Component/OptionsResolver/OptionsResolver.php +++ b/src/Symfony/Component/OptionsResolver/OptionsResolver.php @@ -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); } @@ -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 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); } @@ -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 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); } @@ -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 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); } @@ -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 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); } From 9607e82c7881e80b83a93b067cbc8d8dddae3cc5 Mon Sep 17 00:00:00 2001 From: Tobias Schultze Date: Sat, 28 Feb 2015 04:34:22 +0100 Subject: [PATCH 2/2] replace deprecated options resolver uses by new ones --- .../Doctrine/Form/Type/DoctrineType.php | 10 ++-- .../Form/Extension/Core/Type/BaseType.php | 4 +- .../Form/Extension/Core/Type/BirthdayType.php | 8 +-- .../Form/Extension/Core/Type/ChoiceType.php | 10 ++-- .../Extension/Core/Type/CollectionType.php | 4 +- .../Form/Extension/Core/Type/DateTimeType.php | 50 +++++++++---------- .../Form/Extension/Core/Type/DateType.php | 38 ++++++-------- .../Form/Extension/Core/Type/FormType.php | 4 +- .../Form/Extension/Core/Type/IntegerType.php | 18 +++---- .../Form/Extension/Core/Type/NumberType.php | 18 +++---- .../Form/Extension/Core/Type/PercentType.php | 8 ++- .../Form/Extension/Core/Type/RepeatedType.php | 8 ++- .../Form/Extension/Core/Type/TimeType.php | 36 ++++++------- .../Form/Extension/Core/Type/UrlType.php | 8 +-- .../Validator/Type/BaseValidatorExtension.php | 4 +- .../Type/FormTypeValidatorExtension.php | 4 +- .../OptionsResolver/OptionsResolver.php | 8 +-- 17 files changed, 96 insertions(+), 144 deletions(-) diff --git a/src/Symfony/Bridge/Doctrine/Form/Type/DoctrineType.php b/src/Symfony/Bridge/Doctrine/Form/Type/DoctrineType.php index a1b8892628100..1b8279f7abc89 100644 --- a/src/Symfony/Bridge/Doctrine/Form/Type/DoctrineType.php +++ b/src/Symfony/Bridge/Doctrine/Form/Type/DoctrineType.php @@ -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')); } /** diff --git a/src/Symfony/Component/Form/Extension/Core/Type/BaseType.php b/src/Symfony/Component/Form/Extension/Core/Type/BaseType.php index c8610ee9d328d..2e7671991c0e8 100644 --- a/src/Symfony/Component/Form/Extension/Core/Type/BaseType.php +++ b/src/Symfony/Component/Form/Extension/Core/Type/BaseType.php @@ -123,8 +123,6 @@ public function configureOptions(OptionsResolver $resolver) 'auto_initialize' => true, )); - $resolver->setAllowedTypes(array( - 'attr' => 'array', - )); + $resolver->setAllowedTypes('attr', 'array'); } } diff --git a/src/Symfony/Component/Form/Extension/Core/Type/BirthdayType.php b/src/Symfony/Component/Form/Extension/Core/Type/BirthdayType.php index bc2711d586cb0..057ec54d8c6ca 100644 --- a/src/Symfony/Component/Form/Extension/Core/Type/BirthdayType.php +++ b/src/Symfony/Component/Form/Extension/Core/Type/BirthdayType.php @@ -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'); } /** diff --git a/src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php b/src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php index ea23d1e942af6..d84075560d4ff 100644 --- a/src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php +++ b/src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php @@ -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')); } /** diff --git a/src/Symfony/Component/Form/Extension/Core/Type/CollectionType.php b/src/Symfony/Component/Form/Extension/Core/Type/CollectionType.php index ccfec396826e5..599aa457b7343 100644 --- a/src/Symfony/Component/Form/Extension/Core/Type/CollectionType.php +++ b/src/Symfony/Component/Form/Extension/Core/Type/CollectionType.php @@ -90,9 +90,7 @@ public function configureOptions(OptionsResolver $resolver) 'delete_empty' => false, )); - $resolver->setNormalizers(array( - 'options' => $optionsNormalizer, - )); + $resolver->setNormalizer('options', $optionsNormalizer); } /** diff --git a/src/Symfony/Component/Form/Extension/Core/Type/DateTimeType.php b/src/Symfony/Component/Form/Extension/Core/Type/DateTimeType.php index 72e735787b0fd..24fa3e5424615 100644 --- a/src/Symfony/Component/Form/Extension/Core/Type/DateTimeType.php +++ b/src/Symfony/Component/Form/Extension/Core/Type/DateTimeType.php @@ -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', )); } diff --git a/src/Symfony/Component/Form/Extension/Core/Type/DateType.php b/src/Symfony/Component/Form/Extension/Core/Type/DateType.php index 48984b61f3f85..cfe1ab03202ed 100644 --- a/src/Symfony/Component/Form/Extension/Core/Type/DateType.php +++ b/src/Symfony/Component/Form/Extension/Core/Type/DateType.php @@ -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'); } /** diff --git a/src/Symfony/Component/Form/Extension/Core/Type/FormType.php b/src/Symfony/Component/Form/Extension/Core/Type/FormType.php index 3fcacd50e9070..19c94967ab219 100644 --- a/src/Symfony/Component/Form/Extension/Core/Type/FormType.php +++ b/src/Symfony/Component/Form/Extension/Core/Type/FormType.php @@ -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'); } /** diff --git a/src/Symfony/Component/Form/Extension/Core/Type/IntegerType.php b/src/Symfony/Component/Form/Extension/Core/Type/IntegerType.php index b36637ad675f6..38f36ac0c4ff1 100644 --- a/src/Symfony/Component/Form/Extension/Core/Type/IntegerType.php +++ b/src/Symfony/Component/Form/Extension/Core/Type/IntegerType.php @@ -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, )); } diff --git a/src/Symfony/Component/Form/Extension/Core/Type/NumberType.php b/src/Symfony/Component/Form/Extension/Core/Type/NumberType.php index 946c9d44e4304..fc3551d67fd00 100644 --- a/src/Symfony/Component/Form/Extension/Core/Type/NumberType.php +++ b/src/Symfony/Component/Form/Extension/Core/Type/NumberType.php @@ -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, )); } diff --git a/src/Symfony/Component/Form/Extension/Core/Type/PercentType.php b/src/Symfony/Component/Form/Extension/Core/Type/PercentType.php index 51632f031e476..163df636c43be 100644 --- a/src/Symfony/Component/Form/Extension/Core/Type/PercentType.php +++ b/src/Symfony/Component/Form/Extension/Core/Type/PercentType.php @@ -37,11 +37,9 @@ public function configureOptions(OptionsResolver $resolver) 'compound' => false, )); - $resolver->setAllowedValues(array( - 'type' => array( - 'fractional', - 'integer', - ), + $resolver->setAllowedValues('type', array( + 'fractional', + 'integer', )); } diff --git a/src/Symfony/Component/Form/Extension/Core/Type/RepeatedType.php b/src/Symfony/Component/Form/Extension/Core/Type/RepeatedType.php index a0d13f7faafee..950dc740056b0 100644 --- a/src/Symfony/Component/Form/Extension/Core/Type/RepeatedType.php +++ b/src/Symfony/Component/Form/Extension/Core/Type/RepeatedType.php @@ -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'); } /** diff --git a/src/Symfony/Component/Form/Extension/Core/Type/TimeType.php b/src/Symfony/Component/Form/Extension/Core/Type/TimeType.php index 851d483f3001a..9ac444cd21e5a 100644 --- a/src/Symfony/Component/Form/Extension/Core/Type/TimeType.php +++ b/src/Symfony/Component/Form/Extension/Core/Type/TimeType.php @@ -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'); } /** diff --git a/src/Symfony/Component/Form/Extension/Core/Type/UrlType.php b/src/Symfony/Component/Form/Extension/Core/Type/UrlType.php index 0deba910865be..3b087e1865c17 100644 --- a/src/Symfony/Component/Form/Extension/Core/Type/UrlType.php +++ b/src/Symfony/Component/Form/Extension/Core/Type/UrlType.php @@ -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')); } /** diff --git a/src/Symfony/Component/Form/Extension/Validator/Type/BaseValidatorExtension.php b/src/Symfony/Component/Form/Extension/Validator/Type/BaseValidatorExtension.php index ada55dce27a06..512d8184e4957 100644 --- a/src/Symfony/Component/Form/Extension/Validator/Type/BaseValidatorExtension.php +++ b/src/Symfony/Component/Form/Extension/Validator/Type/BaseValidatorExtension.php @@ -49,8 +49,6 @@ public function configureOptions(OptionsResolver $resolver) 'validation_groups' => null, )); - $resolver->setNormalizers(array( - 'validation_groups' => $validationGroupsNormalizer, - )); + $resolver->setNormalizer('validation_groups', $validationGroupsNormalizer); } } diff --git a/src/Symfony/Component/Form/Extension/Validator/Type/FormTypeValidatorExtension.php b/src/Symfony/Component/Form/Extension/Validator/Type/FormTypeValidatorExtension.php index e5d57df1661d4..16030ae03ffb9 100644 --- a/src/Symfony/Component/Form/Extension/Validator/Type/FormTypeValidatorExtension.php +++ b/src/Symfony/Component/Form/Extension/Validator/Type/FormTypeValidatorExtension.php @@ -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); } /** diff --git a/src/Symfony/Component/OptionsResolver/OptionsResolver.php b/src/Symfony/Component/OptionsResolver/OptionsResolver.php index 0937c743ca72a..974e11ce2ac44 100644 --- a/src/Symfony/Component/OptionsResolver/OptionsResolver.php +++ b/src/Symfony/Component/OptionsResolver/OptionsResolver.php @@ -466,7 +466,7 @@ public function setAllowedValues($option, $allowedValues = null) // BC if (is_array($option) && null === $allowedValues) { - trigger_error('Calling the '.__METHOD__.' method with an array 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); + 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); @@ -522,7 +522,7 @@ public function addAllowedValues($option, $allowedValues = null) // BC if (is_array($option) && null === $allowedValues) { - trigger_error('Calling the '.__METHOD__.' method with an array 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); + 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); @@ -576,7 +576,7 @@ public function setAllowedTypes($option, $allowedTypes = null) // BC if (is_array($option) && null === $allowedTypes) { - trigger_error('Calling the '.__METHOD__.' method with an array 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); + 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); @@ -626,7 +626,7 @@ public function addAllowedTypes($option, $allowedTypes = null) // BC if (is_array($option) && null === $allowedTypes) { - trigger_error('Calling the '.__METHOD__.' method with an array 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); + 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);