feature #25218 [Serializer] add a constructor arguement to return csv always as collection (Simperfit)

dunglas · dunglas · commit e043478ba596 · 2018-02-19T15:04:52.000+01:00
This PR was merged into the 4.1-dev branch. Discussion ---------- [Serializer] add a constructor arguement to return csv always as collection | Q | A | ------------- | --- | Branch? | 4.1 | Bug fix? | yes | New feature? | no  | BC breaks? | no | Deprecations? | no  | Tests pass? | yes | Fixed tickets | #21616 | License | MIT | Doc PR | TODO create a doc PR for the 3 ways of getting csv collection, or a single Coding in the train again ;). ![img_9980](https://user-images.githubusercontent.com/3451634/33417042-f13063e4-d59f-11e7-8f30-143da768b1d7.JPG) This is to be able to add a new behaviour to the csv encoder when passing the alwaysAsCollection context key, this will return a collection even if there is only one element. Commits ------- d19d05d [Serializer] add a context key to return csv always as collection
diff --git a/src/Symfony/Component/Serializer/Encoder/CsvEncoder.php b/src/Symfony/Component/Serializer/Encoder/CsvEncoder.php
@@ -157,6 +157,10 @@ public function decode($data, $format, array $context = array())
         }
         fclose($handle);
 
+        if ($context['as_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
@@ -311,6 +311,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('as_collection' => true)));
+    }
+
     public function testDecodeToManyRelation()
     {
         $expected = array(

Original file line number	Diff line number	Diff line change
`@@ -157,6 +157,10 @@ public function decode($data, $format, array $context = array())`
`157`	`157`	`}`
`158`	`158`	`fclose($handle);`
`159`	`159`
	`160`	`+ if ($context['as_collection'] ?? false) {`
	`161`	`+ return $result;`
	`162`	`+ }`
	`163`	`+`
`160`	`164`	`if (empty($result) \|\| isset($result[1])) {`
`161`	`165`	`return $result;`
`162`	`166`	`}`