Fixed bug #3316 : Arrow function not tokenized correctly when using null in union type

Author: gsherwood

src/Tokenizers/PHP.php

@@ -2100,17 +2100,18 @@ protected function processAdditional()
                 if (isset($this->tokens[$x]) === true && $this->tokens[$x]['code'] === T_OPEN_PARENTHESIS) {
                     $ignore  = Tokens::$emptyTokens;
                     $ignore += [
-                        T_STRING               => T_STRING,
-                        T_NAME_FULLY_QUALIFIED => T_NAME_FULLY_QUALIFIED,
-                        T_NAME_RELATIVE        => T_NAME_RELATIVE,
-                        T_NAME_QUALIFIED       => T_NAME_QUALIFIED,
                         T_ARRAY                => T_ARRAY,
+                        T_CALLABLE             => T_CALLABLE,
                         T_COLON                => T_COLON,
+                        T_NAME_FULLY_QUALIFIED => T_NAME_FULLY_QUALIFIED,
+                        T_NAME_QUALIFIED       => T_NAME_QUALIFIED,
+                        T_NAME_RELATIVE        => T_NAME_RELATIVE,
+                        T_NULL                 => T_NULL,
                         T_NULLABLE             => T_NULLABLE,
-                        T_CALLABLE             => T_CALLABLE,
                         T_PARENT               => T_PARENT,
                         T_SELF                 => T_SELF,
                         T_STATIC               => T_STATIC,
+                        T_STRING               => T_STRING,
                         T_TYPE_UNION           => T_TYPE_UNION,
                     ];
 

tests/Core/Tokenizer/BackfillFnTokenTest.inc

@@ -99,6 +99,9 @@ $arrowWithUnionReturn = fn($param) : int|float => $param | 10;
 /* testTernary */
 $fn = fn($a) => $a ? /* testTernaryThen */ fn() : string => 'a' : /* testTernaryElse */ fn() : string => 'b';
 
+/* testTernaryWithTypes */
+$fn = fn(int|null $a) : array|null => $a ? null : [];
+
 function matchInArrow($x) {
     /* testWithMatchValue */
     $fn = fn($x) => match(true) {

tests/Core/Tokenizer/BackfillFnTokenTest.php

@@ -501,6 +501,24 @@ public function testTernary()
     }//end testTernary()
 
 
+    /**
+     * Test typed arrow functions used in ternary operators.
+     *
+     * @covers PHP_CodeSniffer\Tokenizers\PHP::processAdditional
+     *
+     * @return void
+     */
+    public function testTernaryWithTypes()
+    {
+        $tokens = self::$phpcsFile->getTokens();
+
+        $token = $this->getTargetToken('/* testTernaryWithTypes */', T_FN);
+        $this->backfillHelper($token);
+        $this->scopePositionTestHelper($token, 15, 27);
+
+    }//end testTernaryWithTypes()
+
+
     /**
      * Test arrow function returning a match control structure.
      *