Commitb19ce4e

Amrouche Hamza

committed

[Serializer] add a context key to return csv always as collection

1 parent424cbcc commitb19ce4eCopy full SHA for b19ce4e

File tree

+23

-1

lines changed

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

+23

-1

lines changed

Lines changed: 7 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -32,13 +32,15 @@ class CsvEncoder implements EncoderInterface, DecoderInterface`
`32`	`32`	`private$enclosure;`
`33`	`33`	`private$escapeChar;`
`34`	`34`	`private$keySeparator;`
	`35`	`+private$forceCollection;`
`35`	`36`
`36`		`-publicfunction__construct(string$delimiter =',',string$enclosure ='"',string$escapeChar ='\\',string$keySeparator ='.')`
	`37`	`+publicfunction__construct(string$delimiter =',',string$enclosure ='"',string$escapeChar ='\\',string$keySeparator ='.',bool$forceCollection =false)`
`37`	`38`	`{`
`38`	`39`	`$this->delimiter =$delimiter;`
`39`	`40`	`$this->enclosure =$enclosure;`
`40`	`41`	`$this->escapeChar =$escapeChar;`
`41`	`42`	`$this->keySeparator =$keySeparator;`
	`43`	`+$this->forceCollection =$forceCollection;`
`42`	`44`	`}`
`43`	`45`
`44`	`46`	`/**`
`@@ -150,6 +152,10 @@ public function decode($data, $format, array $context = array())`
`150`	`152`	`}`
`151`	`153`	`fclose($handle);`
`152`	`154`
	`155`	`+if ($this->forceCollection) {`
	`156`	`+return$result;`
	`157`	`+ }`
	`158`	`+`
`153`	`159`	`if (empty($result) \|\|isset($result[1])) {`
`154`	`160`	`return$result;`
`155`	`161`	`}`

Lines changed: 16 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -208,6 +208,22 @@ public function testDecodeCollection()`
`208`	`208`	`,'csv'));`
`209`	`209`	`}`
`210`	`210`
	`211`	`+publicfunctiontestDecodeOnlyOneAsCollection()`
	`212`	`+ {`
	`213`	`+$this->encoder =newCsvEncoder(',','"','\\','.',true);`
	`214`	`+`
	`215`	`+$expected =array(`
	`216`	`+array('foo' =>'a'),`
	`217`	`+ );`
	`218`	`+`
	`219`	`+$this->assertEquals($expected,$this->encoder->decode(<<<'CSV'`
	`220`	`+foo`
	`221`	`+a`
	`222`	`+`
	`223`	`+CSV`
	`224`	`+ ,'csv'));`
	`225`	`+ }`
	`226`	`+`
`211`	`227`	`publicfunctiontestDecodeToManyRelation()`
`212`	`228`	`{`
`213`	`229`	`$expected =array(`

Comments

(0)