bug #9314 [Form] Fix DateType for 32bits computers. (WedgeSama)

fabpot · fabpot · commit 9b99f094a503 · 2013-11-28T08:06:13.000+01:00
This PR was squashed before being merged into the 2.2 branch (closes #9314). Discussion ---------- [Form] Fix DateType for 32bits computers. | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #5227,#5554 | License | MIT | Doc PR | - Fix an issue due to 32bits machines, date can be only between 1902-2037. Simply not add date if false. Can be good to add this to 2.3 and master too. Commits ------- b80fb43 [Form] Fix DateType for 32bits computers.
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/DateType.php b/src/Symfony/Component/Form/Extension/Core/Type/DateType.php
@@ -300,7 +300,9 @@ private function listYears(array $years)
         $result = array();
 
         foreach ($years as $year) {
-            $result[$year] = gmmktime(0, 0, 0, 6, 15, $year);
+            if (false !== $y = gmmktime(0, 0, 0, 6, 15, $year)) {
+                $result[$year] = $y;
+            }
         }
 
         return $result;
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/DateTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/DateTypeTest.php
@@ -774,4 +774,25 @@ public function testDayErrorsBubbleUp($widget)
         $this->assertSame(array(), $form['day']->getErrors());
         $this->assertSame(array($error), $form->getErrors());
     }
+    
+    public function testYearsFor32BitsMachines()
+    {
+        if (4 !== PHP_INT_SIZE) {
+            $this->markTestSkipped(
+                'PHP must be compiled in 32 bit mode to run this test');
+        }
+        
+        $form = $this->factory->create('date', null, array(
+            'years' => range(1900, 2040),
+        ));
+
+        $view = $form->createView();
+
+        $listChoices = array();
+        foreach(range(1902, 2037) as $y) {
+            $listChoices[] = new ChoiceView($y, $y, $y);
+        }
+        
+        $this->assertEquals($listChoices, $view['year']->vars['choices']);
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -300,7 +300,9 @@ private function listYears(array $years)`
`300`	`300`	`$result = array();`
`301`	`301`
`302`	`302`	`foreach ($years as $year) {`
`303`		`- $result[$year] = gmmktime(0, 0, 0, 6, 15, $year);`
	`303`	`+ if (false !== $y = gmmktime(0, 0, 0, 6, 15, $year)) {`
	`304`	`+ $result[$year] = $y;`
	`305`	`+ }`
`304`	`306`	`}`
`305`	`307`
`306`	`308`	`return $result;`