From be20e892c23f2a378506da0b72f3712243bf15a6 Mon Sep 17 00:00:00 2001 From: Adrien LUCAS Date: Sun, 3 Jan 2016 21:53:50 +0100 Subject: [PATCH] Fix Form's DateTimeType tests. --- .../Tests/Extension/Core/Type/DateTimeTypeTest.php | 10 ++++++++-- .../Form/Tests/Extension/Core/Type/DateTypeTest.php | 1 + 2 files changed, 9 insertions(+), 2 deletions(-) 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 5e88646837..400bce31c8 100644 --- a/src/Symfony/Component/Form/Tests/Extension/Core/Type/DateTimeTypeTest.php +++ b/src/Symfony/Component/Form/Tests/Extension/Core/Type/DateTimeTypeTest.php @@ -29,6 +29,7 @@ class DateTimeTypeTest extends TestCase 'model_timezone' => 'UTC', 'view_timezone' => 'UTC', 'date_widget' => 'choice', + 'years' => array(2010), 'time_widget' => 'choice', 'input' => 'datetime', )); @@ -57,6 +58,7 @@ class DateTimeTypeTest extends TestCase 'view_timezone' => 'UTC', 'input' => 'string', 'date_widget' => 'choice', + 'years' => array(2010), 'time_widget' => 'choice', )); @@ -82,6 +84,7 @@ class DateTimeTypeTest extends TestCase 'view_timezone' => 'UTC', 'input' => 'timestamp', 'date_widget' => 'choice', + 'years' => array(2010), 'time_widget' => 'choice', )); @@ -108,12 +111,13 @@ class DateTimeTypeTest extends TestCase 'model_timezone' => 'UTC', 'view_timezone' => 'UTC', 'date_widget' => 'choice', + 'years' => array(2010), 'time_widget' => 'choice', 'input' => 'datetime', 'with_minutes' => false, )); - $form->setData(new \DateTime('2010-06-02 03:04:05 UTC')); + $form->setData(new \DateTime()); $input = array( 'date' => array( @@ -137,12 +141,13 @@ class DateTimeTypeTest extends TestCase 'model_timezone' => 'UTC', 'view_timezone' => 'UTC', 'date_widget' => 'choice', + 'years' => array(2010), 'time_widget' => 'choice', 'input' => 'datetime', 'with_seconds' => true, )); - $form->setData(new \DateTime('2010-06-02 03:04:05 UTC')); + $form->setData(new \DateTime()); $input = array( 'date' => array( @@ -168,6 +173,7 @@ class DateTimeTypeTest extends TestCase 'model_timezone' => 'America/New_York', 'view_timezone' => 'Pacific/Tahiti', 'date_widget' => 'choice', + 'years' => array(2010), 'time_widget' => 'choice', 'input' => 'string', 'with_seconds' => true, diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/DateTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/DateTypeTest.php index 06b6c3bc7c..d1049ee5cb 100644 --- a/src/Symfony/Component/Form/Tests/Extension/Core/Type/DateTypeTest.php +++ b/src/Symfony/Component/Form/Tests/Extension/Core/Type/DateTypeTest.php @@ -180,6 +180,7 @@ class DateTypeTest extends TestCase 'model_timezone' => 'UTC', 'view_timezone' => 'UTC', 'widget' => 'choice', + 'years' => array(2010), )); $text = array(