symfony
diff --git a/‎src/Symfony/Component/Serializer/Encoder/CsvEncoder.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Serializer/Encoder/CsvEncoder.php
+4Lines changed: 4 additions & 0 deletions b/‎src/Symfony/Component/Serializer/Encoder/CsvEncoder.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Serializer/Encoder/CsvEncoder.php
+4Lines changed: 4 additions & 0 deletions
diff --git a/‎src/Symfony/Component/Serializer/Tests/Encoder/CsvEncoderTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Serializer/Tests/Encoder/CsvEncoderTest.php
+16Lines changed: 16 additions & 0 deletions b/‎src/Symfony/Component/Serializer/Tests/Encoder/CsvEncoderTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Serializer/Tests/Encoder/CsvEncoderTest.php
+16Lines changed: 16 additions & 0 deletions
@@ -150,6 +150,10 @@ public function decode($data, $format, array $context = array())
         }
         fclose($handle);
 
+        if (isset($context['forceCollection']) && $context['forceCollection']) {
+            return $result;
+        }
+
         if (empty($result) || isset($result[1])) {
             return $result;
         }
 
@@ -208,6 +208,22 @@ public function testDecodeCollection()
         , 'csv'));
     }
 
+    public function testDecodeOnlyOneAsCollection()
+    {
+        $this->encoder = new CsvEncoder(',', '"', '\\', '.');
+
+        $expected = array(
+            array('foo' => 'a'),
+        );
+
+        $this->assertEquals($expected, $this->encoder->decode(<<<'CSV'
+foo
+a
+
+CSV
+            , 'csv', array('forceCollection' => true)));
+    }
+
     public function testDecodeToManyRelation()
     {
         $expected = array(
Original file line number	Diff line number	Diff line change
`@@ -150,6 +150,10 @@ public function decode($data, $format, array $context = array())`
`150`	`150`	`}`
`151`	`151`	`fclose($handle);`
`152`	`152`
	`153`	`+ if (isset($context['forceCollection']) && $context['forceCollection']) {`
	`154`	`+ return $result;`
	`155`	`+ }`
	`156`	`+`
`153`	`157`	`if (empty($result) \|\| isset($result[1])) {`
`154`	`158`	`return $result;`
`155`	`159`	`}`