bug #4436 MethodArgumentSpaceFixer - handle misplaced ) (keradus)

This PR was merged into the 2.12 branch.

Discussion
----------

MethodArgumentSpaceFixer - handle misplaced )

Commits
-------

75b55b5 MethodArgumentSpaceFixer - handle misplaced )

Author: SpacePossum

src/Fixer/FunctionNotation/MethodArgumentSpaceFixer.php

@@ -317,13 +317,13 @@ private function ensureFunctionFullyMultiline(Tokens $tokens, $startFunctionInde
         $indentation = $existingIndentation.$this->whitespacesConfig->getIndent();
         $endFunctionIndex = $tokens->findBlockEnd(Tokens::BLOCK_TYPE_PARENTHESIS_BRACE, $startFunctionIndex);
 
-        if (!$this->isNewline($tokens[$endFunctionIndex - 1])) {
-            $tokens->ensureWhitespaceAtIndex(
-                $endFunctionIndex,
-                0,
-                $this->whitespacesConfig->getLineEnding().$existingIndentation
-            );
+        $wasWhitespaceBeforeEndFunctionAddedAsNewToken = $tokens->ensureWhitespaceAtIndex(
+            $tokens[$endFunctionIndex - 1]->isWhitespace() ? $endFunctionIndex - 1 : $endFunctionIndex,
+            0,
+            $this->whitespacesConfig->getLineEnding().$existingIndentation
+        );
 
+        if ($wasWhitespaceBeforeEndFunctionAddedAsNewToken) {
             ++$endFunctionIndex;
         }
 

tests/Fixer/FunctionNotation/MethodArgumentSpaceFixerTest.php

@@ -878,6 +878,25 @@ function foo(
                     'keep_multiple_spaces_after_comma' => true,
                 ],
             ],
+            'fix closing parenthesis (without trailing comma)' => [
+                '<?php
+if (true) {
+    execute(
+        $foo,
+        $bar
+    );
+}',
+                '<?php
+if (true) {
+    execute(
+        $foo,
+        $bar
+        );
+}',
+                [
+                    'on_multiline' => 'ensure_fully_multiline',
+                ],
+            ],
         ];
     }
 

tests/Fixer/FunctionNotation/NativeFunctionInvocationFixerTest.php

@@ -572,6 +572,6 @@ public function testFix73()
         $this->doTest(
             '<?php $name = \get_class($foo, );',
             '<?php $name = get_class($foo, );'
-         );
+        );
     }
 }

tests/Fixer/Phpdoc/NoBlankLinesAfterPhpdocFixerTest.php

@@ -158,7 +158,7 @@ class Foo {}',
                  */
                 '.'
                 class Foo {}'
-            );
+        );
     }
 
     public function testLineWithSpacesIsRemovedWhenNextTokenIsNotIndented()

tests/Fixer/Strict/StrictParamFixerTest.php

@@ -176,6 +176,6 @@ public function testFix73()
         $this->doTest(
             '<?php in_array($b, $c, true, );',
             '<?php in_array($b, $c, );'
-         );
+        );
     }
 }