[DowngradePhp80] Handle short circuit on DowngradeNullsafeToTernaryOperatorRector

Author: samsonasik

rules/DowngradePhp80/Rector/NullsafeMethodCall/DowngradeNullsafeToTernaryOperatorRector.php

@@ -55,18 +55,33 @@ public function getRuleDefinition(): RuleDefinition
      */
     public function getNodeTypes(): array
     {
-        return [NullsafeMethodCall::class, NullsafePropertyFetch::class];
+        return [MethodCall::class, PropertyFetch::class, NullsafeMethodCall::class, NullsafePropertyFetch::class];
     }
 
     /**
-     * @param NullsafeMethodCall|NullsafePropertyFetch $node
+     * @param MethodCall|NullsafeMethodCall|NullsafePropertyFetch $node
      */
-    public function refactor(Node $node): Ternary
+    public function refactor(Node $node): ?Ternary
     {
+        if ($node instanceof MethodCall || $node instanceof PropertyFetch) {
+            if ($node->var instanceof NullsafeMethodCall || $node->var instanceof NullsafePropertyFetch) {
+                $nullsafeVariable = $this->createNullsafeVariable();
+
+                $assign = new Assign($nullsafeVariable, $node->var->var);
+                $methodCallOrPropertyFetch = $node->var instanceof NullsafeMethodCall
+                    ? new MethodCall(new MethodCall($nullsafeVariable, $node->var->name, $node->var->args), $node->name, $node->args)
+                    : new PropertyFetch(new PropertyFetch($nullsafeVariable, $node->var->name), $node->name);
+
+                return new Ternary($assign, $methodCallOrPropertyFetch, $this->nodeFactory->createNull());
+            }
+
+            return null;
+        }
+
         $nullsafeVariable = $this->createNullsafeVariable();
 
         $methodCallOrPropertyFetch = $node instanceof NullsafeMethodCall
-            ? new MethodCall($nullsafeVariable, $node->name, $node->getArgs())
+            ? new MethodCall($nullsafeVariable, $node->name, $node->args)
             : new PropertyFetch($nullsafeVariable, $node->name);
 
         $assign = new Assign($nullsafeVariable, $node->var);