Merge branch '6.1' into 6.2

* 6.1:
  Fix CS
  Fix CS

Author: fabpot

Tests/Encoder/CsvEncoderTest.php

@@ -47,7 +47,7 @@ public function testTrueFalseValues()
 foo,2,0,1,1,1
 
 CSV
-        , $this->encoder->encode($data, 'csv'));
+            , $this->encoder->encode($data, 'csv'));
 
         $this->assertSame([
             'string' => 'foo',
@@ -66,7 +66,7 @@ public function testDoubleQuotesAndSlashes()
 ,"""","foo""","\""",\,foo\
 
 CSV
-        , $this->encoder->encode($data = ['', '"', 'foo"', '\\"', '\\', 'foo\\'], 'csv'));
+            , $this->encoder->encode($data = ['', '"', 'foo"', '\\"', '\\', 'foo\\'], 'csv'));
 
         $this->assertSame($data, $this->encoder->decode($csv, 'csv', [CsvEncoder::AS_COLLECTION_KEY => false]));
     }
@@ -93,7 +93,7 @@ public function testEncode()
 hello,"hey ho"
 
 CSV
-    , $this->encoder->encode($value, 'csv'));
+            , $this->encoder->encode($value, 'csv'));
     }
 
     public function testEncodeCollection()
@@ -109,7 +109,7 @@ public function testEncodeCollection()
 hi,"let's go"
 
 CSV
-    , $this->encoder->encode($value, 'csv'));
+            , $this->encoder->encode($value, 'csv'));
     }
 
     public function testEncodePlainIndexedArray()
@@ -144,7 +144,7 @@ public function testEncodeNestedArrays()
 hello,yo,wesh,Halo,olá
 
 CSV
-    , $this->encoder->encode($value, 'csv'));
+            , $this->encoder->encode($value, 'csv'));
     }
 
     public function testEncodeCustomSettings()
@@ -163,7 +163,7 @@ public function testEncodeCustomSettings()
 'he''llo';foo
 
 CSV
-    , $this->encoder->encode($value, 'csv'));
+            , $this->encoder->encode($value, 'csv'));
     }
 
     public function testEncodeCustomSettingsPassedInContext()
@@ -175,12 +175,12 @@ public function testEncodeCustomSettingsPassedInContext()
 'he''llo';foo
 
 CSV
-        , $this->encoder->encode($value, 'csv', [
-            CsvEncoder::DELIMITER_KEY => ';',
-            CsvEncoder::ENCLOSURE_KEY => "'",
-            CsvEncoder::ESCAPE_CHAR_KEY => '|',
-            CsvEncoder::KEY_SEPARATOR_KEY => '-',
-        ]));
+            , $this->encoder->encode($value, 'csv', [
+                CsvEncoder::DELIMITER_KEY => ';',
+                CsvEncoder::ENCLOSURE_KEY => "'",
+                CsvEncoder::ESCAPE_CHAR_KEY => '|',
+                CsvEncoder::KEY_SEPARATOR_KEY => '-',
+            ]));
     }
 
     public function testEncodeCustomSettingsPassedInConstructor()
@@ -198,7 +198,7 @@ public function testEncodeCustomSettingsPassedInConstructor()
 'he''llo';foo
 
 CSV
-        , $encoder->encode($value, 'csv'));
+            , $encoder->encode($value, 'csv'));
     }
 
     public function testEncodeEmptyArray()
@@ -489,7 +489,7 @@ public function testDecodeAsSingle()
 foo,bar
 a,b
 CSV
-        , 'csv', [CsvEncoder::AS_COLLECTION_KEY => false]));
+            , 'csv', [CsvEncoder::AS_COLLECTION_KEY => false]));
     }
 
     public function testDecodeCollection()
@@ -507,7 +507,7 @@ public function testDecodeCollection()
 f
 
 CSV
-        , 'csv'));
+            , 'csv'));
     }
 
     public function testDecode()
@@ -521,7 +521,7 @@ public function testDecode()
 a
 
 CSV
