Merge branch 'feature/generic-spreadoperatorspacingafter-ignore-first…

…-class-callables' of https://github.com/jrfnl/PHP_CodeSniffer
squizlabs · Dec 18, 2022 · 1e1b942 · 1e1b942
2 parents e26cc50 + dc61947
commit 1e1b942
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 0 deletions.
diff --git a/src/Standards/Generic/Sniffs/WhiteSpace/SpreadOperatorSpacingAfterSniff.php b/src/Standards/Generic/Sniffs/WhiteSpace/SpreadOperatorSpacingAfterSniff.php
@@ -62,6 +62,11 @@ public function process(File $phpcsFile, $stackPtr)
             return;
         }
 
+        if ($tokens[$nextNonEmpty]['code'] === T_CLOSE_PARENTHESIS) {
+            // Ignore PHP 8.1 first class callable syntax.
+            return;
+        }
+
         if ($this->ignoreNewlines === true
             && $tokens[$stackPtr]['line'] !== $tokens[$nextNonEmpty]['line']
         ) {

diff --git a/src/Standards/Generic/Tests/WhiteSpace/SpreadOperatorSpacingAfterUnitTest.inc b/src/Standards/Generic/Tests/WhiteSpace/SpreadOperatorSpacingAfterUnitTest.inc
@@ -67,7 +67,13 @@ function bar( &   ... $spread ) {
     );
 }
 
+// Ignore PHP 8.1 first class callable declarations.
+$map = array_map(strtolower(...), $map);
+
 // phpcs:set Generic.WhiteSpace.SpreadOperatorSpacingAfter spacing 0
 
+// Ignore PHP 8.1 first class callable declarations.
+$map = array_map(strtolower( ... ), $map);
+
 // Intentional parse error. This has to be the last test in the file.
 function bar( ...
diff --git a/src/Standards/Generic/Tests/WhiteSpace/SpreadOperatorSpacingAfterUnitTest.inc.fixed b/src/Standards/Generic/Tests/WhiteSpace/SpreadOperatorSpacingAfterUnitTest.inc.fixed
@@ -62,7 +62,13 @@ function bar( &   ...  $spread ) {
     );
 }
 
+// Ignore PHP 8.1 first class callable declarations.
+$map = array_map(strtolower(...), $map);
+
 // phpcs:set Generic.WhiteSpace.SpreadOperatorSpacingAfter spacing 0
 
+// Ignore PHP 8.1 first class callable declarations.
+$map = array_map(strtolower( ... ), $map);
+
 // Intentional parse error. This has to be the last test in the file.
 function bar( ...