Merge branch 'main' into fix/phpstan-failing

Author: peterfox

src/Rector/ClassMethod/AddParentBootToModelClassMethodRector.php

@@ -115,6 +115,7 @@ public function refactor(Node $node): ?Node
         $parentStaticCallExpression = new Expression($staticCall);
 
         $node->stmts = array_merge([$parentStaticCallExpression], (array) $node->stmts);
+        $node->stmts = array_values($node->stmts);
 
         return $node;
     }

src/Rector/ClassMethod/AddParentRegisterToEventServiceProviderRector.php

@@ -111,6 +111,7 @@ public function refactor(Node $node): ?Node
         $parentStaticCallExpression = new Expression($staticCall);
 
         $node->stmts = array_merge([$parentStaticCallExpression], (array) $node->stmts);
+        $node->stmts = array_values($node->stmts);
 
         return $node;
     }

src/Rector/ClassMethod/MigrateToSimplifiedAttributeRector.php

@@ -77,10 +77,13 @@ public function refactor(Node $node): ?Node
             }
         }
 
-        return $hasChanged
-            ? $node
-            : null;
+        if ($hasChanged) {
+            $node->stmts = array_values($node->stmts);
 
+            return $node;
+        }
+
+        return null;
     }
 
     public function getRuleDefinition(): RuleDefinition

src/Rector/Class_/ModelCastsPropertyToCastsMethodRector.php

@@ -100,6 +100,7 @@ public function refactor(Node $node): ?Class_
                 $method->addStmt(new Return_($stmt->props[0]->default));
                 $methodNode = $method->getNode();
                 $node->stmts[] = $methodNode;
+                $node->stmts = array_values($node->stmts);
 
                 $this->restorePhpDoc($methodNode);
 

src/Rector/Class_/PropertyDeferToDeferrableProviderToRector.php

@@ -80,6 +80,7 @@ public function refactor(Node $node): ?Node
         }
 
         unset($node->stmts[array_search($deferProperty, $node->stmts, true)]);
+        $node->stmts = array_values($node->stmts);
 
         $node->implements[] = new FullyQualified('Illuminate\Contracts\Support\DeferrableProvider');
 

src/Rector/Class_/RemoveModelPropertyFromFactoriesRector.php

@@ -71,6 +71,7 @@ public function refactor(Node $node): ?Node
             }
 
             unset($node->stmts[$index]);
+            $node->stmts = array_values($node->stmts);
 
             break;
         }

src/Rector/Class_/UnifyModelDatesWithCastsRector.php

@@ -76,7 +76,7 @@ public function getNodeTypes(): array
     /**
      * @param  Class_  $node
      */
-    public function refactor(Node $node)
+    public function refactor(Node $node): ?Node
     {
         if (! $this->isObjectType($node, new ObjectType('Illuminate\Database\Eloquent\Model'))) {
             return null;
@@ -128,8 +128,9 @@ public function refactor(Node $node)
         }
 
         unset($node->stmts[array_search($datesProperty, $node->stmts, true)]);
+        $node->stmts = array_values($node->stmts);
 
-        return null;
+        return $node;
     }
 
     private function createCastsProperty(): Property

src/Rector/MethodCall/WhereToWhereLikeRector.php

@@ -125,6 +125,7 @@ public function refactor(Node $node): ?Node
 
         // Remove the second argument (the 'like' operator)
         unset($node->args[1]);
+        $node->args = array_values($node->args);
 
         return $node;
     }

src/Rector/Namespace_/FactoryDefinitionRector.php

@@ -141,6 +141,7 @@ public function refactor(Node $node): ?Node
         }
 
         $node->stmts = array_merge($node->stmts, $factories);
+        $node->stmts = array_values($node->stmts);
 
         return $node;
     }

src/Rector/StaticCall/Redirect301ToPermanentRedirectRector.php

@@ -96,6 +96,7 @@ public function refactor(Node $node): ?Node
         }
 
         unset($node->args[2]);
+        $node->args = array_values($node->args);
 
         $node->name = new Identifier('permanentRedirect');