Merge branch 'master' into 4.x

Author: jrfnl

src/Tokenizers/PHP.php

@@ -299,7 +299,7 @@ class PHP extends Tokenizer
      * from the scopeOpeners array. The data is duplicated here to
      * save time during parsing of the file.
      *
-     * @var array
+     * @var array<int|string, int|string>
      */
     public $endScopeTokens = [
         T_CLOSE_CURLY_BRACKET => T_CLOSE_CURLY_BRACKET,

src/Tokenizers/Tokenizer.php

@@ -55,7 +55,7 @@ abstract class Tokenizer
     /**
      * A list of tokens that end the scope.
      *
-     * @var array
+     * @var array<int|string, int|string>
      */
     public $endScopeTokens = [];
 

src/Util/Tokens.php

@@ -904,13 +904,13 @@ final class Tokens
 
 
     /**
-     * Given a token, returns the name of the token.
+     * Given a token constant, returns the name of the token.
      *
      * If passed an integer, the token name is sourced from PHP's token_name()
      * function. If passed a string, it is assumed to be a PHPCS-supplied token
      * that begins with PHPCS_T_, so the name is sourced from the token value itself.
      *
-     * @param int|string $token The token to get the name for.
+     * @param int|string $token The token constant to get the name for.
      *
      * @return string
      */

tests/Core/AbstractMethodTestCase.php

@@ -172,8 +172,8 @@ public function getTargetToken($commentString, $tokenType, $tokenContent=null)
      *
      * @return int
      *
-     * @throws Exception When the test delimiter comment is not found.
-     * @throws Exception When the test target token is not found.
+     * @throws \Exception When the test delimiter comment is not found.
+     * @throws \Exception When the test target token is not found.
      */
     public static function getTargetTokenFromFile(File $phpcsFile, $commentString, $tokenType, $tokenContent=null)
     {