The T_ARRAY_HINT token has been deprectated and will be removed in ve…

…rsion 4 (ref #1527)

package.xml

@@ -39,6 +39,11 @@ http://pear.php.net/dtd/package-2.0.xsd">
        --- For example, element key="print" value="echo"
     -- Thanks to Michał Bundyra for the patch
 
+  - The T_ARRAY_HINT token has been deprectated and will be removed in version 4
+    -- The token was used to ensure array type hints were not tokenized as T_ARRAY, but no other type hints were given a special token
+    -- Array type hints now use the standard T_STRING token instead
+    -- Sniffs referencing this token type will continue to run without error until version 4, but will not find any T_ARRAY_HINT tokens
+
   - Config values set using --runtime-set now override any config values set in rulesets or the CodeSniffer.conf file
   - You can now apply include-pattern rules to individual message codes in a ruleset like you can with exclude-pattern rules
     -- Previously, include-pattern rules only applied to entire sniffs

src/Files/File.php

@@ -1325,7 +1325,6 @@ public function getMethodParameters($stackPtr)
             case T_ELLIPSIS:
                 $variableLength = true;
                 break;
-            case T_ARRAY_HINT:
             case T_CALLABLE:
                 $typeHint .= $this->tokens[$i]['content'];
                 break;

src/Standards/Generic/Sniffs/PHP/LowerCaseKeywordSniff.php

@@ -28,7 +28,6 @@ public function register()
             T_HALT_COMPILER,
             T_ABSTRACT,
             T_ARRAY,
-            T_ARRAY_HINT,
             T_AS,
             T_BREAK,
             T_CALLABLE,

src/Standards/Generic/Tests/PHP/LowerCaseKeywordUnitTest.inc.fixed

@@ -13,7 +13,7 @@ const array()
 for ($var as $var) { exit; }
 if ($a and $b or $c xor $d) { die; } elseif { } else
 goto a;
-function (array $a) {}
+function (Array $a) {}
 const PRIVATE;
 HttpStatus::CONTINUE;
 function ($f) {

src/Standards/Generic/Tests/PHP/LowerCaseKeywordUnitTest.php

@@ -32,7 +32,6 @@ public function getErrorList()
             13 => 3,
             14 => 7,
             15 => 1,
-            16 => 1,
             19 => 1,
             20 => 1,
             21 => 1,

src/Tokenizers/PHP.php

@@ -420,7 +420,6 @@ class PHP extends Tokenizer
         T_SR                       => 2,
         T_SL_EQUAL                 => 3,
         T_SR_EQUAL                 => 3,
-        T_ARRAY_HINT               => 5,
         T_GREATER_THAN             => 1,
         T_LESS_THAN                => 1,
         T_BOOLEAN_NOT              => 1,
@@ -1073,7 +1072,6 @@ protected function tokenize($string)
                         $allowed = [
                             T_STRING       => T_STRING,
                             T_ARRAY        => T_ARRAY,
-                            T_ARRAY_HINT   => T_ARRAY_HINT,
                             T_CALLABLE     => T_CALLABLE,
                             T_SELF         => T_SELF,
                             T_PARENT       => T_PARENT,
@@ -1433,14 +1431,14 @@ protected function tokenize($string)
                 // This is a special condition for T_ARRAY tokens used for
                 // type hinting function arguments as being arrays. We want to keep
                 // the parenthesis map clean, so let's tag these tokens as
-                // T_ARRAY_HINT.
+                // T_STRING.
                 if ($newToken['code'] === T_ARRAY) {
                     for ($i = $stackPtr; $i < $numTokens; $i++) {
                         if ($tokens[$i] === '(') {
                             break;
                         } else if ($tokens[$i][0] === T_VARIABLE) {
-                            $newToken['code'] = T_ARRAY_HINT;
-                            $newToken['type'] = 'T_ARRAY_HINT';
+                            $newToken['code'] = T_STRING;
+                            $newToken['type'] = 'T_STRING';
                             break;
                         }
                     }