symfony
diff --git a/‎UPGRADE-4.2.md‎
Lines changed: 2 additions & 0 deletions b/‎UPGRADE-4.2.md‎
Lines changed: 2 additions & 0 deletions
diff --git a/‎UPGRADE-5.0.md‎
Lines changed: 2 additions & 0 deletions b/‎UPGRADE-5.0.md‎
Lines changed: 2 additions & 0 deletions
diff --git a/‎src/Symfony/Bridge/Twig/Tests/Extension/AbstractBootstrap3LayoutTest.php‎
Lines changed: 3 additions & 0 deletions b/‎src/Symfony/Bridge/Twig/Tests/Extension/AbstractBootstrap3LayoutTest.php‎
Lines changed: 3 additions & 0 deletions
diff --git a/‎src/Symfony/Component/Form/CHANGELOG.md‎
Lines changed: 2 additions & 0 deletions b/‎src/Symfony/Component/Form/CHANGELOG.md‎
Lines changed: 2 additions & 0 deletions
diff --git a/‎src/Symfony/Component/Form/Extension/Core/Type/DateTimeType.php‎
Lines changed: 27 additions & 2 deletions b/‎src/Symfony/Component/Form/Extension/Core/Type/DateTimeType.php‎
Lines changed: 27 additions & 2 deletions
diff --git a/‎src/Symfony/Component/Form/Tests/AbstractLayoutTest.php‎
Lines changed: 3 additions & 0 deletions b/‎src/Symfony/Component/Form/Tests/AbstractLayoutTest.php‎
Lines changed: 3 additions & 0 deletions
@@ -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.
 
 
@@ -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.
 
 
@@ -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(
 
@@ -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
 
@@ -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,31 @@ 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 and will lead to an exception in 5.0.', self::class), E_USER_DEPRECATED);
+                //throw new LogicException(sprintf('Cannot use the "date_format" option of the %s when the "widget" option is set to "single_text".', self::class));
+            }
+
+            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 and will lead to an exception in 5.0.', self::class), E_USER_DEPRECATED);
+                //throw new LogicException(sprintf('Cannot use the "date_widget" option of the %s when the "widget" option is set to "single_text".', self::class));
+            }
+
+            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 and will lead to an exception in 5.0.', self::class), E_USER_DEPRECATED);
+                //throw new LogicException(sprintf('Cannot use the "time_widget" option of the %s when the "widget" option is set to "single_text".', self::class));
+            }
+
+            return $timeWidget;
+        });
     }
 
     /**
 
@@ -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(