Commit9ab0b48

karl.rixon

committed

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

1 parentfc9f947 commit9ab0b48Copy full SHA for 9ab0b48

File tree

+16

-1

lines changed

src/Symfony/Component/Form
- Extension/Core/DataTransformer
  - DateIntervalToArrayTransformer.php
- Tests/Extension/Core/DataTransformer
  - DateIntervalToArrayTransformerTest.php

+16

-1

lines changed

Lines changed: 1 addition & 1 deletion

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);`

Lines changed: 15 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -90,6 +90,21 @@ public function testTransformWithWeek()`
`90`	`90`	`$this->assertSame($output,$input);`
`91`	`91`	`}`
`92`	`92`
	`93`	`+publicfunctiontestTransformWithZeroWeek()`
	`94`	`+ {`
	`95`	`+$transformer =newDateIntervalToArrayTransformer(array('weeks','minutes','seconds'));`
	`96`	`+$input =new \DateInterval('P1Y2M0WT4H5M6S');`
	`97`	`+$output =array(`
	`98`	`+'weeks' =>'0',`
	`99`	`+'minutes' =>'5',`
	`100`	`+'seconds' =>'6',`
	`101`	`+ );`
	`102`	`+$input =$transformer->transform($input);`
	`103`	`+ksort($input);`
	`104`	`+ksort($output);`
	`105`	`+$this->assertSame($output,$input);`
	`106`	`+ }`
	`107`	`+`
`93`	`108`	`publicfunctiontestTransformDaysToWeeks()`
`94`	`109`	`{`
`95`	`110`	`$transformer =newDateIntervalToArrayTransformer(array('weeks','minutes','seconds'));`

Comments

(0)