drop support for differing timezones without ref date

xabbuh · xabbuh · commit 3dc6033f8bc2 · 2019-07-29T20:44:15.000+02:00
diff --git a/src/Symfony/Component/Form/CHANGELOG.md b/src/Symfony/Component/Form/CHANGELOG.md
@@ -4,6 +4,8 @@ CHANGELOG
 5.0.0
 -----
 
+ * Removed support for using different values for the "model_timezone" and "view_timezone" options of the `TimeType`
+   without configuring a reference date.
  * Removed the `scale` option of the `IntegerType`.
  * 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.
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/TimeType.php b/src/Symfony/Component/Form/Extension/Core/Type/TimeType.php
@@ -13,6 +13,7 @@
 
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\Exception\InvalidConfigurationException;
+use Symfony\Component\Form\Exception\LogicException;
 use Symfony\Component\Form\Extension\Core\DataTransformer\DateTimeImmutableToDateTimeTransformer;
 use Symfony\Component\Form\Extension\Core\DataTransformer\DateTimeToArrayTransformer;
 use Symfony\Component\Form\Extension\Core\DataTransformer\DateTimeToStringTransformer;
@@ -309,12 +310,12 @@ public function configureOptions(OptionsResolver $resolver)
             'choice_translation_domain' => false,
         ]);
 
-        $resolver->setDeprecated('model_timezone', function (Options $options, $modelTimezone): string {
+        $resolver->setNormalizer('model_timezone', function (Options $options, $modelTimezone): ?string {
             if (null !== $modelTimezone && $options['view_timezone'] !== $modelTimezone && null === $options['reference_date']) {
-                return sprintf('Using different values for the "model_timezone" and "view_timezone" options without configuring a reference date is deprecated since Symfony 4.4.');
+                throw new LogicException(sprintf('Using different values for the "model_timezone" and "view_timezone" options without configuring a reference date is not supported.'));
             }
 
-            return '';
+            return $modelTimezone;
         });
 
         $resolver->setNormalizer('placeholder', $placeholderNormalizer);
diff --git a/src/Symfony/Component/Form/Tests/Command/DebugCommandTest.php b/src/Symfony/Component/Form/Tests/Command/DebugCommandTest.php
@@ -42,11 +42,6 @@ public function testDebugDeprecatedDefaults()
         $this->assertEquals(0, $ret, 'Returns 0 in case of success');
         $this->assertSame(<<<TXT
 
-Built-in form types (Symfony\Component\Form\Extension\Core\Type)
-----------------------------------------------------------------
-
- TimeType
-
 Service form types
 ------------------
 
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/TimeTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/TimeTypeTest.php
@@ -426,8 +426,8 @@ public function testSetDataDifferentTimezonesDuringDaylightSavingTime()
     }
 
     /**
-     * @group legacy
-     * @expectedDeprecation Using different values for the "model_timezone" and "view_timezone" options without configuring a reference date is deprecated since Symfony 4.4.
+     * @expectedException \Symfony\Component\Form\Exception\LogicException
+     * @expectedExceptionMessage Using different values for the "model_timezone" and "view_timezone" options without configuring a reference date is not supported.
      */
     public function testSetDataDifferentTimezonesWithoutReferenceDate()
     {

Original file line number	Diff line number	Diff line change
`@@ -426,8 +426,8 @@ public function testSetDataDifferentTimezonesDuringDaylightSavingTime()`
`426`	`426`	`}`
`427`	`427`
`428`	`428`	`/**`
`429`		`- * @group legacy`
`430`		`- * @expectedDeprecation Using different values for the "model_timezone" and "view_timezone" options without configuring a reference date is deprecated since Symfony 4.4.`
	`429`	`+ * @expectedException \Symfony\Component\Form\Exception\LogicException`
	`430`	`+ * @expectedExceptionMessage Using different values for the "model_timezone" and "view_timezone" options without configuring a reference date is not supported.`
`431`	`431`	`*/`
`432`	`432`	`public function testSetDataDifferentTimezonesWithoutReferenceDate()`
`433`	`433`	`{`