Merge branch '2.15'

Author: keradus

.travis.yml

@@ -165,6 +165,3 @@ jobs:
                     tags: true
             after_deploy:
                 - ./dev-tools/trigger-website.sh ${TRAVIS_TOKEN} ${TRAVIS_TAG}
-
-    allow_failures:
-        - php: 7.4snapshot

dev-tools/composer.json

@@ -3,10 +3,10 @@
         "php": "^7.1"
     },
     "require-dev": {
-        "localheinz/composer-normalize": "^1.0.0",
-        "maglnet/composer-require-checker": "^1.0",
-        "mi-schi/phpmd-extension": "^4.2",
-        "phpmd/phpmd": "^2.4.3"
+        "localheinz/composer-normalize": "^1.1",
+        "maglnet/composer-require-checker": "^2.0",
+        "mi-schi/phpmd-extension": "^4.3",
+        "phpmd/phpmd": "^2.6"
     },
     "conflict": {
         "hhvm": "*"

src/Fixer/FunctionNotation/MethodArgumentSpaceFixer.php

@@ -390,7 +390,7 @@ private function ensureFunctionFullyMultiline(Tokens $tokens, $startFunctionInde
                 continue;
             }
 
-            if ($token->equals(',')) {
+            if ($token->equals(',') && !$tokens[$tokens->getNextMeaningfulToken($index)]->equals(')')) {
                 $this->fixNewline($tokens, $index, $indentation);
             }
         }

tests/Fixer/FunctionNotation/MethodArgumentSpaceFixerTest.php

@@ -192,12 +192,26 @@ public function provideFixCases()
                 ['keep_multiple_spaces_after_comma' => true],
             ],
             'skip array' => [
-                '<?php array(10 , 20 ,30);',
+                '<?php array(10 , 20 ,30); $foo = [ 10,50 , 60 ] ?>',
             ],
             'list call with trailing comma' => [
                 '<?php list($path, $mode, ) = foo();',
                 '<?php list($path, $mode,) = foo();',
             ],
+            'list call with trailing comma multi line' => [
+                '<?php
+list(
+    $a,
+    $b,
+) = foo();
+',
+                '<?php
+list(
+    $a   ,
+    $b  ,
+) = foo();
+',
+            ],
             'inline comments with spaces' => [
                 '<?php xyz($a=10, /*comment1*/ $b=2000, /*comment2*/ $c=30);',
                 '<?php xyz($a=10,    /*comment1*/ $b=2000,/*comment2*/ $c=30);',
@@ -969,4 +983,47 @@ 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/Import/OrderedImportsFixerTest.php

@@ -796,12 +796,12 @@ public function provideFix70Cases()
             [
                 '<?php
 use C\B;
-use function B\fn;
+use function B\fn_a;
 use const A\ConstA;
                 ',
                 '<?php
 use const A\ConstA;
-use function B\fn;
+use function B\fn_a;
 use C\B;
                 ',
                 [
@@ -1884,7 +1884,7 @@ public function provideFix70TypesOrderAndAlphabetCases()
 use const some\a\{ConstD};
 use const some\b\{ConstE};
 use function some\a\{fn_a, fn_b};
-use function some\a\{fn};
+use function some\a\{fn_bc};
 use function some\b\{fn_c, fn_d, fn_e};
 use function some\c\{fn_f};
 use function some\f\{fn_g, fn_h, fn_i};
@@ -1903,7 +1903,7 @@ public function provideFix70TypesOrderAndAlphabetCases()
 };
 use const some\a\{ConstD};
 use Some\Cloz;
-use function some\a\{fn};
+use function some\a\{fn_bc};
 use const some\a\{ConstA};
 use function some\b\{fn_c, fn_d, fn_e};
 use const some\a\{ConstB, ConstC as CC};
@@ -1956,7 +1956,7 @@ public function provideFix70TypesOrderAndNoneCases()
 use const some\b\{ConstE};
 use function some\f\{fn_g, fn_h, fn_i};
 use function some\c\{fn_f};
-use function some\a\{fn};
+use function some\a\{fn_x};
 use function some\b\{fn_c, fn_d, fn_e};
 use function some\a\{fn_a, fn_b};
 ',
@@ -1974,7 +1974,7 @@ public function provideFix70TypesOrderAndNoneCases()
 };
 use const some\a\{ConstD};
 use Some\Cloz;
-use function some\a\{fn};
+use function some\a\{fn_x};
 use const some\a\{ConstA};
 use function some\b\{fn_c, fn_d, fn_e};
 use const some\a\{ConstB, ConstC as CC};

tests/Fixer/Import/SingleLineAfterImportsFixerTest.php

@@ -428,12 +428,12 @@ class Test {}
             [
                 ' <?php
 use some\a\ClassA;
-use function some\a\fn;
+use function some\a\fn_a;
 use const some\c;
 
 ',
                 ' <?php
-use some\a\ClassA; use function some\a\fn; use const some\c;
+use some\a\ClassA; use function some\a\fn_a; use const some\c;
 ',
             ],
         ];