Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
[Form] Remove deprecated code from Date & Time related fields
  • Loading branch information
stloyd committed Apr 15, 2013
1 parent 46efc9b commit f8b0994
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 55 deletions.
17 changes: 2 additions & 15 deletions src/Symfony/Component/Form/Extension/Core/Type/DateTimeType.php
Expand Up @@ -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,
Expand Down
17 changes: 2 additions & 15 deletions src/Symfony/Component/Form/Extension/Core/Type/DateType.php
Expand Up @@ -189,28 +189,15 @@ 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),
'days' => range(1, 31),
'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
Expand Down
17 changes: 2 additions & 15 deletions src/Symfony/Component/Form/Extension/Core/Type/TimeType.php
Expand Up @@ -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),
Expand All @@ -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
Expand Down
Expand Up @@ -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',
Expand Down
Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand All @@ -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,
));
Expand Down

0 comments on commit f8b0994

Please sign in to comment.