merged branch ondrowan/2.0 (PR #2614)

fabpot · fabpot · commit 7475a3924c90 · 2011-11-11T21:48:12.000+01:00
Commits ------- 2582fcb Added tests for string fix in DateTimeToArrayTransformer (8351a11). 8351a11 Added check for array fields to be integers in reverseTransform method. This prevents checkdate from getting strings as arguments and throwing incorrect ErrorException when submitting form with malformed (string) data in, for example, Date field. #2609 Discussion ---------- Fix for #2609 Second take for fix for #2609, hope it's ok now. Tests are failing without my fix and passing with it.
diff --git a/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateTimeToArrayTransformer.php b/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateTimeToArrayTransformer.php
@@ -142,6 +142,10 @@ public function reverseTransform($value)
             ));
         }
 
+        if (preg_match( '/^\d*$/', $value['month'] . $value['day'] . $value['year']) === 0) {
+            throw new TransformationFailedException('This is an invalid date');
+        }
+
         if (!empty($value['month']) && !empty($value['day']) && !empty($value['year']) && false === checkdate($value['month'], $value['day'], $value['year'])) {
             throw new TransformationFailedException('This is an invalid date');
         }
diff --git a/tests/Symfony/Tests/Component/Form/Extension/Core/DataTransformer/DateTimeToArrayTransformerTest.php b/tests/Symfony/Tests/Component/Form/Extension/Core/DataTransformer/DateTimeToArrayTransformerTest.php
@@ -463,4 +463,52 @@ public function testReverseTransformWithInvalidDay()
             'second' => '6',
         ));
     }
+
+    /**
+     * @expectedException Symfony\Component\Form\Exception\TransformationFailedException
+     */
+    public function testReverseTransformWithStringDay()
+    {
+        $transformer = new DateTimeToArrayTransformer();
+        $transformer->reverseTransform(array(
+            'year' => '2010',
+            'month' => '2',
+            'day' => 'bazinga',
+            'hour' => '4',
+            'minute' => '5',
+            'second' => '6',
+        ));
+    }
+
+    /**
+     * @expectedException Symfony\Component\Form\Exception\TransformationFailedException
+     */
+    public function testReverseTransformWithStringMonth()
+    {
+        $transformer = new DateTimeToArrayTransformer();
+        $transformer->reverseTransform(array(
+            'year' => '2010',
+            'month' => 'bazinga',
+            'day' => '31',
+            'hour' => '4',
+            'minute' => '5',
+            'second' => '6',
+        ));
+    }
+
+    /**
+     * @expectedException Symfony\Component\Form\Exception\TransformationFailedException
+     */
+    public function testReverseTransformWithStringYear()
+    {
+        $transformer = new DateTimeToArrayTransformer();
+        $transformer->reverseTransform(array(
+            'year' => 'bazinga',
+            'month' => '2',
+            'day' => '31',
+            'hour' => '4',
+            'minute' => '5',
+            'second' => '6',
+        ));
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -142,6 +142,10 @@ public function reverseTransform($value)`
`142`	`142`	`));`
`143`	`143`	`}`
`144`	`144`
	`145`	`+ if (preg_match( '/^\d*$/', $value['month'] . $value['day'] . $value['year']) === 0) {`
	`146`	`+ throw new TransformationFailedException('This is an invalid date');`
	`147`	`+ }`
	`148`	`+`
`145`	`149`	`if (!empty($value['month']) && !empty($value['day']) && !empty($value['year']) && false === checkdate($value['month'], $value['day'], $value['year'])) {`
`146`	`150`	`throw new TransformationFailedException('This is an invalid date');`
`147`	`151`	`}`