[Serializer] Fix CsvEncoder decode on empty data

cazak · nicolas-grekas · commit 6c2262203ee9 · 2023-02-06T10:03:40.000+01:00
diff --git a/src/Symfony/Component/Serializer/Encoder/CsvEncoder.php b/src/Symfony/Component/Serializer/Encoder/CsvEncoder.php
@@ -167,7 +167,7 @@ public function decode(string $data, string $format, array $context = [])
                     $headerCount = array_fill(0, $nbCols, 1);
                 } else {
                     foreach ($cols as $col) {
-                        $header = explode($keySeparator, $col);
+                        $header = explode($keySeparator, $col ?? '');
                         $headers[] = $header;
                         $headerCount[] = \count($header);
                     }
diff --git a/src/Symfony/Component/Serializer/Tests/Encoder/CsvEncoderTest.php b/src/Symfony/Component/Serializer/Tests/Encoder/CsvEncoderTest.php
@@ -211,6 +211,14 @@ public function testEncodeEmptyArray()
     {
         $this->assertEquals("\n\n", $this->encoder->encode([], 'csv'));
         $this->assertEquals("\n\n", $this->encoder->encode([[]], 'csv'));
+        $this->assertEquals("\n\n", $this->encoder->encode([['' => null]], 'csv'));
+    }
+
+    public function testDecodeEmptyData()
+    {
+        $data = $this->encoder->decode("\n\n", 'csv');
+
+        $this->assertSame([['' => null]], $data);
     }
 
     public function testEncodeVariableStructure()

Original file line number	Diff line number	Diff line change
`@@ -167,7 +167,7 @@ public function decode(string $data, string $format, array $context = [])`
`167`	`167`	`$headerCount = array_fill(0, $nbCols, 1);`
`168`	`168`	`} else {`
`169`	`169`	`foreach ($cols as $col) {`
`170`		`- $header = explode($keySeparator, $col);`
	`170`	`+ $header = explode($keySeparator, $col ?? '');`
`171`	`171`	`$headers[] = $header;`
`172`	`172`	`$headerCount[] = \count($header);`
`173`	`173`	`}`
Original file line number	Diff line number	Diff line change
`@@ -211,6 +211,14 @@ public function testEncodeEmptyArray()`
`211`	`211`	`{`
`212`	`212`	`$this->assertEquals("\n\n", $this->encoder->encode([], 'csv'));`
`213`	`213`	`$this->assertEquals("\n\n", $this->encoder->encode([[]], 'csv'));`
	`214`	`+ $this->assertEquals("\n\n", $this->encoder->encode([['' => null]], 'csv'));`
	`215`	`+ }`
	`216`	`+`
	`217`	`+ public function testDecodeEmptyData()`
	`218`	`+ {`
	`219`	`+ $data = $this->encoder->decode("\n\n", 'csv');`
	`220`	`+`
	`221`	`+ $this->assertSame([['' => null]], $data);`
`214`	`222`	`}`
`215`	`223`
`216`	`224`	`public function testEncodeVariableStructure()`