fix conflicts

Author: SpacePossum

tests/Fixer/FunctionNotation/MethodArgumentSpaceFixerTest.php

@@ -930,6 +930,26 @@ public function provideFix73Cases()
                 null,
                 ['on_multiline' => 'ensure_fully_multiline'],
             ],
+            [
+                '<?php
+functionCall(
+    1,
+    2,
+    3,
+);',
+                '<?php
+functionCall(
+    1, 2,
+    3,
+);',
+                [
+                    'on_multiline' => 'ensure_fully_multiline',
+                ],
+            ],
+            [
+                '<?php foo(1, 2, 3, );',
+                '<?php foo(1,2,3,);',
+            ],
         ];
     }
 
@@ -971,47 +991,4 @@ functionCall(
 
         $this->doTest($expected, $input);
     }
-
-    /**
-     * @param string      $expected
-     * @param null|string $input
-     * @param null|array  $config
-     *
-     * @requires PHP 7.3
-     * @dataProvider provideFix73Cases
-     */
-    public function testFix73($expected, $input = null, array $config = null)
-    {
-        if (null !== $config) {
-            $this->fixer->configure($config);
-        }
-
-        $this->doTest($expected, $input);
-    }
-
-    public function provideFix73Cases()
-    {
-        return [
-            [
-                '<?php
-functionCall(
-    1,
-    2,
-    3,
-);',
-                '<?php
-functionCall(
-    1, 2,
-    3,
-);',
-                [
-                    'on_multiline' => 'ensure_fully_multiline',
-                ],
-            ],
-            [
-                '<?php foo(1, 2, 3, );',
-                '<?php foo(1,2,3,);',
-            ],
-        ];
-    }
 }

tests/Fixer/FunctionNotation/PhpdocToReturnTypeFixerTest.php

@@ -31,7 +31,7 @@ final class PhpdocToReturnTypeFixerTest extends AbstractFixerTestCase
      *
      * @dataProvider provideFixCases
      */
-    public function testFix($expected, $input = null, $versionSpecificFix = null, $config = null)
+    public function testFix($expected, $input = null, $versionSpecificFix = null, $config = [])
     {
         if (
             (null !== $input && \PHP_VERSION_ID < 70000)
@@ -40,9 +40,8 @@ public function testFix($expected, $input = null, $versionSpecificFix = null, $c
             $expected = $input;
             $input = null;
         }
-        if (null !== $config) {
-            $this->fixer->configure($config);
-        }
+
+        $this->fixer->configure($config);
 
         $this->doTest($expected, $input);
     }