fix: Redundant Parentheses - closure with instanceof

Closes #199
webimpress · Dec 18, 2023 · 397f0a8 · 397f0a8
1 parent b4f23de
commit 397f0a8
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 5 deletions.
diff --git a/src/WebimpressCodingStandard/Sniffs/Formatting/RedundantParenthesesSniff.php b/src/WebimpressCodingStandard/Sniffs/Formatting/RedundantParenthesesSniff.php
@@ -143,6 +143,11 @@ public function process(File $phpcsFile, $stackPtr)
             return;
         }
 
+        // Skip when open parenthesis after closing parenthesis
+        if ($tokens[$next]['code'] === T_OPEN_PARENTHESIS) {
+            return;
+        }
+
         $firstInside = $phpcsFile->findNext(Tokens::$emptyTokens, $stackPtr + 1, $closePtr, true);
         $lastInside = $phpcsFile->findPrevious(Tokens::$emptyTokens, $closePtr - 1, $stackPtr + 1, true);
 
@@ -176,11 +181,6 @@ public function process(File $phpcsFile, $stackPtr)
             return;
         }
 
-        // Skip when open parenthesis after closing parenthesis
-        if ($tokens[$next]['code'] === T_OPEN_PARENTHESIS) {
-            return;
-        }
-
         // Check single expression casting
         if (in_array($tokens[$prev]['code'], Tokens::$castTokens, true)) {
             $op = $phpcsFile->findNext(

diff --git a/test/Sniffs/Formatting/RedundantParenthesesUnitTest.inc b/test/Sniffs/Formatting/RedundantParenthesesUnitTest.inc
@@ -207,4 +207,12 @@ class RedundantParentheses
             default => 0,
         };
     }
+
+    public function closureWithInstanceOf(): void
+    {
+        (static function (): void {
+            $container = require 'config/container.php';
+            assert($container instanceof ContainerInterface);
+        })();
+    }
 }
diff --git a/test/Sniffs/Formatting/RedundantParenthesesUnitTest.inc.fixed b/test/Sniffs/Formatting/RedundantParenthesesUnitTest.inc.fixed
@@ -207,4 +207,12 @@ class RedundantParentheses
             default => 0,
         };
     }
+
+    public function closureWithInstanceOf(): void
+    {
+        (static function (): void {
+            $container = require 'config/container.php';
+            assert($container instanceof ContainerInterface);
+        })();
+    }
 }