Fix TokenParser

Author: mnapoli

src/PhpDocReader/PhpParser/TokenParser.php

@@ -15,7 +15,7 @@ class TokenParser
     /**
      * The token list.
      *
-     * @var array
+     * @var list<mixed[]>
      */
     private $tokens;
 
@@ -57,24 +57,25 @@ public function __construct($contents)
      *
      * @param string $namespaceName The namespace name of the reflected class.
      *
-     * @return array A list with all found use statements.
+     * @return array<string, string> A list with all found use statements.
      */
     public function parseUseStatements($namespaceName)
     {
-        $statements = array();
+        $statements = [];
         while (($token = $this->next())) {
             if ($token[0] === T_USE) {
                 $statements = array_merge($statements, $this->parseUseStatement());
                 continue;
             }
-            if ($token[0] !== T_NAMESPACE || $this->parseNamespace() != $namespaceName) {
+
+            if ($token[0] !== T_NAMESPACE || $this->parseNamespace() !== $namespaceName) {
                 continue;
             }
 
             // Get fresh array for new namespace. This is to prevent the parser to collect the use statements
             // for a previous namespace with the same name. This is the case if a namespace is defined twice
             // or if a namespace with the same name is commented out.
-            $statements = array();
+            $statements = [];
         }
 
         return $statements;
@@ -83,19 +84,20 @@ public function parseUseStatements($namespaceName)
     /**
      * Gets the next non whitespace and non comment token.
      *
-     * @param boolean $docCommentIsComment If TRUE then a doc comment is considered a comment and skipped.
-     *                                     If FALSE then only whitespace and normal comments are skipped.
+     * @param bool $docCommentIsComment If TRUE then a doc comment is considered a comment and skipped.
+     *                                  If FALSE then only whitespace and normal comments are skipped.
      *
-     * @return array|null The token if exists, null otherwise.
+     * @return mixed[]|string|null The token if exists, null otherwise.
      */
     private function next($docCommentIsComment = true)
     {
         for ($i = $this->pointer; $i < $this->numTokens; $i++) {
             $this->pointer++;
-            if ($this->tokens[$i][0] === T_WHITESPACE ||
+            if (
+                $this->tokens[$i][0] === T_WHITESPACE ||
                 $this->tokens[$i][0] === T_COMMENT ||
-                ($docCommentIsComment && $this->tokens[$i][0] === T_DOC_COMMENT)) {
-
+                ($docCommentIsComment && $this->tokens[$i][0] === T_DOC_COMMENT)
+            ) {
                 continue;
             }
 
@@ -108,7 +110,7 @@ private function next($docCommentIsComment = true)
     /**
      * Parses a single use statement.
      *
-     * @return array A list with all found class names for a use statement.
+     * @return array<string, string> A list with all found class names for a use statement.
      */
     private function parseUseStatement()
     {
@@ -118,12 +120,22 @@ private function parseUseStatement()
         $statements = [];
         $explicitAlias = false;
         while (($token = $this->next())) {
-            $isNameToken = $token[0] === T_STRING || $token[0] === T_NS_SEPARATOR;
-            if (!$explicitAlias && $isNameToken) {
+            if (! $explicitAlias && $token[0] === T_STRING) {
                 $class .= $token[1];
                 $alias = $token[1];
-            } elseif ($explicitAlias && $isNameToken) {
-                $alias .= $token[1];
+            } elseif ($explicitAlias && $token[0] === T_STRING) {
+                $alias = $token[1];
+            } elseif (
+                PHP_VERSION_ID >= 80000 &&
+                ($token[0] === T_NAME_QUALIFIED || $token[0] === T_NAME_FULLY_QUALIFIED)
+            ) {
+                $class .= $token[1];
+
+                $classSplit = explode('\\', $token[1]);
+                $alias = $classSplit[count($classSplit) - 1];
+            } elseif ($token[0] === T_NS_SEPARATOR) {
+                $class .= '\\';
+                $alias = '';
             } elseif ($token[0] === T_AS) {
                 $explicitAlias = true;
                 $alias = '';
@@ -135,10 +147,10 @@ private function parseUseStatement()
             } elseif ($token === ';') {
                 $statements[strtolower($alias)] = $groupRoot . $class;
                 break;
-            } else if ($token === '{' ) {
+            } elseif ($token === '{') {
                 $groupRoot = $class;
                 $class = '';
-            } else if ($token === '}' ) {
+            } elseif ($token === '}') {
                 continue;
             } else {
                 break;
@@ -156,7 +168,12 @@ private function parseUseStatement()
     private function parseNamespace()
     {
         $name = '';
-        while (($token = $this->next()) && ($token[0] === T_STRING || $token[0] === T_NS_SEPARATOR)) {
+        while (
+            ($token = $this->next()) && ($token[0] === T_STRING || $token[0] === T_NS_SEPARATOR || (
+                    PHP_VERSION_ID >= 80000 &&
+                    ($token[0] === T_NAME_QUALIFIED || $token[0] === T_NAME_FULLY_QUALIFIED)
+                ))
+        ) {
             $name .= $token[1];
         }