[Dep] Update to php-parser ^4.13.2 (#1359)

* bump to php-parser 4.13.2

* uverify namespacedName property is a Name

* phpstan

* AnonymousClass type fix

* [ci-review] Rector Rectify

* phpstan

* fix

* clean up

* final touch: verify namespacedName

* final touch: clean up

* final touch: regex phpstann single quote namespacedName in message

* updated to compare exactly with Name class

* update to check instanceof Class_

* added back property_exists

* fix

* cs fix

* check in in_array of class node

* clean up

* [ci-review] Rector Rectify

* phpstan

* phpstan

* remove unneded ClassLike check

* [ci-review] Rector Rectify

* [ci-review] Rector Rectify

* [ci-review] Rector Rectify

Co-authored-by: Tomas Votruba <tomas.vot@gmail.com>
Co-authored-by: GitHub Action <action@github.com>

Author: 3 people

composer.json

@@ -20,7 +20,7 @@
         "myclabs/php-enum": "^1.8",
         "nette/neon": "^3.3.2",
         "nette/utils": "^3.2",
-        "nikic/php-parser": "4.13.1",
+        "nikic/php-parser": "^4.13.2",
         "phpstan/phpdoc-parser": "^1.2",
         "phpstan/phpstan": "^1.2",
         "phpstan/phpstan-phpunit": "^1.0",

packages/NodeNameResolver/NodeNameResolver/ClassNameResolver.php

@@ -5,6 +5,7 @@
 namespace Rector\NodeNameResolver\NodeNameResolver;
 
 use PhpParser\Node;
+use PhpParser\Node\Name;
 use PhpParser\Node\Stmt\ClassLike;
 use Rector\NodeNameResolver\Contract\NodeNameResolverInterface;
 use Rector\NodeNameResolver\NodeNameResolver;
@@ -33,7 +34,7 @@ public function getNode(): string
      */
     public function resolve(Node $node): ?string
     {
-        if (property_exists($node, 'namespacedName')) {
+        if (property_exists($node, 'namespacedName') && $node->namespacedName instanceof Name) {
             return $node->namespacedName->toString();
         }
 

packages/NodeTypeResolver/NodeTypeResolver/ClassAndInterfaceTypeResolver.php

@@ -12,6 +12,7 @@
 use PHPStan\Type\MixedType;
 use PHPStan\Type\ObjectType;
 use PHPStan\Type\Type;
+use Rector\NodeNameResolver\NodeNameResolver;
 use Rector\NodeTypeResolver\Contract\NodeTypeResolverInterface;
 use Rector\NodeTypeResolver\Node\AttributeKey;
 
@@ -23,6 +24,11 @@
  */
 final class ClassAndInterfaceTypeResolver implements NodeTypeResolverInterface
 {
+    public function __construct(
+        private NodeNameResolver $nodeNameResolver
+    ) {
+    }
+
     /**
      * @return array<class-string<Node>>
      */
@@ -45,7 +51,7 @@ public function resolve(Node $node): Type
 
         $classReflection = $scope->getClassReflection();
         if (! $classReflection instanceof ClassReflection) {
-            return new MixedType();
+            return new ObjectType((string) $this->nodeNameResolver->getName($node));
         }
 
         return new ObjectType($classReflection->getName(), null, $classReflection);

phpstan.neon

@@ -594,3 +594,11 @@ parameters:
         -
             message: '#Class has a static method must so must contains "Static" in its name#'
             path: src/Validation/RectorAssert.php
+
+        -
+            message: '#Call to function property_exists\(\) with PhpParser\\Node\\Stmt\\ClassLike and .{1}namespacedName.{1} will always evaluate to true#'
+            path: packages/NodeNameResolver/NodeNameResolver/ClassNameResolver.php
+
+        -
+            message: '#Instanceof between PhpParser\\Node\\Name and PhpParser\\Node\\Name will always evaluate to true#'
+            path: packages/NodeNameResolver/NodeNameResolver/ClassNameResolver.php

rules/CodingStyle/ClassNameImport/UsedImportsResolver.php

@@ -53,7 +53,7 @@ public function resolveForStmts(array $stmts): array
 
         // add class itself
         // is not anonymous class
-        if ($class !== null && property_exists($class, 'namespacedName')) {
+        if ($class instanceof Class_) {
             $className = (string) $this->nodeNameResolver->getName($class);
             $usedImports[] = new FullyQualifiedObjectType($className);
         }

rules/Php74/TypeAnalyzer/ObjectTypeAnalyzer.php

@@ -18,14 +18,20 @@ public function isSpecial(Type $varType): bool
             return true;
         }
 
-        $types = ! $varType instanceof UnionType
-            ? [$varType]
-            : $varType->getTypes();
+        $types = $varType instanceof UnionType
+            ? $varType->getTypes()
+            : [$varType];
 
         foreach ($types as $type) {
-            if ($type instanceof FullyQualifiedObjectType && $type->getClassName() === 'Prophecy\Prophecy\ObjectProphecy') {
-                return true;
+            if (! $type instanceof FullyQualifiedObjectType) {
+                continue;
             }
+
+            if ($type->getClassName() !== 'Prophecy\Prophecy\ObjectProphecy') {
+                continue;
+            }
+
+            return true;
         }
 
         return false;

src/Reflection/ReflectionResolver.php

@@ -22,6 +22,7 @@
 use PHPStan\Reflection\ReflectionProvider;
 use PHPStan\Type\TypeUtils;
 use PHPStan\Type\TypeWithClassName;
+use Rector\Core\NodeAnalyzer\ClassAnalyzer;
 use Rector\Core\PhpParser\Node\BetterNodeFinder;
 use Rector\Core\PHPStan\Reflection\TypeToCallReflectionResolver\TypeToCallReflectionResolverRegistry;
 use Rector\Core\ValueObject\MethodName;
@@ -36,13 +37,14 @@ public function __construct(
         private BetterNodeFinder $betterNodeFinder,
         private NodeTypeResolver $nodeTypeResolver,
         private NodeNameResolver $nodeNameResolver,
-        private TypeToCallReflectionResolverRegistry $typeToCallReflectionResolverRegistry
+        private TypeToCallReflectionResolverRegistry $typeToCallReflectionResolverRegistry,
+        private ClassAnalyzer $classAnalyzer
     ) {
     }
 
     public function resolveClassAndAnonymousClass(ClassLike $classLike): ClassReflection|null
     {
-        if ($classLike instanceof Class_ && $this->isAnonymousClass($classLike)) {
+        if ($classLike instanceof Class_ && $this->classAnalyzer->isAnonymousClass($classLike)) {
             return $this->reflectionProvider->getAnonymousClassReflection(
                 $classLike,
                 $classLike->getAttribute(AttributeKey::SCOPE)
@@ -219,9 +221,4 @@ private function resolveFunctionReflectionFromFuncCall(
         $funcCallNameType = $scope->getType($funcCall->name);
         return $this->typeToCallReflectionResolverRegistry->resolve($funcCallNameType, $scope);
     }
-
-    private function isAnonymousClass(Class_ $class): bool
-    {
-        return ! property_exists($class, 'namespacedName');
-    }
 }