[ci-review] Rector Rectify

Author: actions-user

rules/DowngradePhp72/Rector/FuncCall/DowngradePregUnmatchedAsNullConstantRector.php

@@ -82,7 +82,7 @@ public function refactor(Node $node)
         $flagsExpr = $args[3]->value;
 
         if ($flagsExpr instanceof BitwiseOr) {
-            $this->bitwiseFlagCleaner->cleanFuncCall($funcCall, $flagsExpr, self::UNMATCHED_NULL_FLAG, null);
+            $this->bitwiseFlagCleaner->cleanFuncCall($funcCall, $flagsExpr, self::UNMATCHED_NULL_FLAG);
             if ($this->nodeComparator->areNodesEqual($flagsExpr, $args[3]->value)) {
                 return null;
             }

rules/DowngradePhp80/NodeAnalyzer/NamedToUnnamedArgs.php

@@ -56,8 +56,7 @@ public function fillFromNamedArgs(
                     $currentArg->value,
                     $currentArg->byRef,
                     $currentArg->unpack,
-                    [],
-                    null
+                    []
                 );
             }
         }
@@ -108,8 +107,7 @@ public function fillFromJumpedNamedArgs(
                 $parameterReflection->passedByReference()
                     ->yes(),
                 $parameterReflection->isVariadic(),
-                [],
-                null
+                []
             );
         }
 

rules/DowngradePhp80/NodeAnalyzer/UnnamedArgumentResolver.php

@@ -45,7 +45,7 @@ public function resolveFromReflection(
 
         foreach ($currentArgs as $key => $arg) {
             if (! $arg->name instanceof Identifier) {
-                $unnamedArgs[$key] = new Arg($arg->value, $arg->byRef, $arg->unpack, [], null);
+                $unnamedArgs[$key] = new Arg($arg->value, $arg->byRef, $arg->unpack, []);
 
                 continue;
             }

rules/DowngradePhp80/Rector/NullsafeMethodCall/DowngradeNullsafeToTernaryOperatorRector.php

@@ -68,36 +68,18 @@ public function refactor(Node $node): ?Ternary
                 $nullsafeVariable = $this->createNullsafeVariable();
 
                 $assign = new Assign($nullsafeVariable, $node->var->var);
-                if ($node instanceof MethodCall) {
-                    if ($node->var instanceof NullsafeMethodCall) {
-                        $methodCallOrPropertyFetch = new MethodCall(new MethodCall(
-                            $nullsafeVariable,
-                            $node->var->name,
-                            $node->var->args
-                        ), $node->name, $node->args);
-                        return new Ternary($assign, $methodCallOrPropertyFetch, $this->nodeFactory->createNull());
-                    }
-
-                    $methodCallOrPropertyFetch = new MethodCall(new PropertyFetch(
-                        $nullsafeVariable,
-                        $node->var->name
-                    ), $node->name, $node->args);
-                    return new Ternary($assign, $methodCallOrPropertyFetch, $this->nodeFactory->createNull());
-                }
-
                 if ($node->var instanceof NullsafeMethodCall) {
-                    $methodCallOrPropertyFetch = new PropertyFetch(new MethodCall(
+                    $methodCallOrPropertyFetch = new MethodCall(new MethodCall(
                         $nullsafeVariable,
                         $node->var->name,
                         $node->var->args
-                    ), $node->name);
+                    ), $node->name, $node->args);
                     return new Ternary($assign, $methodCallOrPropertyFetch, $this->nodeFactory->createNull());
                 }
-
-                $methodCallOrPropertyFetch = new PropertyFetch(new PropertyFetch(
+                $methodCallOrPropertyFetch = new MethodCall(new PropertyFetch(
                     $nullsafeVariable,
                     $node->var->name
-                ), $node->name);
+                ), $node->name, $node->args);
                 return new Ternary($assign, $methodCallOrPropertyFetch, $this->nodeFactory->createNull());
             }