deprecate some options for single_text widgets

xabbuh · xabbuh · commit 65a765eb4efe · 2018-10-04T13:12:41.000+02:00
diff --git a/UPGRADE-4.2.md b/UPGRADE-4.2.md
@@ -55,6 +55,8 @@ Finder
 Form
 ----
 
+ * Using the `date_format`, `date_widget`, and `time_widget` options of the `DateTimeType` when the `widget` option is
+   set to `single_text` is deprecated.
  * The `scale` option of the `IntegerType` is deprecated.
  * The `$scale` argument of the `IntegerToLocalizedStringTransformer` is deprecated.
 
diff --git a/UPGRADE-5.0.md b/UPGRADE-5.0.md
@@ -72,6 +72,8 @@ Finder
 Form
 ----
 
+ * Using the `date_format`, `date_widget`, and `time_widget` options of the `DateTimeType` when the `widget` option is
+   set to `single_text` is not supported anymore.
  * The `scale` option was removed from the `IntegerType`.
  * The `$scale` argument of the `IntegerToLocalizedStringTransformer` was removed.
 
diff --git a/src/Symfony/Bridge/Twig/Tests/Extension/AbstractBootstrap3LayoutTest.php b/src/Symfony/Bridge/Twig/Tests/Extension/AbstractBootstrap3LayoutTest.php
@@ -1582,6 +1582,9 @@ public function testDateTimeWithWidgetSingleText()
         );
     }
 
+    /**
+     * @group legacy
+     */
     public function testDateTimeWithWidgetSingleTextIgnoreDateAndTimeWidgets()
     {
         $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\DateTimeType', '2011-02-03 04:05:06', array(
diff --git a/src/Symfony/Component/Form/CHANGELOG.md b/src/Symfony/Component/Form/CHANGELOG.md
@@ -4,6 +4,8 @@ CHANGELOG
 4.2.0
 -----
 
+ * deprecated using the `date_format`, `date_widget`, and `time_widget` options of the `DateTimeType` when the `widget`
+   option is set to `single_text`
  * deprecated the `$scale` argument of the `IntegerToLocalizedStringTransformer`
  * added `Symfony\Component\Form\ClearableErrorsInterface`
  * deprecated calling `FormRenderer::searchAndRenderBlock` for fields which were already rendered
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/DateTimeType.php b/src/Symfony/Component/Form/Extension/Core/Type/DateTimeType.php
@@ -205,12 +205,12 @@ public function configureOptions(OptionsResolver $resolver)
 
         // Defaults to the value of "widget"
         $dateWidget = function (Options $options) {
-            return $options['widget'];
+            return 'single_text' === $options['widget'] ? null : $options['widget'];
         };
 
         // Defaults to the value of "widget"
         $timeWidget = function (Options $options) {
-            return $options['widget'];
+            return 'single_text' === $options['widget'] ? null : $options['widget'];
         };
 
         $resolver->setDefaults(array(
@@ -278,6 +278,28 @@ public function configureOptions(OptionsResolver $resolver)
             'text',
             'choice',
         ));
+
+        $resolver->setNormalizer('date_format', function (Options $options, $dateFormat) {
+            if (null !== $dateFormat && 'single_text' === $options['widget']) {
+                @trigger_error(sprintf('Using the "date_format" option of the %s when the "widget" option is set to "single_text" is deprecated since Symfony 4.2.', self::class), E_USER_DEPRECATED);
+            }
+
+            return $dateFormat;
+        });
+        $resolver->setNormalizer('date_widget', function (Options $options, $dateWidget) {
+            if (null !== $dateWidget && 'single_text' === $options['widget']) {
+                @trigger_error(sprintf('Using the "date_widget" option of the %s when the "widget" option is set to "single_text" is deprecated since Symfony 4.2.', self::class), E_USER_DEPRECATED);
+            }
+
+            return $dateWidget;
+        });
+        $resolver->setNormalizer('time_widget', function (Options $options, $timeWidget) {
+            if (null !== $timeWidget && 'single_text' === $options['widget']) {
+                @trigger_error(sprintf('Using the "time_widget" option of the %s when the "widget" option is set to "single_text" is deprecated since Symfony 4.2.', self::class), E_USER_DEPRECATED);
+            }
+
+            return $timeWidget;
+        });
     }
 
     /**
diff --git a/src/Symfony/Component/Form/Tests/AbstractLayoutTest.php b/src/Symfony/Component/Form/Tests/AbstractLayoutTest.php
@@ -1506,6 +1506,9 @@ public function testDateTimeWithWidgetSingleText()
         );
     }
 
+    /**
+     * @group legacy
+     */
     public function testDateTimeWithWidgetSingleTextIgnoreDateAndTimeWidgets()
     {
         $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\DateTimeType', '2011-02-03 04:05:06', array(

Original file line number	Diff line number	Diff line change
`@@ -1582,6 +1582,9 @@ public function testDateTimeWithWidgetSingleText()`
`1582`	`1582`	`);`
`1583`	`1583`	`}`
`1584`	`1584`
	`1585`	`+ /**`
	`1586`	`+ * @group legacy`
	`1587`	`+ */`
`1585`	`1588`	`public function testDateTimeWithWidgetSingleTextIgnoreDateAndTimeWidgets()`
`1586`	`1589`	`{`
`1587`	`1590`	`$form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\DateTimeType', '2011-02-03 04:05:06', array(`
Original file line number	Diff line number	Diff line change
`@@ -1506,6 +1506,9 @@ public function testDateTimeWithWidgetSingleText()`
`1506`	`1506`	`);`
`1507`	`1507`	`}`
`1508`	`1508`
	`1509`	`+ /**`
	`1510`	`+ * @group legacy`
	`1511`	`+ */`
`1509`	`1512`	`public function testDateTimeWithWidgetSingleTextIgnoreDateAndTimeWidgets()`
`1510`	`1513`	`{`
`1511`	`1514`	`$form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\DateTimeType', '2011-02-03 04:05:06', array(`