SingleSpaceAfterConstructFixer - better handling of closing parenthesis and brace

Author: keradus

src/Fixer/LanguageConstruct/SingleSpaceAfterConstructFixer.php

@@ -197,7 +197,7 @@ protected function applyFix(\SplFileInfo $file, Tokens $tokens)
 
             $whitespaceTokenIndex = $index + 1;
 
-            if (';' === $tokens[$whitespaceTokenIndex]->getContent()) {
+            if ($tokens[$whitespaceTokenIndex]->equalsAny([';', ')', [CT::T_ARRAY_SQUARE_BRACE_CLOSE]])) {
                 continue;
             }
 

tests/Fixer/LanguageConstruct/SingleSpaceAfterConstructFixerTest.php

@@ -3137,10 +3137,10 @@ public function provideFixWithPhpOpenCases()
     /**
      * @dataProvider provideCommentsCases
      *
-     * @param string $expected
-     * @param string $input
+     * @param string      $expected
+     * @param null|string $input
      */
-    public function testComments($expected, $input)
+    public function testComments($expected, $input = null)
     {
         $this->fixer->configure([
             'constructs' => [
@@ -3170,6 +3170,15 @@ public function provideCommentsCases()
 $a = 3; # 3
 $a = 4; /** 4 */
 echo 1;
+',
+        ];
+
+        yield 'exceptions' => [
+            '<?php
+new Dummy(/* a */);
+new Dummy(/** b */);
+foo(/* c */);
+$arr = [/* empty */];
 ',
         ];
     }