[phpstan] prefer isName() from abstract class over protected service (#6875)

TomasVotruba · actions-user · web-flow · commit 6e185e87230f · 2025-05-02T21:46:59.000+02:00
* [phpstan] prefer isName() from abstract class over protected service

* [ci-review] Rector Rectify

---------

Co-authored-by: GitHub Action &lt;actions@github.com&gt;
diff --git a/phpstan.neon b/phpstan.neon
@@ -2,6 +2,9 @@ includes:
     - vendor/symplify/phpstan-rules/config/symplify-rules.neon
     - vendor/symplify/phpstan-rules/config/rector-rules.neon
 
+rules:
+    - Rector\Utils\PHPStan\Rule\PreferDirectIsNameRule
+
 parameters:
     level: 8
 
@@ -328,3 +331,7 @@ parameters:
 
         - identifier: symplify.noConstructorOverride
           path: src/StaticTypeMapper/ValueObject/Type/SimpleStaticType.php
+
+        -
+            identifier: symplify.seeAnnotationToTest
+            path: utils/PHPStan/Rule/PreferDirectIsNameRule.php
diff --git a/rules/CodeQuality/Rector/ClassConstFetch/ConvertStaticPrivateConstantToSelfRector.php b/rules/CodeQuality/Rector/ClassConstFetch/ConvertStaticPrivateConstantToSelfRector.php
@@ -114,7 +114,7 @@ private function isPrivateConstant(ClassConstFetch $classConstFetch, Class_ $cla
         }
 
         foreach ($class->getConstants() as $classConst) {
-            if (! $this->nodeNameResolver->isName($classConst, $constantName)) {
+            if (! $this->isName($classConst, $constantName)) {
                 continue;
             }
 
diff --git a/rules/CodeQuality/Rector/Class_/CompleteDynamicPropertiesRector.php b/rules/CodeQuality/Rector/Class_/CompleteDynamicPropertiesRector.php
@@ -130,7 +130,7 @@ private function shouldSkipClass(Class_ $class): bool
             return true;
         }
 
-        $className = (string) $this->nodeNameResolver->getName($class);
+        $className = (string) $this->getName($class);
         if (! $this->reflectionProvider->hasClass($className)) {
             return true;
         }
diff --git a/rules/CodeQuality/Rector/Class_/InlineConstructorDefaultToPropertyRector.php b/rules/CodeQuality/Rector/Class_/InlineConstructorDefaultToPropertyRector.php
@@ -137,11 +137,11 @@ private function matchAssignedLocalPropertyName(Assign $assign): ?string
         }
 
         $propertyFetch = $assign->var;
-        if (! $this->nodeNameResolver->isName($propertyFetch->var, 'this')) {
+        if (! $this->isName($propertyFetch->var, 'this')) {
             return null;
         }
 
-        $propertyName = $this->nodeNameResolver->getName($propertyFetch->name);
+        $propertyName = $this->getName($propertyFetch->name);
         if (! is_string($propertyName)) {
             return null;
         }
diff --git a/rules/CodeQuality/Rector/Identical/SimplifyArraySearchRector.php b/rules/CodeQuality/Rector/Identical/SimplifyArraySearchRector.php
@@ -62,7 +62,7 @@ function (Node $node): bool {
                     return false;
                 }
 
-                return $this->nodeNameResolver->isName($node, 'array_search');
+                return $this->isName($node, 'array_search');
             },
             fn (Node $node): bool => $node instanceof Expr && $this->valueResolver->isFalse($node)
         );
