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
+14Lines changed: 14 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
+14Lines changed: 14 additions & 0 deletions
@@ -153,6 +153,10 @@ public function decode($data, $format, array $context = array())
         }
         fclose($handle);
 
+        if (isset($context['alwaysAsCollection']) && true === $context['alwaysAsCollection']) {
+            return $result;
+        }
+
         if (empty($result) || isset($result[1])) {
             return $result;
         }
 
@@ -178,6 +178,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('alwaysAsCollection' => true)));
+    }
+
     public function testDecodeToManyRelation()
     {
         $expected = array(
Original file line number	Diff line number	Diff line change
`@@ -153,6 +153,10 @@ public function decode($data, $format, array $context = array())`
`153`	`153`	`}`
`154`	`154`	`fclose($handle);`
`155`	`155`
	`156`	`+ if (isset($context['alwaysAsCollection']) && true === $context['alwaysAsCollection']) {`
	`157`	`+ return $result;`
	`158`	`+ }`
	`159`	`+`
`156`	`160`	`if (empty($result) \|\| isset($result[1])) {`
`157`	`161`	`return $result;`
`158`	`162`	`}`