Commit805dd49

committed

[Serializer] Handle true/false/null appropriately in CSV encoder

1 parent7a6ce5f commit805dd49Copy full SHA for 805dd49

File tree

+47

-1

lines changed

src/Symfony/Component/Serializer
- Encoder
  - CsvEncoder.php
- Tests/Encoder
  - CsvEncoderTest.php

+47

-1

lines changed

Lines changed: 28 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -189,11 +189,38 @@ private function flatten(array $array, array &$result, $keySeparator, $parentKey`
`189`	`189`	`if (\is_array($value)) {`
`190`	`190`	`$this->flatten($value,$result,$keySeparator,$parentKey.$key.$keySeparator);`
`191`	`191`	`}else {`
`192`		`-$result[$parentKey.$key] =$value;`
	`192`	`+$result[$parentKey.$key] =$this->cleanValueByType($value);`
`193`	`193`	`}`
`194`	`194`	`}`
`195`	`195`	`}`
`196`	`196`
	`197`	`+/**`
	`198`	`+ * Ensures an actual value is used instead of a blank value when dealing`
	`199`	`+ * with true, false and null (like a nullable bool in a database).`
	`200`	`+ *`
	`201`	`+ * @param string $value`
	`202`	`+ *`
	`203`	`+ * @return string\|int`
	`204`	`+ */`
	`205`	`+privatefunctioncleanValueByType($value)`
	`206`	`+ {`
	`207`	`+if (false ===$value) {`
	`208`	`+return0;`
	`209`	`+ }`
	`210`	`+`
	`211`	`+if (null ===$value) {`
	`212`	`+// fputcsv will enclose a space`
	`213`	`+// https://github.com/php/php-src/blob/master/ext/standard/file.c`
	`214`	`+return'';`
	`215`	`+ }`
	`216`	`+`
	`217`	`+if (true ===$value) {`
	`218`	`+return1;`
	`219`	`+ }`
	`220`	`+`
	`221`	`+return$value;`
	`222`	`+ }`
	`223`	`+`
`197`	`224`	`privatefunctiongetCsvOptions(array$context)`
`198`	`225`	`{`
`199`	`226`	`$delimiter =isset($context[self::DELIMITER_KEY]) ?$context[self::DELIMITER_KEY] :$this->delimiter;`

Lines changed: 19 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,25 @@ protected function setUp()`
`29`	`29`	`$this->encoder =newCsvEncoder();`
`30`	`30`	`}`
`31`	`31`
	`32`	`+publicfunctiontestTrueFalseNullValues()`
	`33`	`+ {`
	`34`	`+$data = [`
	`35`	`+'string' =>'foo',`
	`36`	`+'int' =>2,`
	`37`	`+'false' =>false,`
	`38`	`+'true' =>true,`
	`39`	`+'null' =>null,`
	`40`	`+ ];`
	`41`	`+`
	`42`	`+// Check that true, false and null are appropriately handled`
	`43`	`+$this->assertEquals(<<<'CSV'`
	`44`	`+string,int,false,true,null`
	`45`	`+foo,2,0,1," "`
	`46`	`+`
	`47`	`+CSV`
	`48`	`+ ,$this->encoder->encode($data,'csv'));`
	`49`	`+ }`
	`50`	`+`
`32`	`51`	`publicfunctiontestSupportEncoding()`
`33`	`52`	`{`
`34`	`53`	`$this->assertTrue($this->encoder->supportsEncoding('csv'));`

Comments

(0)