With --overwrite, put updated methods in same location as original

This just makes for a cleaner diff, and maintains the order the user
seems to have originally wanted

Author: weaverryan

src/Util/ClassSourceManipulator.php

@@ -722,6 +722,7 @@ private function addMethod(Node\Stmt\ClassMethod $methodNode)
     {
         $classNode = $this->getClassNode();
         $methodName = $methodNode->name;
+        $existingIndex = null;
         if ($this->methodExists($methodName)) {
             if (!$this->overwrite) {
                 $this->writeNote(sprintf(
@@ -733,17 +734,33 @@ private function addMethod(Node\Stmt\ClassMethod $methodNode)
                 return;
             }
 
-            // we are overwriting - remove the existing method
-            unset($classNode->stmts[$this->getMethodIndex($methodName)]);
-            $classNode->stmts = array_values($classNode->stmts);
+            // record, so we can overwrite in the same place
+            $existingIndex = $this->getMethodIndex($methodName);
         }
 
+
+        $newStatements = [];
+
         // put new method always at the bottom
         if (!empty($classNode->stmts)) {
-            $classNode->stmts[] = $this->createBlankLineNode(self::CONTEXT_CLASS);
+            $newStatements[] = $this->createBlankLineNode(self::CONTEXT_CLASS);
+        }
+
+        $newStatements[] = $methodNode;
+
+        if (null === $existingIndex) {
+            // just them on the end!
+
+            $classNode->stmts = array_merge($classNode->stmts, $newStatements);
+        } else {
+            array_splice(
+                $classNode->stmts,
+                $existingIndex,
+                1,
+                $newStatements
+            );
         }
 
-        $classNode->stmts[] = $methodNode;
         $this->updateSourceCodeFromNewStmts();
     }
 

tests/Doctrine/fixtures/expected_no_overwrite/src/Entity/User.php

@@ -45,6 +45,11 @@ public function getId(): ?int
         return $this->id;
     }
 
+    public function customMethod()
+    {
+        return '';
+    }
+
     public function setUserProfile(?UserProfile $userProfile)
     {
         $this->userProfile = $userProfile;

tests/Doctrine/fixtures/expected_overwrite/src/Entity/User.php

@@ -44,6 +44,22 @@ public function getId(): ?int
         return $this->id;
     }
 
+    public function customMethod()
+    {
+        return '';
+    }
+
+    public function setUserProfile(?UserProfile $userProfile)
+    {
+        $this->userProfile = $userProfile;
+
+        // set (or unset) the owning side of the relation if necessary
+        $newUser = $userProfile === null ? null : $this;
+        if ($newUser !== $userProfile->getUser()) {
+            $userProfile->setUser($newUser);
+        }
+    }
+
     /**
      * @return Collection|UserAvatar[]
      */
@@ -80,17 +96,6 @@ public function getUserProfile(): ?UserProfile
         return $this->userProfile;
     }
 
-    public function setUserProfile(?UserProfile $userProfile)
-    {
-        $this->userProfile = $userProfile;
-
-        // set (or unset) the owning side of the relation if necessary
-        $newUser = $userProfile === null ? null : $this;
-        if ($newUser !== $userProfile->getUser()) {
-            $userProfile->setUser($newUser);
-        }
-    }
-
     /**
      * @return Collection|Tag[]
      */

tests/Doctrine/fixtures/source_project/src/Entity/User.php

@@ -43,6 +43,11 @@ public function getId(): ?int
         return $this->id;
     }
 
+    public function customMethod()
+    {
+        return '';
+    }
+
     public function setUserProfile(?UserProfile $userProfile)
     {
         $this->userProfile = $userProfile;