From dc61947e353014a6b9849ec0026d681b407ea2fc Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sun, 16 Oct 2022 07:30:11 +0200
Subject: [PATCH] PHP 8.1 | Generic/SpreadOperatorSpacingAfter: ignore spread
 operator in first class callables

... as in that case the spread operator does not apply to a variable/function call and the likelihood of the sniff conflicting with other sniffs which examine the spacing on the inside of parenthesis is high.

Includes unit tests.

Ref:
* https://wiki.php.net/rfc/first_class_callable_syntax
* https://3v4l.org/YTTO1
---
 .../Sniffs/WhiteSpace/SpreadOperatorSpacingAfterSniff.php   | 5 +++++
 .../Tests/WhiteSpace/SpreadOperatorSpacingAfterUnitTest.inc | 6 ++++++
 .../WhiteSpace/SpreadOperatorSpacingAfterUnitTest.inc.fixed | 6 ++++++
 3 files changed, 17 insertions(+)

diff --git a/src/Standards/Generic/Sniffs/WhiteSpace/SpreadOperatorSpacingAfterSniff.php b/src/Standards/Generic/Sniffs/WhiteSpace/SpreadOperatorSpacingAfterSniff.php
index 3146717e84..070bbcd1fb 100644
--- 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
index edce4dcc69..fb5c181429 100644
--- 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
index efec7ac15c..9388acfc63 100644
--- 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( ...