make return null consistent on no change

2024-06-12 22:22:24 +00:00 · 2018-10-21 12:19:14 +02:00 · 2018-10-21 12:19:14 +02:00 · f330c5e9c2
commit f330c5e9c2
parent 985d38e267
46 changed files with 103 additions and 96 deletions
--- a/examples/MergeIsCandidateRector.php
+++ b/examples/MergeIsCandidateRector.php
@ -104,23 +104,23 @@ final class MergeIsCandidateRector extends AbstractRector
    public function refactor(Node $node): ?Node
    {
        if ($this->isType($node, 'Rector\Rector\AbstractRector')) {
-            return $node;
+            return null;
        }

        if (! $node->isAbstract()) {
-            return $node;
+            return null;
        }

        // has "isCandidate()" method?
        if (! $this->hasClassIsCandidateMethod($node)) {
-            return $node;
+            return null;
        }

        [$isCandidateClassMethodPosition, $isCandidateClassMethod] = $this->getClassMethodByName($node, 'isCandidate');
        [$refactorClassMethodPosition, $refactorClassMethod] = $this->getClassMethodByName($node, 'refactor');

        if ($refactorClassMethod === null) {
-            return $node;
+            return null;
        }

        // 1. replace "isCandidate()" method by "getNodeType()" method
--- a/packages/CodeQuality/src/Rector/Assign/CombinedAssignRector.php
+++ b/packages/CodeQuality/src/Rector/Assign/CombinedAssignRector.php
@ -76,19 +76,19 @@ final class CombinedAssignRector extends AbstractRector
    public function refactor(Node $node): ?Node
    {
        if (! $node->expr instanceof BinaryOp) {
-            return $node;
+            return null;
        }

        /** @var BinaryOp $binaryNode */
        $binaryNode = $node->expr;

        if (! $this->areNodesEqual($node->var, $binaryNode->left)) {
-            return $node;
+            return null;
        }

        $binaryNodeClass = get_class($binaryNode);
        if (! isset($this->binaryOpClassToAssignOpClass[$binaryNodeClass])) {
-            return $node;
+            return null;
        }

        $newAssignNodeClass = $this->binaryOpClassToAssignOpClass[$binaryNodeClass];
--- a/packages/CodeQuality/src/Rector/FuncCall/SimplifyFuncGetArgsCountRector.php
+++ b/packages/CodeQuality/src/Rector/FuncCall/SimplifyFuncGetArgsCountRector.php
@ -33,11 +33,11 @@ final class SimplifyFuncGetArgsCountRector extends AbstractRector
    public function refactor(Node $node): ?Node
    {
        if (! $this->isName($node, 'count')) {
-            return $node;
+            return null;
        }

        if (! $node->args[0]->value instanceof FuncCall) {
-            return $node;
+            return null;
        }

        /** @var FuncCall $innerFuncCall */
--- a/packages/CodeQuality/src/Rector/FuncCall/SimplifyInArrayValuesRector.php
+++ b/packages/CodeQuality/src/Rector/FuncCall/SimplifyInArrayValuesRector.php
@ -31,17 +31,17 @@ final class SimplifyInArrayValuesRector extends AbstractRector
    public function refactor(Node $node): ?Node
    {
        if (! $this->isName($node, 'in_array')) {
-            return $node;
+            return null;
        }

        if (! $node->args[1]->value instanceof FuncCall) {
-            return $node;
+            return null;
        }

        /** @var FuncCall $innerFunCall */
        $innerFunCall = $node->args[1]->value;
        if (! $this->isName($innerFunCall, 'array_values')) {
-            return $node;
+            return null;
        }

        $node->args[1] = $innerFunCall->args[0];
--- a/packages/CodeQuality/src/Rector/FuncCall/SimplifyStrposLowerRector.php
+++ b/packages/CodeQuality/src/Rector/FuncCall/SimplifyStrposLowerRector.php
@ -33,21 +33,21 @@ final class SimplifyStrposLowerRector extends AbstractRector
    public function refactor(Node $node): ?Node
    {
        if (! $this->isName($node, 'strpos')) {
-            return $node;
+            return null;
        }

        if (! isset($node->args[0])) {
-            return $node;
+            return null;
        }

        if (! $node->args[0]->value instanceof FuncCall) {
-            return $node;
+            return null;
        }

        /** @var FuncCall $innerFuncCall */
        $innerFuncCall = $node->args[0]->value;
        if (! $this->isName($innerFuncCall, 'strtolower')) {
-            return $node;
+            return null;
        }

        // pop 1 level up
--- a/packages/CodeQuality/src/Rector/Identical/GetClassToInstanceOfRector.php
+++ b/packages/CodeQuality/src/Rector/Identical/GetClassToInstanceOfRector.php
@ -56,7 +56,7 @@ final class GetClassToInstanceOfRector extends AbstractRector

            $className = $this->matchClassName($node->right);
        } else {
-            return $node;
+            return null;
        }

        $instanceOfNode = new Instanceof_($varNode, new FullyQualified($className));
--- a/packages/CodeQuality/src/Rector/Identical/SimplifyArraySearchRector.php
+++ b/packages/CodeQuality/src/Rector/Identical/SimplifyArraySearchRector.php
@ -44,7 +44,7 @@ final class SimplifyArraySearchRector extends AbstractRector
    {
        $match = $this->matchArraySearchFuncCallAndBoolConstFetch($node);
        if ($match === null) {
-            return $node;
+            return null;
        }

        [$arraySearchFuncCallNode, $boolConstFetchNode] = $match;
--- a/packages/CodeQuality/src/Rector/Identical/SimplifyConditionsRector.php
+++ b/packages/CodeQuality/src/Rector/Identical/SimplifyConditionsRector.php
@ -63,20 +63,20 @@ final class SimplifyConditionsRector extends AbstractRector
        }
    }

-    private function processBooleanNot(BooleanNot $node): Node
+    private function processBooleanNot(BooleanNot $node): ?Node
    {
        if (! $node->expr instanceof BinaryOp) {
-            return $node;
+            return null;
        }

        if ($this->shouldSkip($node->expr)) {
-            return $node;
+            return null;
        }

        return $this->createInversedBooleanOp($node->expr);
    }

-    private function processIdenticalAndNotIdentical(BinaryOp $node): Node
+    private function processIdenticalAndNotIdentical(BinaryOp $node): ?Node
    {
        if ($node->left instanceof Identical || $node->left instanceof NotIdentical) {
            $subBinaryOpNode = $node->left;
@ -85,7 +85,7 @@ final class SimplifyConditionsRector extends AbstractRector
            $subBinaryOpNode = $node->right;
            $shouldInverse = $this->isFalse($node->left);
        } else {
-            return $node;
+            return null;
        }

        if ($shouldInverse) {
--- a/packages/CodeQuality/src/Rector/Identical/SimplifyIdenticalFalseToBooleanNotRector.php
+++ b/packages/CodeQuality/src/Rector/Identical/SimplifyIdenticalFalseToBooleanNotRector.php
@ -39,21 +39,21 @@ final class SimplifyIdenticalFalseToBooleanNotRector extends AbstractRector
            $comparedNode = $node->right;
            $shouldUnwrap = $node->right instanceof BooleanNot;
        } else {
-            return $node;
+            return null;
        }

        if ($shouldUnwrap) {
            /** @var BooleanNot $comparedNode */
            $comparedNode = $comparedNode->expr;
            if ($this->shouldSkip($comparedNode)) {
-                return $node;
+                return null;
            }

            return $comparedNode;
        }

        if ($this->shouldSkip($comparedNode)) {
-            return $node;
+            return null;
        }

        return new BooleanNot($comparedNode);
--- a/packages/NodeTypeResolver/src/NodeVisitor/ClassAndMethodNodeVisitor.php
+++ b/packages/NodeTypeResolver/src/NodeVisitor/ClassAndMethodNodeVisitor.php
@ -52,7 +52,7 @@ final class ClassAndMethodNodeVisitor extends NodeVisitorAbstract
    public function enterNode(Node $node)
    {
        if ($node instanceof Class_ && $node->isAnonymous()) {
-            return $node;
+            return null;
        }

        $this->processClass($node);
--- a/packages/PHPUnit/src/Rector/TryCatchToExpectExceptionRector.php
+++ b/packages/PHPUnit/src/Rector/TryCatchToExpectExceptionRector.php
@ -57,11 +57,11 @@ CODE_SAMPLE
    public function refactor(Node $node): ?Node
    {
        if (! $this->isInTestClass($node)) {
-            return $node;
+            return null;
        }

        if (! $node->stmts) {
-            return $node;
+            return null;
        }

        $proccesed = [];
--- a/packages/Php/src/Rector/Assign/AssignArrayToStringRector.php
+++ b/packages/Php/src/Rector/Assign/AssignArrayToStringRector.php
@ -81,7 +81,7 @@ CODE_SAMPLE
    {
        // only array with no explicit key assign, e.g. "$value[] = 5";
        if (! $node->var instanceof ArrayDimFetch || $node->var->dim !== null) {
-            return $node;
+            return null;
        }

        $arrayDimFetchNode = $node->var;
--- a/packages/Php/src/Rector/ClassConst/PublicConstantVisibilityRector.php
+++ b/packages/Php/src/Rector/ClassConst/PublicConstantVisibilityRector.php
@ -50,12 +50,12 @@ CODE_SAMPLE
    {
        // already non-public
        if (! $node->isPublic()) {
-            return $node;
+            return null;
        }

        // explicitly public
        if ($node->flags !== 0) {
-            return $node;
+            return null;
        }

        $node->flags = Class_::MODIFIER_PUBLIC;
--- a/packages/Php/src/Rector/ConstFetch/SensitiveConstantNameRector.php
+++ b/packages/Php/src/Rector/ConstFetch/SensitiveConstantNameRector.php
@ -114,14 +114,14 @@ CODE_SAMPLE
    {
        // is system constant?
        if (in_array(strtoupper((string) $node->name), $this->phpReservedConstants, true)) {
-            return $node;
+            return null;
        }

        $currentConstantName = (string) $node->name;

        // is uppercase, all good
        if ($currentConstantName === strtoupper($currentConstantName)) {
-            return $node;
+            return null;
        }

        $node->name = new FullyQualified(strtoupper($currentConstantName));
--- a/packages/Php/src/Rector/Each/ListEachRector.php
+++ b/packages/Php/src/Rector/Each/ListEachRector.php
@ -53,7 +53,7 @@ CODE_SAMPLE
    public function refactor(Node $node): ?Node
    {
        if ($this->shouldSkip($node)) {
-            return $node;
+            return null;
        }

        /** @var List_ $listNode */
--- a/packages/Php/src/Rector/Each/WhileEachToForeachRector.php
+++ b/packages/Php/src/Rector/Each/WhileEachToForeachRector.php
@ -68,13 +68,13 @@ CODE_SAMPLE
    public function refactor(Node $node): ?Node
    {
        if (! $node->cond instanceof Assign) {
-            return $node;
+            return null;
        }

        /** @var Assign $assignNode */
        $assignNode = $node->cond;
        if (! $this->isListToEachAssign($assignNode)) {
-            return $node;
+            return null;
        }

        /** @var FuncCall $eachFuncCall */
--- a/packages/Php/src/Rector/FuncCall/ArrayKeyFirstLastRector.php
+++ b/packages/Php/src/Rector/FuncCall/ArrayKeyFirstLastRector.php
@ -73,7 +73,7 @@ CODE_SAMPLE
    public function refactor(Node $node): ?Node
    {
        if ($node->stmts === null) {
-            return $node;
+            return null;
        }

        foreach ($node->stmts as $key => $stmt) {
--- a/packages/Php/src/Rector/FuncCall/CallUserMethodRector.php
+++ b/packages/Php/src/Rector/FuncCall/CallUserMethodRector.php
@ -57,7 +57,7 @@ final class CallUserMethodRector extends AbstractRector
    {
        $newName = $this->matchNewFunctionName($node);
        if ($newName === null) {
-            return $node;
+            return null;
        }

        $node->name = new Name($newName);
--- a/packages/Php/src/Rector/FuncCall/CountOnNullRector.php
+++ b/packages/Php/src/Rector/FuncCall/CountOnNullRector.php
@ -53,23 +53,23 @@ CODE_SAMPLE
    public function refactor(Node $node): ?Node
    {
        if (! $this->isName($node, 'count')) {
-            return $node;
+            return null;
        }

        // check if it has some condition before already, if so, probably it's already handled
        $parentNode = $node->getAttribute(Attribute::PARENT_NODE);
        if ($parentNode instanceof Ternary) {
-            return $node;
+            return null;
        }

        if (! isset($node->args[0])) {
-            return $node;
+            return null;
        }

        $countedNode = $node->args[0]->value;

        if ($this->isCountableType($countedNode)) {
-            return $node;
+            return null;
        }

        $conditionNode = new BooleanOr(
--- a/packages/Php/src/Rector/FuncCall/EregToPregMatchRector.php
+++ b/packages/Php/src/Rector/FuncCall/EregToPregMatchRector.php
@ -74,7 +74,7 @@ final class EregToPregMatchRector extends AbstractRector
        $functionName = $this->getName($node);

        if (! isset($this->oldNamesToNewOnes[$functionName])) {
-            return $node;
+            return null;
        }

        $patternNode = $node->args[0]->value;
--- a/packages/Php/src/Rector/FuncCall/MultiDirnameRector.php
+++ b/packages/Php/src/Rector/FuncCall/MultiDirnameRector.php
@ -41,7 +41,7 @@ final class MultiDirnameRector extends AbstractRector
        $this->nestingLevel = 0;

        if (! $this->isName($node, 'dirname')) {
-            return $node;
+            return null;
        }

        $activeFuncCallNode = $node;
--- a/packages/Php/src/Rector/FuncCall/PowToExpRector.php
+++ b/packages/Php/src/Rector/FuncCall/PowToExpRector.php
@ -33,11 +33,11 @@ final class PowToExpRector extends AbstractRector
    public function refactor(Node $node): ?Node
    {
        if (! $this->isName($node, 'pow')) {
-            return $node;
+            return null;
        }

        if (count($node->args) !== 2) {
-            return $node;
+            return null;
        }

        $firstArgument = $node->args[0]->value;
--- a/packages/Php/src/Rector/FuncCall/SensitiveDefineRector.php
+++ b/packages/Php/src/Rector/FuncCall/SensitiveDefineRector.php
@ -45,11 +45,11 @@ CODE_SAMPLE
    public function refactor(Node $node): ?Node
    {
        if (! $this->isName($node, 'define')) {
-            return $node;
+            return null;
        }

        if (! isset($node->args[2])) {
-            return $node;
+            return null;
        }

        unset($node->args[2]);
--- a/packages/Php/src/Rector/FunctionLike/ExceptionHandlerTypehintRector.php
+++ b/packages/Php/src/Rector/FunctionLike/ExceptionHandlerTypehintRector.php
@ -51,18 +51,18 @@ CODE_SAMPLE
    {
        // exception handle has 1 param exactly
        if (count($node->params) !== 1) {
-            return $node;
+            return null;
        }

        $paramNode = $node->params[0];
        // handle only Exception typehint
        if ((string) $paramNode->type !== 'Exception') {
-            return $node;
+            return null;
        }

        // is probably handling exceptions
        if (! Strings::match((string) $node->name, '#handle#i')) {
-            return $node;
+            return null;
        }

        $paramNode->type = new FullyQualified('Throwable');
--- a/packages/Php/src/Rector/FunctionLike/Php4ConstructorRector.php
+++ b/packages/Php/src/Rector/FunctionLike/Php4ConstructorRector.php
@ -76,7 +76,7 @@ CODE_SAMPLE
        $namespace = $node->getAttribute(Attribute::NAMESPACE_NAME);
        // catch only classes without namespace
        if ($namespace) {
-            return $node;
+            return null;
        }

        /** @var Class_ $classNode */
@ -84,7 +84,7 @@ CODE_SAMPLE

        // anonymous class → skip
        if ($classNode->name === null || $node->isAbstract() || $node->isStatic()) {
-            return $node;
+            return null;
        }

        // process parent call references first
@ -92,7 +92,7 @@ CODE_SAMPLE

        // not PSR-4 constructor
        if (strtolower((string) $classNode->name) !== strtolower((string) $node->name)) {
-            return $node;
+            return null;
        }

        // does it already have a __construct method?
--- a/packages/Php/src/Rector/List_/EmptyListRector.php
+++ b/packages/Php/src/Rector/List_/EmptyListRector.php
@ -37,7 +37,7 @@ final class EmptyListRector extends AbstractRector
    {
        foreach ($node->items as $item) {
            if ($item !== null) {
-                return $node;
+                return null;
            }
        }

--- a/packages/Php/src/Rector/List_/ListSplitStringRector.php
+++ b/packages/Php/src/Rector/List_/ListSplitStringRector.php
@ -41,11 +41,11 @@ final class ListSplitStringRector extends AbstractRector
    public function refactor(Node $node): ?Node
    {
        if (! $node->var instanceof List_) {
-            return $node;
+            return null;
        }

        if (! $this->isStringType($node->expr)) {
-            return $node;
+            return null;
        }

        $node->expr = new FuncCall(new Name('str_split'), [new Arg($node->expr)]);
--- a/packages/Php/src/Rector/List_/ListSwapArrayOrderRector.php
+++ b/packages/Php/src/Rector/List_/ListSwapArrayOrderRector.php
@ -41,7 +41,7 @@ final class ListSwapArrayOrderRector extends AbstractRector
    public function refactor(Node $node): ?Node
    {
        if (! $node->var instanceof List_) {
-            return $node;
+            return null;
        }

        $printerVars = [];
@ -51,13 +51,13 @@ final class ListSwapArrayOrderRector extends AbstractRector
            if ($item->value instanceof ArrayDimFetch) {
                $printerVars[] = $this->print($item->value->var);
            } else {
-                return $node;
+                return null;
            }
        }

        // relevant only in 1 variable type
        if (count(array_unique($printerVars)) !== 1) {
-            return $node;
+            return null;
        }

        // wrap with array_reverse, to reflect reverse assign order in left
--- a/packages/Php/src/Rector/Property/TypedPropertyRector.php
+++ b/packages/Php/src/Rector/Property/TypedPropertyRector.php
@ -104,24 +104,24 @@ CODE_SAMPLE

        // too many types to handle
        if (count($varTypes) > 2) {
-            return $node;
+            return null;
        }

        $this->isNullableType = in_array('null', $varTypes, true);

        // exactly 1 type only can be changed || 2 types with nullable; nothing else
        if (count($varTypes) !== 1 && (count($varTypes) === 2 && ! $this->isNullableType)) {
-            return $node;
+            return null;
        }

        $propertyType = $this->getPropertyTypeWithoutNull($varTypes);
        $propertyType = $this->shortenLongType($propertyType);
        if (! $this->typeAnalyzer->isPropertyTypeHintableType($propertyType)) {
-            return $node;
+            return null;
        }

        if (! $this->matchesDocTypeAndDefaultValueType($propertyType, $node)) {
-            return $node;
+            return null;
        }

        if ($this->isNullableType) {
--- a/packages/Php/src/Rector/Ternary/TernaryToNullCoalescingRector.php
+++ b/packages/Php/src/Rector/Ternary/TernaryToNullCoalescingRector.php
@ -52,7 +52,7 @@ final class TernaryToNullCoalescingRector extends AbstractRector
            [$checkedNode, $fallbackNode] = [$node->if, $node->else];
        } else {
            // not a match
-            return $node;
+            return null;
        }

        /** @var Identical|NotIdentical $ternaryCompareNode */
--- a/packages/Php/src/Rector/TryCatch/MultiExceptionCatchRector.php
+++ b/packages/Php/src/Rector/TryCatch/MultiExceptionCatchRector.php
@ -56,7 +56,7 @@ CODE_SAMPLE
    public function refactor(Node $node): ?Node
    {
        if (count($node->catches) < 2) {
-            return $node;
+            return null;
        }

        $catchKeysByContent = $this->collectCatchKeysByContent($node);
--- a/packages/PhpParser/src/Rector/CatchAndClosureUseNameRector.php
+++ b/packages/PhpParser/src/Rector/CatchAndClosureUseNameRector.php
@ -53,7 +53,7 @@ final class CatchAndClosureUseNameRector extends AbstractRector
    public function refactor(Node $node): ?Node
    {
        if (! $this->isTypes($node, ['PhpParser\Node\Stmt\Catch_', 'PhpParser\Node\Expr\ClosureUse'])) {
-            return $node;
+            return null;
        }

        if (! $this->isName($node, 'var')) {
@ -62,7 +62,7 @@ final class CatchAndClosureUseNameRector extends AbstractRector

        $parentNode = $node->getAttribute(Attribute::PARENT_NODE);
        if ($parentNode instanceof PropertyFetch) {
-            return $node;
+            return null;
        }

        /** @var Variable $variableNode */
--- a/packages/PhpParser/src/Rector/IdentifierRector.php
+++ b/packages/PhpParser/src/Rector/IdentifierRector.php
@ -94,7 +94,7 @@ CODE_SAMPLE

        $parentNode = $node->getAttribute(Attribute::PARENT_NODE);
        if ($parentNode instanceof MethodCall) {
-            return $node;
+            return null;
        }

        return $this->methodCallNodeFactory->createWithVariableAndMethodName($node, 'toString');
--- a/packages/Silverstripe/src/Rector/ConstantToStaticCallRector.php
+++ b/packages/Silverstripe/src/Rector/ConstantToStaticCallRector.php
@ -36,7 +36,7 @@ final class ConstantToStaticCallRector extends AbstractRector
    public function refactor(Node $node): ?Node
    {
        if (! Strings::startsWith($node->name->toString(), 'SS_')) {
-            return $node;
+            return null;
        }

        $staticCallNode = new StaticCall(new FullyQualified('Environment'), 'getEnv');
--- a/src/CodingStyle/AfterRectorCodingStyle.php
+++ b/src/CodingStyle/AfterRectorCodingStyle.php
@ -11,7 +11,12 @@ final class AfterRectorCodingStyle
    /**
     * @var string
     */
-    private const ECS_BIN_PATH = __DIR__ . '/../../ecs-after-rector.yml';
+    private const ECS_BIN_PATH = 'vendor/bin/ecs';
+
+    /**
+     * @var string
+     */
+    private const ECS_AFTER_RECTOR_CONFIG = __DIR__ . '/../../ecs-after-rector.yml';

    /**
     * @param string[] $source
@ -20,7 +25,12 @@ final class AfterRectorCodingStyle
    {
        $this->validate();

-        $command = sprintf('vendor/bin/ecs check %s --config %s --fix', implode(' ', $source), self::ECS_BIN_PATH);
+        $command = sprintf(
+            '%s check %s --config %s --fix',
+            self::ECS_BIN_PATH,
+            implode(' ', $source),
+            self::ECS_AFTER_RECTOR_CONFIG
+        );

        $process = new Process($command);
        $process->run();
--- a/src/PhpParser/NodeVisitor/ConstructorInjectionNodeVisitor.php
+++ b/src/PhpParser/NodeVisitor/ConstructorInjectionNodeVisitor.php
@ -40,7 +40,7 @@ final class ConstructorInjectionNodeVisitor extends NodeVisitorAbstract
    public function enterNode(Node $node): ?Node
    {
        if (! $node instanceof Class_ || $node->isAnonymous()) {
-            return $node;
+            return null;
        }

        return $this->processClassNode($node);
--- a/src/PhpParser/NodeVisitor/ExpressionAddingNodeVisitor.php
+++ b/src/PhpParser/NodeVisitor/ExpressionAddingNodeVisitor.php
@ -24,7 +24,7 @@ final class ExpressionAddingNodeVisitor extends NodeVisitorAbstract
    public function leaveNode(Node $node)
    {
        if (! isset($this->expressionsToAdd[$node])) {
-            return $node;
+            return null;
        }

        $nodes = array_merge([$node], $this->expressionsToAdd[$node]);
--- a/src/Rector/Function_/FunctionReplaceRector.php
+++ b/src/Rector/Function_/FunctionReplaceRector.php
@ -55,12 +55,12 @@ final class FunctionReplaceRector extends AbstractRector
    {
        // anonymous function
        if (! $node->name instanceof Name) {
-            return $node;
+            return null;
        }

        $functionName = $node->name->toString();
        if (! isset($this->oldFunctionToNewFunction[$functionName])) {
-            return $node;
+            return null;
        }

        $newFunctionName = $this->oldFunctionToNewFunction[$functionName];
--- a/src/Rector/Function_/FunctionToStaticCallRector.php
+++ b/src/Rector/Function_/FunctionToStaticCallRector.php
@ -56,19 +56,16 @@ final class FunctionToStaticCallRector extends AbstractRector
    {
        // anonymous function
        if (! $node->name instanceof Name) {
-            return $node;
+            return null;
        }

        $functionName = $node->name->toString();
        if (! isset($this->functionToStaticCall[$functionName])) {
-            return $node;
+            return null;
        }

        [$className, $methodName] = $this->functionToStaticCall[$functionName];

-        $staticCallNode = new StaticCall(new FullyQualified($className), $methodName);
-        $staticCallNode->args = $node->args;
-
-        return $staticCallNode;
+        return new StaticCall(new FullyQualified($className), $methodName, $node->args);
    }
 }
--- a/src/Rector/MagicDisclosure/UnsetAndIssetToMethodCallRector.php
+++ b/src/Rector/MagicDisclosure/UnsetAndIssetToMethodCallRector.php
@ -99,7 +99,7 @@ final class UnsetAndIssetToMethodCallRector extends AbstractRector

        $method = $this->resolveMethod($node);
        if ($method === null) {
-            return $node;
+            return null;
        }

        /** @var ArrayDimFetch $arrayDimFetchNode */
--- a/src/Rector/MethodBody/FluentReplaceRector.php
+++ b/src/Rector/MethodBody/FluentReplaceRector.php
@ -69,12 +69,12 @@ CODE_SAMPLE
    {
        // is chain method call
        if (! $node->var instanceof MethodCall) {
-            return $node;
+            return null;
        }

        // is matching type
        if (! $this->isTypes($node->var, $this->classesToDefluent)) {
-            return $node;
+            return null;
        }

        /** @var MethodCall $innerMethodCallNode */
--- a/src/Rector/MethodBody/NormalToFluentRector.php
+++ b/src/Rector/MethodBody/NormalToFluentRector.php
@ -70,7 +70,7 @@ CODE_SAMPLE
    {
        // process only existing statements
        if ($node->stmts === null) {
-            return $node;
+            return null;
        }

        $classMethodStatementCount = count($node->stmts);
--- a/src/Rector/MethodBody/ReturnThisRemoveRector.php
+++ b/src/Rector/MethodBody/ReturnThisRemoveRector.php
@ -87,15 +87,15 @@ CODE_SAMPLE
    public function refactor(Node $node): ?Node
    {
        if (! $node->expr instanceof Variable) {
-            return $node;
+            return null;
        }

-        if ($node->expr->name !== 'this') {
-            return $node;
+        if (! $this->isName($node->expr, 'this')) {
+            return null;
        }

        if (! $this->isTypes($node->expr, $this->classesToDefluent)) {
-            return $node;
+            return null;
        }

        $this->removeNode($node);
--- a/src/Rector/MethodCall/MethodNameReplacerRector.php
+++ b/src/Rector/MethodCall/MethodNameReplacerRector.php
@ -160,7 +160,7 @@ CODE_SAMPLE

        $methodName = $node->name;
        if (! isset($oldToNewMethods[$methodName])) {
-            return $node;
+            return null;
        }

        $node->name = $oldToNewMethods[$methodName];
@ -197,7 +197,7 @@ CODE_SAMPLE

        $currentMethodName = $this->getName($node);
        if (! isset($oldToNewMethods[$currentMethodName])) {
-            return $node;
+            return null;
        }

        $this->identifierRenamer->renameNode($node, $oldToNewMethods[$currentMethodName]);
--- a/src/Rector/MethodCall/StaticMethodNameReplacerRector.php
+++ b/src/Rector/MethodCall/StaticMethodNameReplacerRector.php
@ -159,7 +159,7 @@ final class StaticMethodNameReplacerRector extends AbstractRector

        $methodName = $node->name;
        if (! isset($oldToNewMethods[$methodName])) {
-            return $node;
+            return null;
        }

        $node->name = $oldToNewMethods[$methodName];
@ -210,7 +210,7 @@ final class StaticMethodNameReplacerRector extends AbstractRector

        $methodName = $identifierNode->toString();
        if (! isset($oldToNewMethods[$methodName])) {
-            return $node;
+            return null;
        }

        if ($this->isClassRename($oldToNewMethods)) {
--- a/src/Rector/Property/PropertyNameReplacerRector.php
+++ b/src/Rector/Property/PropertyNameReplacerRector.php
@ -85,7 +85,7 @@ final class PropertyNameReplacerRector extends AbstractRector
        $propertyName = $identifierNode->toString();

        if (! isset($oldToNewProperties[$propertyName])) {
-            return $node;
+            return null;
        }

        foreach ($oldToNewProperties as $oldProperty => $newProperty) {