Use instanceof check on ClassReflection resolve (#4547)

rectorphp · Jul 20, 2023 · f77e355 · f77e355
1 parent 141a94a
commit f77e355
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 8 deletions.
diff --git a/packages/NodeTypeResolver/PHPStan/Scope/PHPStanNodeScopeResolver.php b/packages/NodeTypeResolver/PHPStan/Scope/PHPStanNodeScopeResolver.php
@@ -122,10 +122,7 @@ public function processNodes(
         $scope = $formerMutatingScope ?? $this->scopeFactory->createFromFile($filePath);
 
         // skip chain method calls, performance issue: https://github.com/phpstan/phpstan/issues/254
-        $nodeCallback = function (Node $node, MutatingScope $mutatingScope) use (
-            &$nodeCallback,
-            $filePath
-        ): void {
+        $nodeCallback = function (Node $node, MutatingScope $mutatingScope) use (&$nodeCallback, $filePath): void {
             if ($node instanceof FileWithoutNamespace) {
                 $this->nodeScopeResolver->processNodes($node->stmts, $mutatingScope, $nodeCallback);
 

diff --git a/rules/Php80/Rector/Class_/ClassPropertyAssignToConstructorPromotionRector.php b/rules/Php80/Rector/Class_/ClassPropertyAssignToConstructorPromotionRector.php
@@ -16,6 +16,7 @@
 use PhpParser\Node\UnionType;
 use PHPStan\PhpDocParser\Ast\PhpDoc\ParamTagValueNode;
 use PHPStan\PhpDocParser\Ast\PhpDoc\VarTagValueNode;
+use PHPStan\Reflection\ClassReflection;
 use PHPStan\Type\MixedType;
 use PHPStan\Type\TypeCombinator;
 use Rector\BetterPhpDocParser\PhpDocManipulator\PhpDocTypeChanger;
@@ -149,11 +150,11 @@ public function refactor(Node $node): ?Node
                 continue;
             }
 
-            if ($classReflection === null) {
+            if (! $classReflection instanceof ClassReflection) {
                 $classReflection = $this->reflectionResolver->resolveClassReflection($node);
             }
 
-            if ($classReflection === null) {
+            if (! $classReflection instanceof ClassReflection) {
                 return null;
             }
 

diff --git a/rules/TypeDeclaration/Rector/Class_/PropertyTypeFromStrictSetterGetterRector.php b/rules/TypeDeclaration/Rector/Class_/PropertyTypeFromStrictSetterGetterRector.php
@@ -10,6 +10,7 @@
 use PhpParser\Node\Name;
 use PhpParser\Node\Stmt\Class_;
 use PhpParser\Node\Stmt\Property;
+use PHPStan\Reflection\ClassReflection;
 use PHPStan\Type\Type;
 use PHPStan\Type\TypeCombinator;
 use PHPStan\Type\UnionType;
@@ -113,11 +114,11 @@ public function refactor(Node $node): ?Node
                 continue;
             }
 
-            if ($classReflection === null) {
+            if (! $classReflection instanceof ClassReflection) {
                 $classReflection = $this->reflectionResolver->resolveClassReflection($node);
             }
 
-            if ($classReflection === null) {
+            if (! $classReflection instanceof ClassReflection) {
                 return null;
             }