From f8b0994b5d96edd507a858baada6927ed7783244 Mon Sep 17 00:00:00 2001 From: Joseph Bielawski Date: Mon, 15 Apr 2013 13:36:11 +0200 Subject: [PATCH] [Form] Remove deprecated code from Date & Time related fields --- .../Form/Extension/Core/Type/DateTimeType.php | 17 ++--------------- .../Form/Extension/Core/Type/DateType.php | 17 ++--------------- .../Form/Extension/Core/Type/TimeType.php | 17 ++--------------- .../Extension/Core/Type/DateTimeTypeTest.php | 4 ++-- .../Tests/Extension/Core/Type/TimeTypeTest.php | 16 ++++++++-------- 5 files changed, 16 insertions(+), 55 deletions(-) diff --git a/src/Symfony/Component/Form/Extension/Core/Type/DateTimeType.php b/src/Symfony/Component/Form/Extension/Core/Type/DateTimeType.php index 383ab90b15c2..a612b6fc9c9a 100644 --- a/src/Symfony/Component/Form/Extension/Core/Type/DateTimeType.php +++ b/src/Symfony/Component/Form/Extension/Core/Type/DateTimeType.php @@ -207,23 +207,10 @@ public function setDefaultOptions(OptionsResolverInterface $resolver) return $options['widget']; }; - // BC until Symfony 2.3 - $modelTimezone = function (Options $options) { - return $options['data_timezone']; - }; - - // BC until Symfony 2.3 - $viewTimezone = function (Options $options) { - return $options['user_timezone']; - }; - $resolver->setDefaults(array( 'input' => 'datetime', - 'model_timezone' => $modelTimezone, - 'view_timezone' => $viewTimezone, - // Deprecated timezone options - 'data_timezone' => null, - 'user_timezone' => null, + 'model_timezone' => null, + 'view_timezone' => null, 'format' => self::HTML5_FORMAT, 'date_format' => null, 'widget' => null, diff --git a/src/Symfony/Component/Form/Extension/Core/Type/DateType.php b/src/Symfony/Component/Form/Extension/Core/Type/DateType.php index ad5914aae8af..a4a55a2af5d4 100644 --- a/src/Symfony/Component/Form/Extension/Core/Type/DateType.php +++ b/src/Symfony/Component/Form/Extension/Core/Type/DateType.php @@ -189,16 +189,6 @@ public function setDefaultOptions(OptionsResolverInterface $resolver) return $options['widget'] === 'single_text' ? DateType::HTML5_FORMAT : DateType::DEFAULT_FORMAT; }; - // BC until Symfony 2.3 - $modelTimezone = function (Options $options) { - return $options['data_timezone']; - }; - - // BC until Symfony 2.3 - $viewTimezone = function (Options $options) { - return $options['user_timezone']; - }; - $resolver->setDefaults(array( 'years' => range(date('Y') - 5, date('Y') + 5), 'months' => range(1, 12), @@ -206,11 +196,8 @@ public function setDefaultOptions(OptionsResolverInterface $resolver) 'widget' => 'choice', 'input' => 'datetime', 'format' => $format, - 'model_timezone' => $modelTimezone, - 'view_timezone' => $viewTimezone, - // Deprecated timezone options - 'data_timezone' => null, - 'user_timezone' => null, + 'model_timezone' => null, + 'view_timezone' => null, 'empty_value' => $emptyValue, // Don't modify \DateTime classes by reference, we treat // them like immutable value objects diff --git a/src/Symfony/Component/Form/Extension/Core/Type/TimeType.php b/src/Symfony/Component/Form/Extension/Core/Type/TimeType.php index 22df9547f829..d7a2a9efba51 100644 --- a/src/Symfony/Component/Form/Extension/Core/Type/TimeType.php +++ b/src/Symfony/Component/Form/Extension/Core/Type/TimeType.php @@ -173,16 +173,6 @@ public function setDefaultOptions(OptionsResolverInterface $resolver) ); }; - // BC until Symfony 2.3 - $modelTimezone = function (Options $options) { - return $options['data_timezone']; - }; - - // BC until Symfony 2.3 - $viewTimezone = function (Options $options) { - return $options['user_timezone']; - }; - $resolver->setDefaults(array( 'hours' => range(0, 23), 'minutes' => range(0, 59), @@ -191,11 +181,8 @@ public function setDefaultOptions(OptionsResolverInterface $resolver) 'input' => 'datetime', 'with_minutes' => true, 'with_seconds' => false, - 'model_timezone' => $modelTimezone, - 'view_timezone' => $viewTimezone, - // Deprecated timezone options - 'data_timezone' => null, - 'user_timezone' => null, + 'model_timezone' => null, + 'view_timezone' => null, 'empty_value' => $emptyValue, // Don't modify \DateTime classes by reference, we treat // them like immutable value objects diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/DateTimeTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/DateTimeTypeTest.php index 568766cf201c..3f86fa69ad47 100644 --- a/src/Symfony/Component/Form/Tests/Extension/Core/Type/DateTimeTypeTest.php +++ b/src/Symfony/Component/Form/Tests/Extension/Core/Type/DateTimeTypeTest.php @@ -97,8 +97,8 @@ public function testSubmitTimestamp() public function testSubmitWithoutMinutes() { $form = $this->factory->create('datetime', null, array( - 'data_timezone' => 'UTC', - 'user_timezone' => 'UTC', + 'model_timezone' => 'UTC', + 'view_timezone' => 'UTC', 'date_widget' => 'choice', 'time_widget' => 'choice', 'input' => 'datetime', diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/TimeTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/TimeTypeTest.php index 6d23250e042a..29ee88086bdf 100644 --- a/src/Symfony/Component/Form/Tests/Extension/Core/Type/TimeTypeTest.php +++ b/src/Symfony/Component/Form/Tests/Extension/Core/Type/TimeTypeTest.php @@ -114,8 +114,8 @@ public function testSubmitDatetimeSingleText() public function testSubmitDatetimeSingleTextWithoutMinutes() { $form = $this->factory->create('time', null, array( - 'data_timezone' => 'UTC', - 'user_timezone' => 'UTC', + 'model_timezone' => 'UTC', + 'view_timezone' => 'UTC', 'input' => 'datetime', 'widget' => 'single_text', 'with_minutes' => false, @@ -150,8 +150,8 @@ public function testSubmitArraySingleText() public function testSubmitArraySingleTextWithoutMinutes() { $form = $this->factory->create('time', null, array( - 'data_timezone' => 'UTC', - 'user_timezone' => 'UTC', + 'model_timezone' => 'UTC', + 'view_timezone' => 'UTC', 'input' => 'array', 'widget' => 'single_text', 'with_minutes' => false, @@ -207,8 +207,8 @@ public function testSubmitStringSingleText() public function testSubmitStringSingleTextWithoutMinutes() { $form = $this->factory->create('time', null, array( - 'data_timezone' => 'UTC', - 'user_timezone' => 'UTC', + 'model_timezone' => 'UTC', + 'view_timezone' => 'UTC', 'input' => 'string', 'widget' => 'single_text', 'with_minutes' => false, @@ -223,8 +223,8 @@ public function testSubmitStringSingleTextWithoutMinutes() public function testSetDataWithoutMinutes() { $form = $this->factory->create('time', null, array( - 'data_timezone' => 'UTC', - 'user_timezone' => 'UTC', + 'model_timezone' => 'UTC', + 'view_timezone' => 'UTC', 'input' => 'datetime', 'with_minutes' => false, ));