diff --git a/rules/CodeQuality/Rector/If_/ExplicitBoolCompareRector.php b/rules/CodeQuality/Rector/If_/ExplicitBoolCompareRector.php
@@ -136,7 +136,7 @@ public function refactor(Node $node): null|array|Node
 
     private function resolveNewConditionNode(Expr $expr, bool $isNegated): ?BinaryOp
     {
-        if ($expr instanceof FuncCall && $this->nodeNameResolver->isName($expr, 'count')) {
+        if ($expr instanceof FuncCall && $this->isName($expr, 'count')) {
             return $this->resolveCount($isNegated, $expr);
         }
 
diff --git a/rules/CodingStyle/Rector/Catch_/CatchExceptionNameMatchingTypeRector.php b/rules/CodingStyle/Rector/Catch_/CatchExceptionNameMatchingTypeRector.php
@@ -200,7 +200,7 @@ private function renameVariableInStmts(
                 return null;
             }
 
-            if (! $this->nodeNameResolver->isName($node, $oldVariableName)) {
+            if (! $this->isName($node, $oldVariableName)) {
                 return null;
             }
 
@@ -239,7 +239,7 @@ private function replaceNextUsageVariable(
                 return null;
             }
 
-            if (! $this->nodeNameResolver->isName($node, $oldVariableName)) {
+            if (! $this->isName($node, $oldVariableName)) {
                 return null;
             }
 
diff --git a/rules/CodingStyle/Rector/ClassMethod/NewlineBeforeNewAssignSetRector.php b/rules/CodingStyle/Rector/ClassMethod/NewlineBeforeNewAssignSetRector.php
@@ -177,7 +177,7 @@ private function shouldSkipLeftVariable(Assign | MethodCall $node): bool
         }
 
         // local method call
-        return $this->nodeNameResolver->isName($node->var, 'this');
+        return $this->isName($node->var, 'this');
     }
 
     private function isNewVariableThanBefore(?string $currentStmtVariableName): bool
diff --git a/rules/CodingStyle/Rector/FuncCall/ArraySpreadInsteadOfArrayMergeRector.php b/rules/CodingStyle/Rector/FuncCall/ArraySpreadInsteadOfArrayMergeRector.php
@@ -198,7 +198,7 @@ private function isIteratorToArrayFuncCall(Expr $expr): bool
             return false;
         }
 
-        if (! $this->nodeNameResolver->isName($expr, 'iterator_to_array')) {
+        if (! $this->isName($expr, 'iterator_to_array')) {
             return false;
         }
 
diff --git a/rules/DeadCode/Rector/ClassMethod/RemoveEmptyClassMethodRector.php b/rules/DeadCode/Rector/ClassMethod/RemoveEmptyClassMethodRector.php
@@ -164,12 +164,12 @@ private function shouldSkipClassMethod(Class_ $class, ClassMethod $classMethod):
             return true;
         }
 
-        if ($this->nodeNameResolver->isName($classMethod, MethodName::CONSTRUCT)) {
+        if ($this->isName($classMethod, MethodName::CONSTRUCT)) {
             // has parent class?
             return $class->extends instanceof FullyQualified;
         }
 
-        return $this->nodeNameResolver->isName($classMethod, MethodName::INVOKE);
+        return $this->isName($classMethod, MethodName::INVOKE);
     }
 
     private function hasDeprecatedAnnotation(ClassMethod $classMethod): bool
diff --git a/rules/DeadCode/Rector/ClassMethod/RemoveUnusedPrivateMethodParameterRector.php b/rules/DeadCode/Rector/ClassMethod/RemoveUnusedPrivateMethodParameterRector.php
@@ -126,7 +126,7 @@ private function removeCallerArgs(Class_ $class, ClassMethod $classMethod, array
             return;
         }
 
-        $methodName = $this->nodeNameResolver->getName($classMethod);
+        $methodName = $this->getName($classMethod);
         $keysArg = array_keys($unusedParameters);
 
         foreach ($classMethods as $classMethod) {
@@ -180,11 +180,11 @@ private function resolveCallers(ClassMethod $classMethod, string $methodName): a
                 return false;
             }
 
-            if (! $this->nodeNameResolver->isName($subNode->var, 'this')) {
+            if (! $this->isName($subNode->var, 'this')) {
                 return false;
             }
 
-            return $this->nodeNameResolver->isName($subNode->name, $methodName);
+            return $this->isName($subNode->name, $methodName);
         });
     }
 
diff --git a/rules/DeadCode/Rector/ClassMethod/RemoveUnusedPrivateMethodRector.php b/rules/DeadCode/Rector/ClassMethod/RemoveUnusedPrivateMethodRector.php
@@ -237,7 +237,7 @@ function (Node $subNode): bool {
                         return false;
                     }
 
