Arrays::getDoubleArrowPtr(): work around tokenizer bug in PHPCS 3.5.4

PHPCSUtils/Utils/Arrays.php

@@ -265,7 +265,8 @@ public static function getDoubleArrowPtr(File $phpcsFile, $start, $end)
  );
  }
 
- $targets = self::$doubleArrowTargets + Collections::$closedScopes;
+ $targets = self::$doubleArrowTargets;
+ $targets += Collections::$closedScopes;
  $targets += Collections::arrowFunctionTokensBC();
 
  $doubleArrow = ($start - 1);
@@ -285,6 +286,14 @@ public static function getDoubleArrowPtr(File $phpcsFile, $start, $end)
  return $doubleArrow;
  }
 
+ /*
+ * BC: work-around a bug in PHPCS 3.5.4 where the double arrow is incorrectly tokenized as T_STRING.
+ * @link https://github.com/squizlabs/PHP_CodeSniffer/issues/2865
+ */
+ if ($tokens[$doubleArrow]['code'] === \T_STRING && $tokens[$doubleArrow]['content'] === '=>') {
+ return $doubleArrow;
+ }
+
  // Skip over closed scopes which may contain foreach structures or generators.
  if (isset(Collections::$closedScopes[$tokens[$doubleArrow]['code']]) === true
  && isset($tokens[$doubleArrow]['scope_closer']) === true

Tests/Utils/Arrays/GetDoubleArrowPtrTest.inc

@@ -81,6 +81,9 @@ $array = [
  /* testTstringKeyNotFnFunction */
  CONSTANT_NAME => 'value',
 
- /* testPropertyAccessPHPCS353-354 */
+ /* testKeyPropertyAccessFnPHPCS353-354 */
  ($obj->fn) => 'value',
+
+ /* testDoubleArrowTokenizedAsTstring-PHPCS2865 */
+ $obj->fn => 'value',
 ];

Tests/Utils/Arrays/GetDoubleArrowPtrTest.php

@@ -210,9 +210,13 @@ public function dataGetDoubleArrowPtr()
  ],
  // Test specifically for PHPCS 3.5.3 and 3.5.4 in which all "fn" tokens were tokenized as T_FN.
  'test-arrow-access-to-property-named-fn-as-key-phpcs-3.5.3-3.5.4' => [
- '/* testPropertyAccessPHPCS353-354 */',
+ '/* testKeyPropertyAccessFnPHPCS353-354 */',
  12,
  ],
+ 'test-double-arrow-incorrectly-tokenized-phpcs-issue-2865' => [
+ '/* testDoubleArrowTokenizedAsTstring-PHPCS2865 */',
+ 10,
+ ],
  ];
  }
 }