Fixed bug #1442 : T_NULLABLE detection not working for nullable parameters and return type hints in some cases

Author: gsherwood

CodeSniffer.php

@@ -73,7 +73,7 @@ class PHP_CodeSniffer
      *
      * @var string
      */
-    const VERSION = '2.9.0';
+    const VERSION = '2.9.1';
 
     /**
      * Package stability; either stable, beta or alpha.

CodeSniffer/Standards/Squiz/Tests/WhiteSpace/OperatorSpacingUnitTest.inc

@@ -189,3 +189,5 @@ function foo(string $bar, array $baz, ?MyClass $object) : MyClass {}
 declare(strict_types=1);
 
 function foo($c = ((BAR)?10:100)) {}
+
+function foo(string $a = '', ?string $b = ''): ?string {}

CodeSniffer/Standards/Squiz/Tests/WhiteSpace/OperatorSpacingUnitTest.inc.fixed

@@ -183,3 +183,5 @@ function foo(string $bar, array $baz, ?MyClass $object) : MyClass {}
 declare(strict_types=1);
 
 function foo($c = ((BAR) ? 10 : 100)) {}
+
+function foo(string $a = '', ?string $b = ''): ?string {}

CodeSniffer/Tokenizers/PHP.php

@@ -722,13 +722,27 @@ public function tokenizeString($string, $eolChar='\n')
                 $newToken            = array();
                 $newToken['content'] = '?';
 
+                $prevNonEmpty = null;
                 for ($i = ($stackPtr - 1); $i >= 0; $i--) {
                     if (is_array($tokens[$i]) === true) {
                         $tokenType = $tokens[$i][0];
                     } else {
                         $tokenType = $tokens[$i];
                     }
 
+                    if ($prevNonEmpty === null
+                        && isset(PHP_CodeSniffer_Tokens::$emptyTokens[$tokenType]) === false
+                    ) {
+                        // Found the previous non-empty token.
+                        if ($tokenType === ':' || $tokenType === ',') {
+                            $newToken['code'] = T_NULLABLE;
+                            $newToken['type'] = 'T_NULLABLE';
+                            break;
+                        }
+
+                        $prevNonEmpty = $tokenType;
+                    }
+
                     if ($tokenType === T_FUNCTION) {
                         $newToken['code'] = T_NULLABLE;
                         $newToken['type'] = 'T_NULLABLE';
@@ -740,7 +754,7 @@ public function tokenizeString($string, $eolChar='\n')
                         $insideInlineIf[] = $stackPtr;
                         break;
                     }
-                }
+                }//end for
 
                 $finalTokens[$newStackPtr] = $newToken;
                 $newStackPtr++;

package.xml

@@ -17,52 +17,16 @@ http://pear.php.net/dtd/package-2.0.xsd">
  <date>2017-05-04</date>
  <time>09:30:00</time>
  <version>
-  <release>2.9.0</release>
-  <api>2.9.0</api>
+  <release>2.9.1</release>
+  <api>2.9.1</api>
  </version>
  <stability>
   <release>stable</release>
   <api>stable</api>
  </stability>
  <license uri="https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt">BSD 3-Clause License</license>
  <notes>
-  - Added Generic.Debug.ESLint sniff to run ESLint over JS files and report errors
-    -- Set eslint path using: phpcs --config-set eslint_path /path/to/eslint
-    -- Thanks to Ryan McCue for the contribution
-  - T_POW is now properly considered an arithmetic operator, and will be checked as such
-    -- Thanks to Juliette Reinders Folmer for the patch
-  - T_SPACESHIP and T_COALESCE are now properly considered comparison operators, and will be checked as such
-    -- Thanks to Juliette Reinders Folmer for the patch
-  - Generic.PHP.DisallowShortOpenTag now warns about possible short open tags even when short_open_tag is set to OFF
-    -- Thanks to Juliette Reinders Folmer for the patch
-  - Generic.WhiteSpace.DisallowTabIndent now finds and fixes inproper use of spaces anywhere inside the line indent
-    -- Previously, only the first part of the indent was used to determine the indent type
-    -- Thanks to Juliette Reinders Folmer for the patch
-  - PEAR.Commenting.ClassComment now supports checking of traits as well as classes and interfaces
-    -- Thanks to Juliette Reinders Folmer for the patch
-  - Squiz.Commenting.FunctionCommentThrowTag now supports re-throwing exceptions (request #946)
-    -- Thanks to Samuel Levy for the patch
-  - Squiz.PHP.DisallowMultipleAssignments now ignores PHP4-style member var assignments
-    -- Thanks to Juliette Reinders Folmer for the patch
-  - Squiz.WhiteSpace.FunctionSpacing now ignores spacing above functions when they are preceded by inline comments
-    -- Stops conflicts between this sniff and comment spacing sniffs
-  - Squiz.WhiteSpace.OperatorSpacing no longer checks the equal sign in declare statements
-    -- Thanks to Juliette Reinders Folmer for the patch
-  - Added missing error codes for a couple of sniffs so they can now be customised as normal
-  - Fixed bug #1266 : PEAR.WhiteSpace.ScopeClosingBrace can throw an error while fixing mixed PHP/HTML
-  - Fixed bug #1364 : Yield From values are not recognised as returned values in Squiz FunctionComment sniff
-  - Fixed bug #1373 : Error in tab expansion results in white-space of incorrect size
-    -- Thanks to Mark Clements for the patch
-  - Fixed bug #1381 : Tokenizer: derefencing incorrectly identified as short array
-  - Fixed bug #1387 : Squiz.ControlStructures.ControlSignature does not handle alt syntax when checking space after closing brace
-  - Fixed bug #1392 : Scope indent calculated incorrectly when using array destructuring
-  - Fixed bug #1394 : integer type hints appearing as TypeHintMissing instead of ScalarTypeHintMissing
-    -- PHP 7 type hints were also being shown when run under PHP 5 in some cases
-  - Fixed bug #1405 : Squiz.WhiteSpace.ScopeClosingBrace fails to fix closing brace within indented PHP tags
-  - Fixed bug #1421 : Ternaries used in constant scalar expression for param default misidentified by tokenizer
-  - Fixed bug #1431 : PHPCBF can't fix short open tags when they are not followed by a space
-    -- Thanks to Gonçalo Queirós for the patch
-  - Fixed bug #1432 : PHPCBF can make invalid fixes to inline JS control structures that make use of JS objects
+  - Fixed bug #1442 : T_NULLABLE detection not working for nullable parameters and return type hints in some cases
  </notes>
  <contents>
   <dir name="/">