Merge pull request #47 from PHPCSStandards/feature/pear-psr2-psr12-functioncallsignature-check-anon-classes

4.0 | PEAR/PSR2/FunctionCallSignature: support anonymous classes

Author: jrfnl

src/Standards/PEAR/Sniffs/Functions/FunctionCallSignatureSniff.php

@@ -110,7 +110,9 @@ public function process(File $phpcsFile, $stackPtr)
 
         $closeBracket = $tokens[$openBracket]['parenthesis_closer'];
 
-        if (($stackPtr + 1) !== $openBracket) {
+        if ($tokens[$stackPtr]['code'] !== T_ANON_CLASS
+            && ($stackPtr + 1) !== $openBracket
+        ) {
             // Checking this: $value = my_function[*](...).
             $error = 'Space before opening parenthesis of function call prohibited';
             $fix   = $phpcsFile->addFixableError($error, $stackPtr, 'SpaceBeforeOpenBracket');

src/Standards/PEAR/Tests/Functions/FunctionCallSignatureUnitTest.inc

@@ -588,3 +588,24 @@ $val = namespace\functionCall(
     $arg,
     $arg2
 );
+
+// Anonymous object instantiations are treated the same as a normal call.
+$anon = new class() {};
+$anon = new class($foo, true) {};
+$anon = new class(
+    $foo,
+    true,
+    10
+) {};
+
+$anon = new class( ) {};
+$anon = new class( $foo, true    ) {};
+$anon = new class($foo,
+
+  true, 10) {};
+
+// ... though do not enforce no space between the class keyword and the open parenthesis.
+$anon = new class () {};
+
+// And anonymous object instantiations without parentheses are ignored.
+$anon = new class {};

src/Standards/PEAR/Tests/Functions/FunctionCallSignatureUnitTest.inc.fixed

@@ -606,3 +606,25 @@ $val = namespace\functionCall(
     $arg,
     $arg2
 );
+
+// Anonymous object instantiations are treated the same as a normal call.
+$anon = new class() {};
+$anon = new class($foo, true) {};
+$anon = new class(
+    $foo,
+    true,
+    10
+) {};
+
+$anon = new class() {};
+$anon = new class($foo, true) {};
+$anon = new class(
+    $foo,
+    true, 10
+) {};
+
+// ... though do not enforce no space between the class keyword and the open parenthesis.
+$anon = new class () {};
+
+// And anonymous object instantiations without parentheses are ignored.
+$anon = new class {};

src/Standards/PEAR/Tests/Functions/FunctionCallSignatureUnitTest.php

@@ -122,6 +122,12 @@ public function getErrorList()
             583 => 2,
             584 => 1,
             586 => 2,
+
+            601 => 2,
+            602 => 2,
+            603 => 1,
+            604 => 1,
+            605 => 2,
         ];
 
     }//end getErrorList()

src/Standards/PSR2/Tests/Methods/FunctionCallSignatureUnitTest.inc

@@ -265,3 +265,24 @@ array_fill_keys(
     ), value: true,
 );
 // phpcs:set PSR2.Methods.FunctionCallSignature allowMultipleArguments false
+
+// Anonymous object instantiations are treated the same as a normal call.
+$anon = new class() {};
+$anon = new class($foo, true) {};
+$anon = new class(
+    $foo,
+    true,
+    10
+) {};
+
+$anon = new class( ) {};
+$anon = new class( $foo, true    ) {};
+$anon = new class($foo,
+
+  true, 10) {};
+
+// ... though do not enforce no space between the class keyword and the open parenthesis.
+$anon = new class () {};
+
+// And anonymous object instantiations without parentheses are ignored.
+$anon = new class {};

src/Standards/PSR2/Tests/Methods/FunctionCallSignatureUnitTest.inc.fixed

@@ -281,3 +281,26 @@ array_fill_keys(
     ), value: true,
 );
 // phpcs:set PSR2.Methods.FunctionCallSignature allowMultipleArguments false
+
+// Anonymous object instantiations are treated the same as a normal call.
+$anon = new class() {};
+$anon = new class($foo, true) {};
+$anon = new class(
+    $foo,
+    true,
+    10
+) {};
+
+$anon = new class() {};
+$anon = new class($foo, true) {};
+$anon = new class(
+    $foo,
+    true,
+    10
+) {};
+
+// ... though do not enforce no space between the class keyword and the open parenthesis.
+$anon = new class () {};
+
+// And anonymous object instantiations without parentheses are ignored.
+$anon = new class {};

src/Standards/PSR2/Tests/Methods/FunctionCallSignatureUnitTest.php

@@ -76,6 +76,11 @@ public function getErrorList()
             258 => 1,
             263 => 1,
             264 => 1,
+            278 => 2,
+            279 => 2,
+            280 => 1,
+            281 => 1,
+            282 => 3,
         ];
 
     }//end getErrorList()

src/Standards/Squiz/Tests/Operators/ComparisonOperatorUsageUnitTest.inc

@@ -152,3 +152,10 @@ if (true) {}
 if (\true) {}
 for ($var1 = 10; FALSE; $var1--) {}
 for ($var1 = 10; \FALSE; $var1--) {}
+
+$anon = new class(!$foo ? 0 : 1, ($bar == true) ? 1 : 0) {
+    function __construct($a, $b) {}
+};
+$anon = new class($foo === false ? 0 : 1, ($bar === true) ? 1 : 0) {
+    function __construct($a, $b) {}
+};

src/Standards/Squiz/Tests/Operators/ComparisonOperatorUsageUnitTest.php

@@ -63,6 +63,7 @@ public function getErrorList()
             146 => 1,
             147 => 1,
             148 => 1,
+            156 => 2,
         ];
 
     }//end getErrorList()

src/Util/Tokens.php

@@ -464,14 +464,15 @@ final class Tokens
      * @var array<int|string, int|string>
      */
     public const FUNCTION_NAME_TOKENS = (self::INCLUDE_TOKENS + self::NAME_TOKENS + [
-        T_EVAL   => T_EVAL,
-        T_EXIT   => T_EXIT,
-        T_ISSET  => T_ISSET,
-        T_UNSET  => T_UNSET,
-        T_EMPTY  => T_EMPTY,
-        T_SELF   => T_SELF,
-        T_PARENT => T_PARENT,
-        T_STATIC => T_STATIC,
+        T_EVAL       => T_EVAL,
+        T_EXIT       => T_EXIT,
+        T_ISSET      => T_ISSET,
+        T_UNSET      => T_UNSET,
+        T_EMPTY      => T_EMPTY,
+        T_SELF       => T_SELF,
+        T_PARENT     => T_PARENT,
+        T_STATIC     => T_STATIC,
+        T_ANON_CLASS => T_ANON_CLASS,
     ]);
 
     /**