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

Amrouche Hamza · Amrouche Hamza · commit b19ce4e9d6c5 · 2018-01-05T13:11:35.000+01:00
diff --git a/src/Symfony/Component/Serializer/Encoder/CsvEncoder.php b/src/Symfony/Component/Serializer/Encoder/CsvEncoder.php
@@ -32,13 +32,15 @@ class CsvEncoder implements EncoderInterface, DecoderInterface
     private $enclosure;
     private $escapeChar;
     private $keySeparator;
+    private $forceCollection;
 
-    public function __construct(string $delimiter = ',', string $enclosure = '"', string $escapeChar = '\\', string $keySeparator = '.')
+    public function __construct(string $delimiter = ',', string $enclosure = '"', string $escapeChar = '\\', string $keySeparator = '.', bool $forceCollection = false)
     {
         $this->delimiter = $delimiter;
         $this->enclosure = $enclosure;
         $this->escapeChar = $escapeChar;
         $this->keySeparator = $keySeparator;
+        $this->forceCollection = $forceCollection;
     }
 
     /**
@@ -150,6 +152,10 @@ public function decode($data, $format, array $context = array())
         }
         fclose($handle);
 
+        if ($this->forceCollection) {
+            return $result;
+        }
+
         if (empty($result) || isset($result[1])) {
             return $result;
         }
diff --git a/src/Symfony/Component/Serializer/Tests/Encoder/CsvEncoderTest.php b/src/Symfony/Component/Serializer/Tests/Encoder/CsvEncoderTest.php
@@ -208,6 +208,22 @@ public function testDecodeCollection()
         , 'csv'));
     }
 
+    public function testDecodeOnlyOneAsCollection()
+    {
+        $this->encoder = new CsvEncoder(',', '"', '\\', '.', true);
+
+        $expected = array(
+            array('foo' => 'a'),
+        );
+
+        $this->assertEquals($expected, $this->encoder->decode(<<<'CSV'
+foo
+a
+
+CSV
+            , 'csv'));
+    }
+
     public function testDecodeToManyRelation()
     {
         $expected = array(

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`		`- public function __construct(string $delimiter = ',', string $enclosure = '"', string $escapeChar = '\\', string $keySeparator = '.')`
	`37`	`+ public function __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`	`}`