-        , 'csv'));
+            , 'csv'));
     }
 
     public function testDecodeToManyRelation()
@@ -555,7 +555,7 @@ public function testDecodeNestedArrays()
 a,b
 c,d
 CSV
-        , 'csv'));
+            , 'csv'));
     }
 
     public function testDecodeCustomSettings()
@@ -572,7 +572,7 @@ public function testDecodeCustomSettings()
 a;bar-baz
 'hell''o';b;c
 CSV
-        , 'csv'));
+            , 'csv'));
     }
 
     public function testDecodeCustomSettingsPassedInContext()
@@ -582,12 +582,12 @@ public function testDecodeCustomSettingsPassedInContext()
 a;bar-baz
 'hell''o';b;c
 CSV
-        , 'csv', [
-            CsvEncoder::DELIMITER_KEY => ';',
-            CsvEncoder::ENCLOSURE_KEY => "'",
-            CsvEncoder::ESCAPE_CHAR_KEY => '|',
-            CsvEncoder::KEY_SEPARATOR_KEY => '-',
-        ]));
+            , 'csv', [
+                CsvEncoder::DELIMITER_KEY => ';',
+                CsvEncoder::ENCLOSURE_KEY => "'",
+                CsvEncoder::ESCAPE_CHAR_KEY => '|',
+                CsvEncoder::KEY_SEPARATOR_KEY => '-',
+            ]));
     }
 
     public function testDecodeCustomSettingsPassedInConstructor()
@@ -604,7 +604,7 @@ public function testDecodeCustomSettingsPassedInConstructor()
 a;bar-baz
 'hell''o';b;c
 CSV
-        , 'csv'));
+            , 'csv'));
     }
 
     public function testDecodeMalformedCollection()
@@ -637,18 +637,18 @@ public function testDecodeWithoutHeader()
 c,d
 
 CSV
-        , 'csv', [
-            CsvEncoder::NO_HEADERS_KEY => true,
-        ]));
+            , 'csv', [
+                CsvEncoder::NO_HEADERS_KEY => true,
+            ]));
         $encoder = new CsvEncoder([CsvEncoder::NO_HEADERS_KEY => true]);
         $this->assertEquals([['a', 'b'], ['c', 'd']], $encoder->decode(<<<'CSV'
 a,b
 c,d
 
 CSV
-        , 'csv', [
-            CsvEncoder::NO_HEADERS_KEY => true,
-        ]));
+            , 'csv', [
+                CsvEncoder::NO_HEADERS_KEY => true,
+            ]));
     }
 
     public function testBOMIsAddedOnDemand()

Tests/Normalizer/FormErrorNormalizerTest.php

@@ -42,7 +42,7 @@ protected function setUp(): void
                 new FormError('a', 'b', ['c', 'd'], 5, 'f'),
                 new FormError(1, 2, [3, 4], 5, 6),
             ])
-        );
+            );
     }
 
     public function testSupportsNormalizationWithWrongClass()
@@ -130,21 +130,21 @@ public function testNormalizeWithChildren()
             ->willReturn(new FormErrorIterator($form1, [
                 new FormError('b'),
             ])
-        );
+            );
         $form1->method('getName')->willReturn('form1');
 
         $form2->method('getErrors')
             ->willReturn(new FormErrorIterator($form1, [
                 new FormError('c'),
             ])
-        );
+            );
         $form2->method('getName')->willReturn('form2');
 
         $form3->method('getErrors')
             ->willReturn(new FormErrorIterator($form1, [
                 new FormError('d'),
             ])
-        );
+            );
         $form3->method('getName')->willReturn('form3');
 
         $form2->method('all')->willReturn([$form3]);
@@ -156,7 +156,7 @@ public function testNormalizeWithChildren()
             ->willReturn(new FormErrorIterator($form, [
                 new FormError('a'),
             ])
-        );
+            );
 
         $this->assertEquals($exptected, $this->normalizer->normalize($form));
     }