From 3247d94490b19b8183b93eb20bc42be017ac9e54 Mon Sep 17 00:00:00 2001 From: Abdul Malik Ikhsan Date: Wed, 21 Jan 2026 22:47:19 +0700 Subject: [PATCH] Rectify --- .../NodeManipulator/NullToStrictStringIntConverter.php | 2 +- .../NodeAnalyzer/StrictTypeSafetyChecker.php | 6 ++++-- .../PHPStan/Scope/PHPStanNodeScopeResolver.php | 2 +- .../config/configured_rule.php | 2 ++ 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/rules/Php81/NodeManipulator/NullToStrictStringIntConverter.php b/rules/Php81/NodeManipulator/NullToStrictStringIntConverter.php index 28ed5a20ec0..43dc0f1f1b1 100644 --- a/rules/Php81/NodeManipulator/NullToStrictStringIntConverter.php +++ b/rules/Php81/NodeManipulator/NullToStrictStringIntConverter.php @@ -4,7 +4,6 @@ namespace Rector\Php81\NodeManipulator; -use PHPStan\Analyser\Fiber\FiberScope; use PhpParser\Node\Arg; use PhpParser\Node\Expr; use PhpParser\Node\Expr\Cast\Int_ as CastInt_; @@ -16,6 +15,7 @@ use PhpParser\Node\Scalar\Int_; use PhpParser\Node\Scalar\InterpolatedString; use PhpParser\Node\Scalar\String_; +use PHPStan\Analyser\Fiber\FiberScope; use PHPStan\Analyser\Scope; use PHPStan\Reflection\Native\ExtendedNativeParameterReflection; use PHPStan\Reflection\ParametersAcceptor; diff --git a/rules/TypeDeclaration/NodeAnalyzer/StrictTypeSafetyChecker.php b/rules/TypeDeclaration/NodeAnalyzer/StrictTypeSafetyChecker.php index 195adf0156c..8e567e196d3 100644 --- a/rules/TypeDeclaration/NodeAnalyzer/StrictTypeSafetyChecker.php +++ b/rules/TypeDeclaration/NodeAnalyzer/StrictTypeSafetyChecker.php @@ -15,6 +15,7 @@ use PHPStan\Reflection\MethodReflection; use PHPStan\Reflection\ParameterReflection; use PHPStan\Reflection\ParametersAcceptorSelector; +use PHPStan\Reflection\Php\PhpPropertyReflection; use PHPStan\Type\MixedType; use PHPStan\Type\NeverType; use PHPStan\Type\Type; @@ -154,7 +155,8 @@ private function areFunctionReturnsTypeSafe(FunctionLike $functionLike): bool if ( $declaredReturnType instanceof MixedType || $declaredReturnType instanceof NeverType - || $declaredReturnType->isVoid()->yes() + || $declaredReturnType->isVoid() + ->yes() ) { return true; } @@ -183,7 +185,7 @@ private function isPropertyAssignSafe(Assign $assign): bool } $propertyReflection = $this->reflectionResolver->resolvePropertyReflectionFromPropertyFetch($assign->var); - if ($propertyReflection === null) { + if (! $propertyReflection instanceof PhpPropertyReflection) { return false; } diff --git a/src/NodeTypeResolver/PHPStan/Scope/PHPStanNodeScopeResolver.php b/src/NodeTypeResolver/PHPStan/Scope/PHPStanNodeScopeResolver.php index 0db5d6a0bb8..7b9f787f462 100644 --- a/src/NodeTypeResolver/PHPStan/Scope/PHPStanNodeScopeResolver.php +++ b/src/NodeTypeResolver/PHPStan/Scope/PHPStanNodeScopeResolver.php @@ -4,7 +4,6 @@ namespace Rector\NodeTypeResolver\PHPStan\Scope; -use PHPStan\Analyser\Fiber\FiberScope; use Error; use PhpParser\Node; use PhpParser\Node\Arg; @@ -86,6 +85,7 @@ use PhpParser\Node\Stmt\While_; use PhpParser\Node\UnionType; use PhpParser\NodeTraverser; +use PHPStan\Analyser\Fiber\FiberScope; use PHPStan\Analyser\MutatingScope; use PHPStan\Analyser\NodeScopeResolver; use PHPStan\Analyser\ScopeContext; diff --git a/tests/Issues/IssuePropertyPromoRemoveDelegatingParent/config/configured_rule.php b/tests/Issues/IssuePropertyPromoRemoveDelegatingParent/config/configured_rule.php index 374e00d4f13..454a89aec1a 100644 --- a/tests/Issues/IssuePropertyPromoRemoveDelegatingParent/config/configured_rule.php +++ b/tests/Issues/IssuePropertyPromoRemoveDelegatingParent/config/configured_rule.php @@ -1,5 +1,7 @@