From 766162c4c790cc0b91185963b9c36b842bf2eb49 Mon Sep 17 00:00:00 2001 From: Nicolas Grekas Date: Wed, 2 Oct 2019 17:03:35 +0200 Subject: [PATCH] fix merge --- .../Component/Serializer/Tests/Encoder/CsvEncoderTest.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Symfony/Component/Serializer/Tests/Encoder/CsvEncoderTest.php b/src/Symfony/Component/Serializer/Tests/Encoder/CsvEncoderTest.php index ffe23fcb7e..11ee3302d4 100644 --- a/src/Symfony/Component/Serializer/Tests/Encoder/CsvEncoderTest.php +++ b/src/Symfony/Component/Serializer/Tests/Encoder/CsvEncoderTest.php @@ -70,7 +70,7 @@ CSV 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 @@ CSV 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()