Merge branch '5.1'

* 5.1:
  Fix wrong merge

Author: fabpot

src/Symfony/Component/Form/Extension/Core/Type/DateTimeType.php

@@ -26,7 +26,6 @@
 use Symfony\Component\Form\FormView;
 use Symfony\Component\Form\ReversedTransformer;
 use Symfony\Component\OptionsResolver\Exception\InvalidOptionsException;
-use Symfony\Component\OptionsResolver\Exception\OptionDefinitionException;
 use Symfony\Component\OptionsResolver\Options;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
@@ -344,22 +343,13 @@ public function configureOptions(OptionsResolver $resolver)
 
             return $timeWidget;
         });
-        foreach (['html5', 'format'] as $option) {
-            $resolver->setDeprecated($option, static function (Options $options, $value) use ($option): string {
-                try {
-                    $html5 = 'html5' === $option ? $value : $options['html5'];
-                    $format = 'format' === $option ? $value : $options['format'];
-                } catch (OptionDefinitionException $e) {
-                    return '';
-                }
-
-                if ($html5 && self::HTML5_FORMAT !== $format) {
-                    throw new LogicException(sprintf('Cannot use the "format" option of "%s" when the "html5" option is disabled.', self::class));
-                }
-
-                return $html5;
-            });
-        }
+        $resolver->setNormalizer('html5', function (Options $options, $html5) {
+            if ($html5 && self::HTML5_FORMAT !== $options['format']) {
+                throw new LogicException(sprintf('Cannot use the "format" option of "%s" when the "html5" option is enabled.', self::class));
+            }
+
+            return $html5;
+        });
     }
 
     /**

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

@@ -23,7 +23,6 @@
 use Symfony\Component\Form\FormView;
 use Symfony\Component\Form\ReversedTransformer;
 use Symfony\Component\OptionsResolver\Exception\InvalidOptionsException;
-use Symfony\Component\OptionsResolver\Exception\OptionDefinitionException;
 use Symfony\Component\OptionsResolver\Options;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
@@ -329,23 +328,13 @@ public function configureOptions(OptionsResolver $resolver)
         $resolver->setAllowedTypes('days', 'array');
         $resolver->setAllowedTypes('input_format', 'string');
 
-        foreach (['html5', 'widget', 'format'] as $option) {
-            $resolver->setDeprecated($option, static function (Options $options, $value) use ($option): string {
-                try {
-                    $html5 = 'html5' === $option ? $value : $options['html5'];
-                    $widget = 'widget' === $option ? $value : $options['widget'];
-                    $format = 'format' === $option ? $value : $options['format'];
-                } catch (OptionDefinitionException $e) {
-                    return '';
-                }
-
-                if ($html5 && 'single_text' === $widget && self::HTML5_FORMAT !== $format) {
-                    throw new LogicException(sprintf('Cannot use the "format" option of "%s" when the "html5" option is disabled.', self::class));
-                }
+        $resolver->setNormalizer('html5', function (Options $options, $html5) {
+            if ($html5 && 'single_text' === $options['widget'] && self::HTML5_FORMAT !== $options['format']) {
+                throw new LogicException(sprintf('Cannot use the "format" option of "%s" when the "html5" option is enabled.', self::class));
+            }
 
-                return $html5;
-            });
-        }
+            return $html5;
+        });
     }
 
     /**