Skip to content

Commit

Permalink
[NodeTypeResolver] Remove parent lookup on TypeComparator (#4179)
Browse files Browse the repository at this point in the history
* [NodeTypeResolver] Remove parent lookup on TypeComparator

* cs fix
  • Loading branch information
samsonasik committed Jun 11, 2023
1 parent e6bdb85 commit 3d31e31
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
12 changes: 6 additions & 6 deletions packages/NodeTypeResolver/TypeComparator/TypeComparator.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
namespace Rector\NodeTypeResolver\TypeComparator;

use PhpParser\Node;
use PhpParser\Node\Stmt\Class_;
use PHPStan\PhpDocParser\Ast\PhpDoc\ParamTagValueNode;
use PHPStan\PhpDocParser\Ast\Type\TypeNode;
use PHPStan\Reflection\ClassReflection;
use PHPStan\Type\ArrayType;
use PHPStan\Type\BooleanType;
use PHPStan\Type\Constant\ConstantArrayType;
Expand All @@ -23,7 +23,7 @@
use PHPStan\Type\TypeTraverser;
use PHPStan\Type\UnionType;
use Rector\BetterPhpDocParser\ValueObject\PhpDocAttributeKey;
use Rector\Core\PhpParser\Node\BetterNodeFinder;
use Rector\Core\Reflection\ReflectionResolver;
use Rector\NodeTypeResolver\PHPStan\Type\TypeFactory;
use Rector\NodeTypeResolver\PHPStan\TypeHasher;
use Rector\StaticTypeMapper\StaticTypeMapper;
Expand All @@ -39,7 +39,7 @@ public function __construct(
private readonly ArrayTypeComparator $arrayTypeComparator,
private readonly ScalarTypeComparator $scalarTypeComparator,
private readonly TypeFactory $typeFactory,
private readonly BetterNodeFinder $betterNodeFinder
private readonly ReflectionResolver $reflectionResolver
) {
}

Expand Down Expand Up @@ -298,12 +298,12 @@ private function isThisTypeInFinalClass(Type $phpStanDocType, Type $phpParserNod
return true;
}

$class = $this->betterNodeFinder->findParentType($node, Class_::class);
$classReflection = $this->reflectionResolver->resolveClassReflection($node);

if (! $class instanceof Class_) {
if (! $classReflection instanceof ClassReflection || ! $classReflection->isClass()) {
return false;
}

return $class->isFinal();
return $classReflection->isFinalByKeyword();
}
}
2 changes: 1 addition & 1 deletion src/Kernel/RectorKernel.php
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ final class RectorKernel
/**
* @var string
*/
private const CACHE_KEY = 'v93';
private const CACHE_KEY = 'v94';

private ContainerInterface|null $container = null;

Expand Down

0 comments on commit 3d31e31

Please sign in to comment.