-                    if (! $this->nodeNameResolver->isName($subNode->var, 'this')) {
+                    if (! $this->isName($subNode->var, 'this')) {
                         return false;
                     }
 
diff --git a/rules/DeadCode/Rector/If_/RemoveTypedPropertyDeadInstanceOfRector.php b/rules/DeadCode/Rector/If_/RemoveTypedPropertyDeadInstanceOfRector.php
@@ -206,11 +206,11 @@ private function isSkippedPropertyFetch(Class_ $class, PropertyFetch|StaticPrope
     private function isInPropertyPromotedParams(Class_ $class, PropertyFetch|StaticPropertyFetch $propertyFetch): bool
     {
         /** @var string $propertyName */
-        $propertyName = $this->nodeNameResolver->getName($propertyFetch);
+        $propertyName = $this->getName($propertyFetch);
         $params = $this->promotedPropertyResolver->resolveFromClass($class);
 
         foreach ($params as $param) {
-            if ($this->nodeNameResolver->isName($param, $propertyName)) {
+            if ($this->isName($param, $propertyName)) {
                 return true;
             }
         }
diff --git a/rules/DeadCode/Rector/If_/RemoveUnusedNonEmptyArrayBeforeForeachRector.php b/rules/DeadCode/Rector/If_/RemoveUnusedNonEmptyArrayBeforeForeachRector.php
@@ -229,7 +229,7 @@ private function shouldSkipForeachExpr(Expr $foreachExpr, Scope $scope): bool
         }
 
         if ($foreachExpr instanceof Variable) {
-            $variableName = $this->nodeNameResolver->getName($foreachExpr);
+            $variableName = $this->getName($foreachExpr);
             if (is_string($variableName) && $this->reservedKeywordAnalyzer->isNativeVariable($variableName)) {
                 return true;
             }
diff --git a/rules/Php70/Rector/MethodCall/ThisCallOnStaticMethodToStaticCallRector.php b/rules/Php70/Rector/MethodCall/ThisCallOnStaticMethodToStaticCallRector.php
@@ -134,7 +134,7 @@ private function processThisToStatic(Class_ $class, ClassReflection $classReflec
                 return null;
             }
 
-            if (! $this->nodeNameResolver->isName($subNode->var, 'this')) {
+            if (! $this->isName($subNode->var, 'this')) {
                 return null;
             }
 
diff --git a/rules/Php71/Rector/Assign/AssignArrayToStringRector.php b/rules/Php71/Rector/Assign/AssignArrayToStringRector.php
@@ -177,7 +177,7 @@ private function findSameNamedVariableAssigns(
             return [];
         }
 
-        $variableName = $this->nodeNameResolver->getName($variable);
+        $variableName = $this->getName($variable);
         if ($variableName === null) {
             return [];
         }
diff --git a/rules/Php72/Rector/Assign/ReplaceEachAssignmentWithKeyCurrentRector.php b/rules/Php72/Rector/Assign/ReplaceEachAssignmentWithKeyCurrentRector.php
@@ -106,7 +106,7 @@ private function shouldSkip(Assign $assign): bool
             return true;
         }
 
-        if (! $this->nodeNameResolver->isName($assign->expr, 'each')) {
+        if (! $this->isName($assign->expr, 'each')) {
             return true;
         }
 
diff --git a/rules/Php80/Rector/ClassMethod/AddParamBasedOnParentClassMethodRector.php b/rules/Php80/Rector/ClassMethod/AddParamBasedOnParentClassMethodRector.php
@@ -97,7 +97,7 @@ public function getNodeTypes(): array
      */
     public function refactor(Node $node): ?Node
     {
-        if ($this->nodeNameResolver->isName($node, MethodName::CONSTRUCT)) {
+        if ($this->isName($node, MethodName::CONSTRUCT)) {
             return null;
         }
 
@@ -195,7 +195,7 @@ private function processReplaceClassMethodParams(
 
         foreach ($parentClassMethodParams as $key => $parentClassMethodParam) {
             if (isset($currentClassMethodParams[$key])) {
-                $currentParamName = $this->nodeNameResolver->getName($currentClassMethodParams[$key]);
+                $currentParamName = $this->getName($currentClassMethodParams[$key]);
                 $collectParamNamesNextKey = $this->collectParamNamesNextKey($parentClassMethod, $key);
 
                 if (in_array($currentParamName, $collectParamNamesNextKey, true)) {
@@ -228,7 +228,7 @@ function (Node $subNode) use ($parentClassMethodParam): bool {
                 $paramDefault = $this->nodeFactory->createReprintedNode($paramDefault);
             }
 
-            $paramName = $this->nodeNameResolver->getName($parentClassMethodParam);
+            $paramName = $this->getName($parentClassMethodParam);
             $paramType = $this->resolveParamType($parentClassMethodParam);
 
             $node->params[$key] = new Param(
@@ -268,7 +268,7 @@ private function collectParamNamesNextKey(ClassMethod $classMethod, int $key): a
 
         foreach ($classMethod->params as $paramKey => $param) {
             if ($paramKey > $key) {
-                $paramNames[] = $this->nodeNameResolver->getName($param);
+                $paramNames[] = $this->getName($param);
             }
         }
 
diff --git a/rules/Php80/Rector/FuncCall/ClassOnObjectRector.php b/rules/Php80/Rector/FuncCall/ClassOnObjectRector.php
@@ -62,7 +62,7 @@ public function getNodeTypes(): array
      */
     public function refactor(Node $node): ?Node
     {
-        if (! $this->nodeNameResolver->isName($node, 'get_class')) {
+        if (! $this->isName($node, 'get_class')) {
             return null;
         }
 
diff --git a/rules/Php80/Rector/Identical/StrEndsWithRector.php b/rules/Php80/Rector/Identical/StrEndsWithRector.php
@@ -218,7 +218,7 @@ private function isUnaryMinusStrlenFuncCallArgValue(Expr $substrOffset, Expr $ne
 
         $funcCall = $substrOffset->expr;
 
-        if (! $this->nodeNameResolver->isName($funcCall, 'strlen')) {
+        if (! $this->isName($funcCall, 'strlen')) {
             return false;
         }
 
diff --git a/rules/Php80/Rector/Ternary/GetDebugTypeRector.php b/rules/Php80/Rector/Ternary/GetDebugTypeRector.php
@@ -109,7 +109,7 @@ private function shouldSkip(Ternary $ternary): bool
             return true;
         }
 
-        if (! $this->nodeNameResolver->isName($ternary->cond, 'is_object')) {
+        if (! $this->isName($ternary->cond, 'is_object')) {
             return true;
         }
 
@@ -121,7 +121,7 @@ private function shouldSkip(Ternary $ternary): bool
             return $this->shouldSkipClassConstFetch($ternary->if);
         }
 
-        if (! $this->nodeNameResolver->isName($ternary->if, 'get_class')) {
+        if (! $this->isName($ternary->if, 'get_class')) {
             return true;
         }
 
@@ -133,7 +133,7 @@ private function shouldSkip(Ternary $ternary): bool
             return true;
         }
 
-        return ! $this->nodeNameResolver->isName($ternary->else, 'gettype');
+        return ! $this->isName($ternary->else, 'gettype');
     }
 
     private function shouldSkipClassConstFetch(ClassConstFetch $classConstFetch): bool
diff --git a/rules/Php81/Rector/ClassMethod/NewInInitializerRector.php b/rules/Php81/Rector/ClassMethod/NewInInitializerRector.php
@@ -161,7 +161,7 @@ private function resolveParams(ClassMethod $classMethod): array
     private function isOverrideAbstractMethod(ClassMethod $classMethod): bool
     {
         $classReflection = $this->reflectionResolver->resolveClassReflection($classMethod);
-        $methodName = $this->nodeNameResolver->getName($classMethod);
+        $methodName = $this->getName($classMethod);
 
         return $classReflection instanceof ClassReflection && $this->classChildAnalyzer->hasAbstractParentClassMethod(
             $classReflection,
diff --git a/rules/Php81/Rector/FuncCall/NullToStrictStringFuncCallArgRector.php b/rules/Php81/Rector/FuncCall/NullToStrictStringFuncCallArgRector.php
@@ -156,7 +156,7 @@ public function provideMinPhpVersion(): int
      */
     private function resolveNamedPositions(FuncCall $funcCall, array $args): array
     {
-        $functionName = $this->nodeNameResolver->getName($funcCall);
+        $functionName = $this->getName($funcCall);
         $argNames = NameNullToStrictNullFunctionMap::FUNCTION_TO_PARAM_NAMES[$functionName];
         $positions = [];
 
diff --git a/rules/Privatization/Rector/MethodCall/PrivatizeLocalGetterToPropertyRector.php b/rules/Privatization/Rector/MethodCall/PrivatizeLocalGetterToPropertyRector.php
@@ -98,7 +98,7 @@ public function refactor(Node $node): ?Node
                 return null;
             }
 
-            if (! $this->nodeNameResolver->isName($node->var, 'this')) {
+            if (! $this->isName($node->var, 'this')) {
                 return null;
             }
 
diff --git a/rules/Renaming/Rector/FunctionLike/RenameFunctionLikeParamWithinCallLikeArgRector.php b/rules/Renaming/Rector/FunctionLike/RenameFunctionLikeParamWithinCallLikeArgRector.php
@@ -126,7 +126,7 @@ public function refactor(Node $node): ?Node
                 ($functionLike instanceof Closure || $functionLike instanceof ArrowFunction) &&
                 (
                     $this->breakingVariableRenameGuard->shouldSkipVariable(
-                        (string) $this->nodeNameResolver->getName($param->var),
+                        (string) $this->getName($param->var),
                         $renameFunctionLikeParamWithinCallLikeArg->getNewParamName(),
                         $functionLike,
                         $param->var
diff --git a/rules/Renaming/Rector/PropertyFetch/RenamePropertyRector.php b/rules/Renaming/Rector/PropertyFetch/RenamePropertyRector.php
@@ -82,7 +82,7 @@ public function configure(array $configuration): void
 
     private function renameProperty(ClassLike $classLike, RenameProperty $renameProperty): void
     {
-        $classLikeName = (string) $this->nodeNameResolver->getName($classLike);
+        $classLikeName = (string) $this->getName($classLike);
         $renamePropertyObjectType = $renameProperty->getObjectType();
         $className = $renamePropertyObjectType->getClassName();
 
diff --git a/rules/TypeDeclaration/Rector/ClassMethod/AddParamTypeBasedOnPHPUnitDataProviderRector.php b/rules/TypeDeclaration/Rector/ClassMethod/AddParamTypeBasedOnPHPUnitDataProviderRector.php
@@ -315,7 +315,7 @@ private function getPhpDataProviderAttributes(ClassMethod $classMethod): array
 
         foreach ($attrGroups as $attrGroup) {
             foreach ($attrGroup->attrs as $attribute) {
-                if (! $this->nodeNameResolver->isName($attribute->name, $attributeName)) {
+                if (! $this->isName($attribute->name, $attributeName)) {
                     continue;
                 }
 
diff --git a/rules/TypeDeclaration/Rector/ClassMethod/AddReturnTypeDeclarationBasedOnParentClassMethodRector.php b/rules/TypeDeclaration/Rector/ClassMethod/AddReturnTypeDeclarationBasedOnParentClassMethodRector.php
@@ -159,7 +159,7 @@ private function processClassMethodReturnType(
         Type $parentType
     ): ?ClassMethod {
         if ($parentType instanceof MixedType) {
-            $className = (string) $this->nodeNameResolver->getName($class);
+            $className = (string) $this->getName($class);
             $currentObjectType = new ObjectType($className);
             if (! $parentType->equals($currentObjectType) && $classMethod->returnType instanceof Node) {
                 return null;
diff --git a/rules/TypeDeclaration/Rector/ClassMethod/AddReturnTypeDeclarationRector.php b/rules/TypeDeclaration/Rector/ClassMethod/AddReturnTypeDeclarationRector.php
@@ -128,7 +128,7 @@ private function processClassMethodNodeWithTypehints(
         ObjectType $objectType
     ): void {
         if ($newType instanceof MixedType) {
-            $className = (string) $this->nodeNameResolver->getName($class);
+            $className = (string) $this->getName($class);
             $currentObjectType = new ObjectType($className);
 
             if (! $objectType->equals($currentObjectType) && $classMethod->returnType instanceof Node) {
diff --git a/rules/TypeDeclaration/Rector/ClassMethod/ReturnTypeFromSymfonySerializerRector.php b/rules/TypeDeclaration/Rector/ClassMethod/ReturnTypeFromSymfonySerializerRector.php
@@ -104,7 +104,7 @@ public function refactor(Node $node): ?Node
 
         /** @var MethodCall $returnExpr */
         $returnExpr = $node->stmts[0]->expr;
-        if (! $this->nodeNameResolver->isName($returnExpr->name, 'deserialize')) {
+        if (! $this->isName($returnExpr->name, 'deserialize')) {
             return null;
         }
 
diff --git a/rules/TypeDeclaration/Rector/FunctionLike/AddReturnTypeDeclarationFromYieldsRector.php b/rules/TypeDeclaration/Rector/FunctionLike/AddReturnTypeDeclarationFromYieldsRector.php
@@ -224,8 +224,8 @@ private function resolveClassName(Function_|ClassMethod|Closure $functionLike):
             return 'Iterator';
         }
 
-        if ($returnTypeNode instanceof Name && ! $this->nodeNameResolver->isName($returnTypeNode, 'Generator')) {
-            return $this->nodeNameResolver->getName($returnTypeNode);
+        if ($returnTypeNode instanceof Name && ! $this->isName($returnTypeNode, 'Generator')) {
+            return $this->getName($returnTypeNode);
         }
 
         return 'Generator';
diff --git a/rules/TypeDeclaration/Rector/Property/TypedPropertyFromStrictConstructorRector.php b/rules/TypeDeclaration/Rector/Property/TypedPropertyFromStrictConstructorRector.php
@@ -141,7 +141,7 @@ public function refactor(Node $node): ?Node
 
             $propertyProperty = $property->props[0];
 
-            $propertyName = $this->nodeNameResolver->getName($property);
+            $propertyName = $this->getName($property);
             if ($this->constructorAssignDetector->isPropertyAssigned($node, $propertyName)) {
                 $propertyProperty->default = null;
                 $hasChanged = true;
diff --git a/utils/PHPStan/Rule/PreferDirectIsNameRule.php b/utils/PHPStan/Rule/PreferDirectIsNameRule.php

Original file line number	Diff line number	Diff line change
`@@ -114,7 +114,7 @@ private function isPrivateConstant(ClassConstFetch $classConstFetch, Class_ $cla`
`114`	`114`	`}`
`115`	`115`
`116`	`116`	`foreach ($class->getConstants() as $classConst) {`
`117`		`- if (! $this->nodeNameResolver->isName($classConst, $constantName)) {`
	`117`	`+ if (! $this->isName($classConst, $constantName)) {`
`118`	`118`	`continue;`
`119`	`119`	`}`
`120`	`120`
Original file line number	Diff line number	Diff line change
`@@ -130,7 +130,7 @@ private function shouldSkipClass(Class_ $class): bool`
`130`	`130`	`return true;`
`131`	`131`	`}`
`132`	`132`
`133`		`- $className = (string) $this->nodeNameResolver->getName($class);`
	`133`	`+ $className = (string) $this->getName($class);`
`134`	`134`	`if (! $this->reflectionProvider->hasClass($className)) {`
`135`	`135`	`return true;`
`136`	`136`	`}`
Original file line number	Diff line number	Diff line change
`@@ -137,11 +137,11 @@ private function matchAssignedLocalPropertyName(Assign $assign): ?string`
`137`	`137`	`}`
`138`	`138`
`139`	`139`	`$propertyFetch = $assign->var;`
`140`		`- if (! $this->nodeNameResolver->isName($propertyFetch->var, 'this')) {`
	`140`	`+ if (! $this->isName($propertyFetch->var, 'this')) {`
`141`	`141`	`return null;`
`142`	`142`	`}`
`143`	`143`
`144`		`- $propertyName = $this->nodeNameResolver->getName($propertyFetch->name);`
	`144`	`+ $propertyName = $this->getName($propertyFetch->name);`
`145`	`145`	`if (! is_string($propertyName)) {`
`146`	`146`	`return null;`
`147`	`147`	`}`
Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ function (Node $node): bool {`
`62`	`62`	`return false;`
`63`	`63`	`}`
`64`	`64`
`65`		`- return $this->nodeNameResolver->isName($node, 'array_search');`
	`65`	`+ return $this->isName($node, 'array_search');`
`66`	`66`	`},`
`67`	`67`	`fn (Node $node): bool => $node instanceof Expr && $this->valueResolver->isFalse($node)`
`68`	`68`	`);`
Original file line number	Diff line number	Diff line change
`@@ -136,7 +136,7 @@ public function refactor(Node $node): null\|array\|Node`
`136`	`136`
`137`	`137`	`private function resolveNewConditionNode(Expr $expr, bool $isNegated): ?BinaryOp`
`138`	`138`	`{`
`139`		`- if ($expr instanceof FuncCall && $this->nodeNameResolver->isName($expr, 'count')) {`
	`139`	`+ if ($expr instanceof FuncCall && $this->isName($expr, 'count')) {`
`140`	`140`	`return $this->resolveCount($isNegated, $expr);`
`141`	`141`	`}`
`142`	`142`
Original file line number	Diff line number	Diff line change
`@@ -200,7 +200,7 @@ private function renameVariableInStmts(`
`200`	`200`	`return null;`
`201`	`201`	`}`
`202`	`202`
`203`		`- if (! $this->nodeNameResolver->isName($node, $oldVariableName)) {`
	`203`	`+ if (! $this->isName($node, $oldVariableName)) {`
`204`	`204`	`return null;`
`205`	`205`	`}`
`206`	`206`
`@@ -239,7 +239,7 @@ private function replaceNextUsageVariable(`
`239`	`239`	`return null;`
`240`	`240`	`}`
`241`	`241`
`242`		`- if (! $this->nodeNameResolver->isName($node, $oldVariableName)) {`
	`242`	`+ if (! $this->isName($node, $oldVariableName)) {`
`243`	`243`	`return null;`
`244`	`244`	`}`
`245`	`245`
Original file line number	Diff line number	Diff line change
`@@ -177,7 +177,7 @@ private function shouldSkipLeftVariable(Assign \| MethodCall $node): bool`
`177`	`177`	`}`
`178`	`178`
`179`	`179`	`// local method call`
`180`		`- return $this->nodeNameResolver->isName($node->var, 'this');`
	`180`	`+ return $this->isName($node->var, 'this');`
`181`	`181`	`}`
`182`	`182`
`183`	`183`	`private function isNewVariableThanBefore(?string $currentStmtVariableName): bool`
Original file line number	Diff line number	Diff line change
`@@ -198,7 +198,7 @@ private function isIteratorToArrayFuncCall(Expr $expr): bool`
`198`	`198`	`return false;`
`199`	`199`	`}`
`200`	`200`
`201`		`- if (! $this->nodeNameResolver->isName($expr, 'iterator_to_array')) {`
	`201`	`+ if (! $this->isName($expr, 'iterator_to_array')) {`
`202`	`202`	`return false;`
`203`	`203`	`}`
`204`	`204`
Original file line number	Diff line number	Diff line change
`@@ -164,12 +164,12 @@ private function shouldSkipClassMethod(Class_ $class, ClassMethod $classMethod):`
`164`	`164`	`return true;`
`165`	`165`	`}`
`166`	`166`
`167`		`- if ($this->nodeNameResolver->isName($classMethod, MethodName::CONSTRUCT)) {`
	`167`	`+ if ($this->isName($classMethod, MethodName::CONSTRUCT)) {`
`168`	`168`	`// has parent class?`
`169`	`169`	`return $class->extends instanceof FullyQualified;`
`170`	`170`	`}`
`171`	`171`
`172`		`- return $this->nodeNameResolver->isName($classMethod, MethodName::INVOKE);`
	`172`	`+ return $this->isName($classMethod, MethodName::INVOKE);`
`173`	`173`	`}`
`174`	`174`
`175`	`175`	`private function hasDeprecatedAnnotation(ClassMethod $classMethod): bool`