Merge remote-tracking branch 'upstream/master'

Author: TysonAndre

src/Token.php

@@ -35,7 +35,7 @@ public function getText(string $document = null) {
         return substr($document, $this->start, $this->length - ($this->start - $this->fullStart));
     }
 
-    public function getFullText(string & $document) : string {
+    public function getFullText(string $document) : string {
         return substr($document, $this->fullStart, $this->length);
     }
 
@@ -59,15 +59,25 @@ public function getEndPosition() {
         return $this->fullStart + $this->length;
     }
 
-    public static function getTokenKindNameFromValue($kindName) {
-        $constants = (new \ReflectionClass("Microsoft\\PhpParser\\TokenKind"))->getConstants();
-        foreach ($constants as $name => $val) {
-            if ($val == $kindName) {
-                $kindName = $name;
-                break;
-            }
+    /**
+     * @return string[] - A hash map of the format [int $tokenKind => string $tokenName]
+     */
+    private static function getTokenKindNameFromValueMap() {
+        static $mapToKindName;
+        if ($mapToKindName === null) {
+            $constants = (new \ReflectionClass("Microsoft\\PhpParser\\TokenKind"))->getConstants();
+            $mapToKindName = \array_flip($constants);
         }
-        return $kindName;
+        return $mapToKindName;
+    }
+
+    /**
+     * @param int $kind
+     * @return string (Or int, if the kind name for $kind wasn't found)
+     */
+    public static function getTokenKindNameFromValue($kind) {
+        $mapToKindName = self::getTokenKindNameFromValueMap();
+        return $mapToKindName[$kind] ?? $kind;
     }
 
     public function jsonSerialize() {
@@ -76,7 +86,7 @@ public function jsonSerialize() {
         if (!isset($GLOBALS["SHORT_TOKEN_SERIALIZE"])) {
             $GLOBALS["SHORT_TOKEN_SERIALIZE"] = false;
         }
-        
+
         if ($GLOBALS["SHORT_TOKEN_SERIALIZE"]) {
             return [
                 "kind" => $kindName,

tests/ParserFrameworkValidationTests.php

@@ -18,9 +18,11 @@ public function frameworkErrorProvider() {
             $iterator = new RecursiveDirectoryIterator(__DIR__ . "/../validation/frameworks/" . $frameworkName);
 
             foreach (new RecursiveIteratorIterator($iterator) as $file) {
-                if (strpos($file, ".php") !== false) {
+                $pathName = $file->getPathname();
+                if (preg_match('/\.php$/', $pathName) > 0) {
+                    // Include files ending in ".php", but don't include XML(foo.phpunit.xml) or binary files (foo.php.gz)
                     $totalSize += $file->getSize();
-                    $testProviderArray[$frameworkName . "::" . $file->getBasename()] = [$file->getPathname(), $frameworkName];
+                    $testProviderArray[$frameworkName . "::" . $file->getBasename()] = [$pathName, $frameworkName];
                 }
             }
         }
@@ -33,7 +35,7 @@ public function frameworkErrorProvider() {
     /**
      * @dataProvider frameworkErrorProvider
      */
-    public function testFramworkErrors($testCaseFile, $frameworkName) {
+    public function testFrameworkErrors($testCaseFile, $frameworkName) {
         $fileContents = file_get_contents($testCaseFile);
         $parser = new \Microsoft\PhpParser\Parser();
         $sourceFile = $parser->parseSourceFile($fileContents);
@@ -51,8 +53,8 @@ public function testFramworkErrors($testCaseFile, $frameworkName) {
         foreach ($sourceFile->getDescendantNodesAndTokens() as $child) {
             if ($child instanceof Token) {
                 $this->assertNotEquals(\Microsoft\PhpParser\TokenKind::Unknown, $child->kind, "input: $testCaseFile\r\nexpected: ");
-                $this->assertNotTrue($child instanceof \Microsoft\PhpParser\SkippedToken, "input: $testCaseFile\r\nexpected: ");
-                $this->assertNotTrue($child instanceof \Microsoft\PhpParser\MissingToken, "input: $testCaseFile\r\nexpected: ");
+                $this->assertNotInstanceOf(\Microsoft\PhpParser\SkippedToken::class, $child, "input: $testCaseFile\r\nexpected: ");
+                $this->assertNotInstanceOf(\Microsoft\PhpParser\MissingToken::class, $child, "input: $testCaseFile\r\nexpected: ");
             }
         }