merged branch ManuelAC/2.0 (PR symfony#2629)

fabpot · fabpot · commit ff764090b95a · 2011-11-12T08:53:33.000+01:00
Commits ------- 462580c [Form] Check for normal integers. refs 0427b12 970e2a2 [Form] Replace `an` with `is` Discussion ---------- [Form] DateTimeToArrayTransformer fix Bug fix: yes Feature addition: no Backwards compatibility break: no Symfony2 tests pass: yes Fixes the following tickets: - Todo: - 0427b12 throws an `TransformationFailedException` if you're using integers. In other words: `` array('year' => '2011', 'month' => '11', 'day' => '12') = valid `` `` array('year' => 2011, 'month' => 11, 'day' => 12) = invalid ``
diff --git a/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateTimeToArrayTransformer.php b/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateTimeToArrayTransformer.php
@@ -142,16 +142,16 @@ public function reverseTransform($value)
             ));
         }
 
-        if (isset($value['month']) && !ctype_digit($value['month'])) {
-            throw new TransformationFailedException('This month an invalid');
+        if (isset($value['month']) && !ctype_digit($value['month']) && !is_int($value['month'])) {
+            throw new TransformationFailedException('This month is invalid');
         }
 
-        if (isset($value['day']) && !ctype_digit($value['day'])) {
-            throw new TransformationFailedException('This day an invalid');
+        if (isset($value['day']) && !ctype_digit($value['day']) && !is_int($value['day'])) {
+            throw new TransformationFailedException('This day is invalid');
         }
 
-        if (isset($value['year']) && !ctype_digit($value['year'])) {
-            throw new TransformationFailedException('This year an invalid');
+        if (isset($value['year']) && !ctype_digit($value['year']) && !is_int($value['year'])) {
+            throw new TransformationFailedException('This year is invalid');
         }
 
         if (!empty($value['month']) && !empty($value['day']) && !empty($value['year']) && false === checkdate($value['month'], $value['day'], $value['year'])) {

Original file line number	Diff line number	Diff line change
`@@ -142,16 +142,16 @@ public function reverseTransform($value)`
`142`	`142`	`));`
`143`	`143`	`}`
`144`	`144`
`145`		`- if (isset($value['month']) && !ctype_digit($value['month'])) {`
`146`		`- throw new TransformationFailedException('This month an invalid');`
	`145`	`+ if (isset($value['month']) && !ctype_digit($value['month']) && !is_int($value['month'])) {`
	`146`	`+ throw new TransformationFailedException('This month is invalid');`
`147`	`147`	`}`
`148`	`148`
`149`		`- if (isset($value['day']) && !ctype_digit($value['day'])) {`
`150`		`- throw new TransformationFailedException('This day an invalid');`
	`149`	`+ if (isset($value['day']) && !ctype_digit($value['day']) && !is_int($value['day'])) {`
	`150`	`+ throw new TransformationFailedException('This day is invalid');`
`151`	`151`	`}`
`152`	`152`
`153`		`- if (isset($value['year']) && !ctype_digit($value['year'])) {`
`154`		`- throw new TransformationFailedException('This year an invalid');`
	`153`	`+ if (isset($value['year']) && !ctype_digit($value['year']) && !is_int($value['year'])) {`
	`154`	`+ throw new TransformationFailedException('This year is invalid');`
`155`	`155`	`}`
`156`	`156`
`157`	`157`	`if (!empty($value['month']) && !empty($value['day']) && !empty($value['year']) && false === checkdate($value['month'], $value['day'], $value['year'])) {`