Merge branch 'hotfix/2713-fn-closure-ternary-tokenizer' of https://gi…

…thub.com/michalbundyra/PHP_CodeSniffer
squizlabs · Nov 20, 2019 · c46d135 · c46d135
2 parents 5157a81 + 8e41312
commit c46d135
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/src/Standards/Squiz/Tests/PHP/DisallowInlineIfUnitTest.inc b/src/Standards/Squiz/Tests/PHP/DisallowInlineIfUnitTest.inc
@@ -14,3 +14,5 @@ class Example {
 }
 
 $a = fn(?\DateTime $x) : ?\DateTime => $x;
+
+$b = fn ($b) => $b ? true : false;
diff --git a/src/Standards/Squiz/Tests/PHP/DisallowInlineIfUnitTest.php b/src/Standards/Squiz/Tests/PHP/DisallowInlineIfUnitTest.php
@@ -29,7 +29,10 @@ public function getErrorList($testFile='DisallowInlineIfUnitTest.inc')
     {
         switch ($testFile) {
         case 'DisallowInlineIfUnitTest.inc':
-            return [8 => 1];
+            return [
+                8  => 1,
+                18 => 1,
+            ];
             break;
         case 'DisallowInlineIfUnitTest.js':
             return [1 => 1];

diff --git a/src/Tokenizers/PHP.php b/src/Tokenizers/PHP.php
@@ -1083,7 +1083,7 @@ protected function tokenize($string)
                         $newToken['code'] = T_NULLABLE;
                         $newToken['type'] = 'T_NULLABLE';
                         break;
-                    } else if (in_array($tokenType, [T_OPEN_TAG, T_OPEN_TAG_WITH_ECHO, '=', '{', ';'], true) === true) {
+                    } else if (in_array($tokenType, [T_DOUBLE_ARROW, T_OPEN_TAG, T_OPEN_TAG_WITH_ECHO, '=', '{', ';'], true) === true) {
                         if (PHP_CODESNIFFER_VERBOSITY > 1) {
                             echo "\t\t* token $stackPtr changed from ? to T_INLINE_THEN".PHP_EOL;
                         }
@@ -1486,7 +1486,7 @@ function return types. We want to keep the parenthesis map clean,
                             }
                         }
 
-                        if ($tokens[$i][0] === T_FUNCTION || $tokens[$i][0] === T_USE) {
+                        if ($tokens[$i][0] === T_FUNCTION || $tokens[$i][0] === T_FN || $tokens[$i][0] === T_USE) {
                             $isReturnType = true;
                         }
                     }//end if
Original file line number	Diff line number	Diff line change
Expand Up		@@ -14,3 +14,5 @@ class Example {
		}

		$a = fn(?\DateTime $x) : ?\DateTime => $x;

		$b = fn ($b) => $b ? true : false;