Upgrade to nikic/php-parser v5 and update parser usage (#7566)

Co-authored-by: 李铭昕 <715557344@qq.com>

Author: huangdijia

composer.json

@@ -23,7 +23,7 @@
     },
     "suggest": {
         "jean85/pretty-package-versions": "Required to use PrettyVersions. (^1.2|^2.0)",
-        "nikic/php-parser": "Required to use PhpParser. (^4.0)"
+        "nikic/php-parser": "Required to use PhpParser. (^5.0)"
     },
     "autoload": {
         "psr-4": {

src/PhpParser.php

@@ -47,7 +47,7 @@ class PhpParser
     public function __construct()
     {
         $parserFactory = new ParserFactory();
-        $this->parser = $parserFactory->create(ParserFactory::ONLY_PHP7);
+        $this->parser = $parserFactory->createForNewestSupportedVersion();
     }
 
     public static function getInstance(): PhpParser
@@ -67,7 +67,7 @@ public function getNodesFromReflectionClass(ReflectionClass $reflectionClass): ?
         return $this->parser->parse($code);
     }
 
-    public function getNodeFromReflectionType(ReflectionType $reflection): Node\ComplexType|Node\Identifier|Node\Name
+    public function getNodeFromReflectionType(ReflectionType $reflection): Node
     {
         if ($reflection instanceof ReflectionUnionType) {
             $unionType = [];
@@ -96,6 +96,7 @@ public function getNodeFromReflectionParameter(ReflectionParameter $parameter):
         }
 
         if ($parameter->hasType()) {
+            /* @phpstan-ignore-next-line */
             $result->type = $this->getNodeFromReflectionType($parameter->getType());
         }
 
@@ -171,13 +172,17 @@ public function getAllMethodsFromStmts(array $stmts, bool $withTrait = false): a
                     foreach ($class->stmts as $stmt) {
                         if ($stmt instanceof Node\Stmt\TraitUse) {
                             foreach ($stmt->traits as $trait) {
-                                if (isset($uses[$trait->getFirst()])) {
-                                    $traitName = $uses[$trait->getFirst()] . substr($trait->toString(), strlen($trait->getFirst()));
+                                $traitString = $trait->toString();
+                                $traitParts = $trait->getParts();
+                                $firstPart = $trait->getFirst();
+
+                                if (isset($uses[$firstPart])) {
+                                    $traitName = $uses[$firstPart] . substr($traitString, strlen($firstPart));
                                 } else {
-                                    if (count($trait->getParts()) == 1) {
-                                        $traitName = $namespace->name->toString() . '\\' . $trait->toString();
+                                    if (count($traitParts) == 1) {
+                                        $traitName = $namespace->name->toString() . '\\' . $traitString;
                                     } else {
-                                        $traitName = $trait->toString();
+                                        $traitName = $traitString;
                                     }
                                 }
                                 $traitNodes = $this->parser->parse(file_get_contents((new ReflectionClass($traitName))->getFileName()));
@@ -192,6 +197,23 @@ public function getAllMethodsFromStmts(array $stmts, bool $withTrait = false): a
         return $methods;
     }
 
+    /**
+     * Convert type name to appropriate Node type.
+     */
+    public function getNodeByTypeString(string $typeName, bool $nullable = false): Node
+    {
+        if (in_array($typeName, PhpParser::TYPES)) {
+            $type = new Node\Identifier($typeName);
+        } else {
+            $type = new Node\Name('\\' . $typeName);
+        }
+
+        if ($nullable && $typeName !== 'mixed') {
+            return new Node\NullableType($type);
+        }
+        return $type;
+    }
+
     private function getExprFromObject(object $value)
     {
         $ref = new ReflectionClass($value);
@@ -207,29 +229,12 @@ private function getExprFromObject(object $value)
         );
     }
 
-    private function getTypeWithNullableOrNot(ReflectionType $reflection): Node\ComplexType|Node\Identifier|Node\Name
+    private function getTypeWithNullableOrNot(ReflectionType $reflection): Node
     {
         if (! $reflection instanceof ReflectionNamedType) {
             throw new ReflectionException('ReflectionType must be ReflectionNamedType.');
         }
 
-        $name = $reflection->getName();
-
-        if ($reflection->allowsNull() && $name !== 'mixed') {
-            return new Node\NullableType($this->getTypeFromString($name));
-        }
-
-        if (! in_array($name, static::TYPES)) {
-            return new Node\Name('\\' . $name);
-        }
-        return new Node\Identifier($name);
-    }
-
-    private function getTypeFromString(string $name)
-    {
-        if (! in_array($name, static::TYPES)) {
-            return '\\' . $name;
-        }
-        return $name;
+        return $this->getNodeByTypeString($reflection->getName(), $reflection->allowsNull());
     }
 }

tests/PhpParserTest.php

@@ -34,7 +34,7 @@ class PhpParserTest extends TestCase
     public function testGetAstFromReflectionParameter()
     {
         $parserFactory = new ParserFactory();
-        $parser7 = $parserFactory->create(ParserFactory::ONLY_PHP7);
+        $parser7 = $parserFactory->createForNewestSupportedVersion();
 
         $stmts = $parser7->parse(file_get_contents(__DIR__ . '/Stub/Bar.php'));
         /** @var ClassMethod $classMethod */
@@ -47,7 +47,7 @@ public function testGetAstFromReflectionParameter()
         $parser = new PhpParser();
         $this->assertNodeParam($name, $parser->getNodeFromReflectionParameter($parameters[0]));
         $this->assertNodeParam($foo, $foo2 = $parser->getNodeFromReflectionParameter($parameters[1]));
-        $this->assertSame(['', 'HyperfTest', 'CodeParser', 'Stub', 'Foo'], $foo2->type->parts);
+        $this->assertSame(['', 'HyperfTest', 'CodeParser', 'Stub', 'Foo'], $foo2->type->getParts());
         $this->assertNodeParam($extra, $parser->getNodeFromReflectionParameter($parameters[2]));
 
         $stmts = $parser7->parse(file_get_contents(__DIR__ . '/Stub/UnionTypeFoo.php'));