merged 2.0

Author: fabpot

.travis.yml

@@ -1,6 +1,7 @@
 language: php
 
 php:
+  - 5.3.3
   - 5.3
   - 5.4
 

src/Symfony/Component/Form/Extension/Core/DataTransformer/DateTimeToLocalizedStringTransformer.php

@@ -157,6 +157,8 @@ protected function getIntlDateFormatter()
         $calendar = $this->calendar;
         $pattern = $this->pattern;
 
-        return new \IntlDateFormatter(\Locale::getDefault(), $dateFormat, $timeFormat, $timezone, $calendar, $pattern);
+        $intlDateFormatter = new \IntlDateFormatter(\Locale::getDefault(), $dateFormat, $timeFormat, $timezone, $calendar, $pattern);
+        $intlDateFormatter->setLenient(false);
+        return $intlDateFormatter;
     }
 }

src/Symfony/Component/Form/Extension/Core/DataTransformer/DateTimeToStringTransformer.php

@@ -96,6 +96,10 @@ public function reverseTransform($value)
 
         try {
             $dateTime = new \DateTime($value, new \DateTimeZone($this->outputTimezone));
+            $lastErrors = \DateTime::getLastErrors();
+            if (0 < $lastErrors['warning_count'] || 0 < $lastErrors['error_count']) {
+                throw new \UnexpectedValueException(implode(', ', array_merge(array_values($lastErrors['warnings']), array_values($lastErrors['errors']))));
+            }
 
             // Force value to be in same format as given to transform
             if ($value !== $dateTime->format($this->format)) {

src/Symfony/Component/Form/Extension/Core/Type/DateType.php

@@ -61,6 +61,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             \IntlDateFormatter::GREGORIAN,
             $pattern
         );
+        $formatter->setLenient(false);
 
         if ('single_text' === $options['widget']) {
             $builder->addViewTransformer(new DateTimeToLocalizedStringTransformer($options['data_timezone'], $options['user_timezone'], $format, \IntlDateFormatter::NONE, \IntlDateFormatter::GREGORIAN, $pattern));

src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateTimeToLocalizedStringTransformerTest.php

@@ -284,4 +284,14 @@ public function testValidateTimeFormatOption()
     {
         new DateTimeToLocalizedStringTransformer(null, null, null, 'foobar');
     }
+
+    /**
+     * @expectedException Symfony\Component\Form\Exception\TransformationFailedException
+     */
+    public function testReverseTransformWithNonExistingDate()
+    {
+        $transformer = new DateTimeToLocalizedStringTransformer('UTC', 'UTC', \IntlDateFormatter::SHORT);
+
+        $this->assertDateTimeEquals($this->dateTimeWithoutSeconds, $transformer->reverseTransform('31.04.10 04:05'));
+    }
 }

src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateTimeToStringTransformerTest.php

@@ -138,4 +138,13 @@ public function testReverseTransformExpectsValidDateString()
 
         $reverseTransformer->reverseTransform('2010-2010-2010');
     }
+
+    public function testReverseTransformWithNonExistingDate()
+    {
+        $reverseTransformer = new DateTimeToStringTransformer();
+
+        $this->setExpectedException('Symfony\Component\Form\Exception\TransformationFailedException');
+
+        $reverseTransformer->reverseTransform('2010-04-31');
+    }
 }

src/Symfony/Component/Form/Tests/Extension/Core/Type/DateTimeTypeTest.php

@@ -243,4 +243,22 @@ public function testSingleTextWidgetShouldUseTheRightInputType()
         $view = $form->createView();
         $this->assertEquals('datetime', $view->getVar('type'));
     }
+
+    public function testSubmit_invalidDateTimeSingleText()
+    {
+        $form = $this->factory->create('datetime', null, array(
+            'data_timezone' => 'UTC',
+            'user_timezone' => 'UTC',
+            'input' => 'datetime',
+            'widget' => 'single_text',
+            'invalid_message' => 'Customized invalid message',
+        ));
+
+        $form->bind('2012-04-31 03:04:05');
+
+        $this->assertFalse($form->isValid());
+        $this->assertNull($form->getData());
+        $this->assertEquals('2012-04-31 03:04:05', $form->getClientData());
+        $this->assertEquals(array(new FormError('Customized invalid message', array())), $form->getErrors());
+    }
 }

src/Symfony/Component/Form/Tests/Extension/Core/Type/DateTypeTest.php

@@ -12,6 +12,7 @@
 namespace Symfony\Component\Form\Tests\Extension\Core\Type;
 
 use Symfony\Component\Form\Extension\Core\View\ChoiceView;
+use Symfony\Component\Form\FormError;
 
 class DateTypeTest extends LocalizedTestCase
 {
@@ -546,4 +547,22 @@ public function testSingleTextWidgetShouldUseTheRightInputType()
         $view = $form->createView();
         $this->assertEquals('date', $view->getVar('type'));
     }
+
+    public function testInvalidDateWithSingleTextDateTime()
+    {
+        $form = $this->factory->create('date', null, array(
+            'data_timezone' => 'UTC',
+            'user_timezone' => 'UTC',
+            'widget' => 'single_text',
+            'input' => 'datetime',
+            'invalid_message' => 'Customized invalid message',
+        ));
+
+        $form->bind('31.4.2012');
+
+        $this->assertFalse($form->isValid());
+        $this->assertNull($form->getData());
+        $this->assertEquals('31.4.2012', $form->getClientData());
+        $this->assertEquals(array(new FormError('Customized invalid message', array())), $form->getErrors());
+    }
 }