Fix #27378: Error when rendering a DateIntervalType form with exactly 0 weeks

karl.rixon · karl.rixon · commit 9ab0b48da20f · 2018-05-25T14:40:09.000+01:00
diff --git a/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateIntervalToArrayTransformer.php b/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateIntervalToArrayTransformer.php
@@ -89,7 +89,7 @@ public function transform($dateInterval)
             $result[$field] = $dateInterval->format('%'.($this->pad ? strtoupper($char) : $char));
         }
         if (in_array('weeks', $this->fields, true)) {
-            $result['weeks'] = 0;
+            $result['weeks'] = '0';
             if (isset($result['days']) && (int) $result['days'] >= 7) {
                 $result['weeks'] = (string) floor($result['days'] / 7);
                 $result['days'] = (string) ($result['days'] % 7);
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateIntervalToArrayTransformerTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateIntervalToArrayTransformerTest.php
@@ -90,6 +90,21 @@ public function testTransformWithWeek()
         $this->assertSame($output, $input);
     }
 
+    public function testTransformWithZeroWeek()
+    {
+        $transformer = new DateIntervalToArrayTransformer(array('weeks', 'minutes', 'seconds'));
+        $input = new \DateInterval('P1Y2M0WT4H5M6S');
+        $output = array(
+            'weeks' => '0',
+            'minutes' => '5',
+            'seconds' => '6',
+        );
+        $input = $transformer->transform($input);
+        ksort($input);
+        ksort($output);
+        $this->assertSame($output, $input);
+    }
+
     public function testTransformDaysToWeeks()
     {
         $transformer = new DateIntervalToArrayTransformer(array('weeks', 'minutes', 'seconds'));

Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,7 @@ public function transform($dateInterval)`
`89`	`89`	`$result[$field] = $dateInterval->format('%'.($this->pad ? strtoupper($char) : $char));`
`90`	`90`	`}`
`91`	`91`	`if (in_array('weeks', $this->fields, true)) {`
`92`		`- $result['weeks'] = 0;`
	`92`	`+ $result['weeks'] = '0';`
`93`	`93`	`if (isset($result['days']) && (int) $result['days'] >= 7) {`
`94`	`94`	`$result['weeks'] = (string) floor($result['days'] / 7);`
`95`	`95`	`$result['days'] = (string) ($result['days'] % 7);`