fix merge

symfony · Oct 2, 2019 · 766162c · 766162c
1 parent bf62544
commit 766162c
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/Symfony/Component/Serializer/Tests/Encoder/CsvEncoderTest.php b/src/Symfony/Component/Serializer/Tests/Encoder/CsvEncoderTest.php
@@ -70,7 +70,7 @@ public function testDoubleQuotesAndSlashes()
 CSV
         , $this->encoder->encode($data = ['', '"', 'foo"', '\\"', '\\', 'foo\\'], 'csv'));
 
-        $this->assertSame($data, $this->encoder->decode($csv, 'csv'));
+        $this->assertSame($data, $this->encoder->decode($csv, 'csv', [CsvEncoder::AS_COLLECTION_KEY => false]));
     }
 
     /**
@@ -79,8 +79,8 @@ public function testDoubleQuotesAndSlashes()
     public function testSingleSlash()
     {
         $this->assertSame($csv = "0\n\\\n", $this->encoder->encode($data = ['\\'], 'csv'));
-        $this->assertSame($data, $this->encoder->decode($csv, 'csv'));
-        $this->assertSame($data, $this->encoder->decode(trim($csv), 'csv'));
+        $this->assertSame($data, $this->encoder->decode($csv, 'csv', [CsvEncoder::AS_COLLECTION_KEY => false]));
+        $this->assertSame($data, $this->encoder->decode(trim($csv), 'csv', [CsvEncoder::AS_COLLECTION_KEY => false]));
     }
 
     public function testSupportEncoding()