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

Amrouche Hamza · Amrouche Hamza · commit 0b5588a4dbef · 2017-12-04T18:11:44.000+01:00
diff --git a/src/Symfony/Component/Serializer/Encoder/CsvEncoder.php b/src/Symfony/Component/Serializer/Encoder/CsvEncoder.php
@@ -26,6 +26,7 @@ class CsvEncoder implements EncoderInterface, DecoderInterface
     const ENCLOSURE_KEY = 'csv_enclosure';
     const ESCAPE_CHAR_KEY = 'csv_escape_char';
     const KEY_SEPARATOR_KEY = 'csv_key_separator';
+    const ALWAYS_COLLECTION = 'csv_always_collection';
     const HEADERS_KEY = 'csv_headers';
 
     private $delimiter;
@@ -150,6 +151,10 @@ public function decode($data, $format, array $context = array())
         }
         fclose($handle);
 
+        if ($context[self::ALWAYS_COLLECTION] ?? false) {
+            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,20 @@ public function testDecodeCollection()
         , 'csv'));
     }
 
+    public function testDecodeOnlyOneAsCollection()
+    {
+        $expected = array(
+            array('foo' => 'a'),
+        );
+
+        $this->assertEquals($expected, $this->encoder->decode(<<<'CSV'
+foo
+a
+
+CSV
+            , 'csv', array(CsvEncoder::ALWAYS_COLLECTION => true)));
+    }
+
     public function testDecodeToManyRelation()
     {
         $expected = array(
