Improve deprecation layer

doctrine · Nov 6, 2023 · 686f7c5 · 686f7c5
1 parent 6bbd2aa
commit 686f7c5
Show file tree

Hide file tree

Showing 2 changed files with 63 additions and 25 deletions.
diff --git a/src/Schema/Column.php b/src/Schema/Column.php
@@ -463,4 +463,12 @@ public function toArray()
             'comment' => $this->_comment,
         ], $this->_platformOptions, $this->_customSchemaOptions);
     }
+
+    public function cloneWithName(string $name): Column
+    {
+        $clone = clone $this;
+        $clone->_setName($name);
+
+        return $clone;
+    }
 }
diff --git a/src/Schema/TableDiff.php b/src/Schema/TableDiff.php
@@ -143,7 +143,6 @@ class TableDiff
      *
      * @internal The diff can be only instantiated by a {@see Comparator}.
      *
-     * @param string                            $tableName
      * @param array<Column>                     $addedColumns
      * @param array<ColumnDiff>                 $modifiedColumns
      * @param array<Column>                     $droppedColumns
@@ -156,18 +155,18 @@ class TableDiff
      * @param array<string,Index>               $renamedIndexes
      */
     public function __construct(
-        $tableName,
-        $addedColumns = [],
-        $modifiedColumns = [],
-        $droppedColumns = [],
-        $addedIndexes = [],
-        $changedIndexes = [],
-        $removedIndexes = [],
+        string $tableName,
+        array $addedColumns = [],
+        array $modifiedColumns = [],
+        array $droppedColumns = [],
+        array $addedIndexes = [],
+        array $changedIndexes = [],
+        array $removedIndexes = [],
         ?Table $fromTable = null,
-        $addedForeignKeys = [],
-        $changedForeignKeys = [],
-        $removedForeignKeys = [],
-        $renamedIndexes = []
+        array $addedForeignKeys = [],
+        array $changedForeignKeys = [],
+        array $removedForeignKeys = [],
+        array $renamedIndexes = []
     ) {
         $this->name               = $tableName;
         $this->addedColumns       = $addedColumns;
@@ -200,18 +199,50 @@ public function __construct(
             /** @var array<string, Column> $renamedColumns */
             $renamedColumns = $renamedIndexes;
 
-            $legacyChangedColumns = [];
-            foreach ($renamedColumns as $oldName => $column) {
-                $legacyChangedColumns[$oldName] = new ColumnDiff($oldName, $column, []);
-            }
-
-            $this->changedColumns = array_merge($this->changedColumns, $legacyChangedColumns);
+            $this->changedColumns = array_merge(
+                $this->changedColumns,
+                $this->convertLegacyRenamedColumn($renamedColumns),
+            );
             $this->renamedIndexes = func_num_args() > 12 ? func_get_arg(13) : [];
         }
 
         $this->fromTable = $fromTable;
     }
 
+    /**
+     * @param array<string, Column> $renamedColumns
+     *
+     * @return array<ColumnDiff>
+     */
+    private function convertLegacyRenamedColumn(array $renamedColumns): array
+    {
+        $converted      = [];
+        $changedColumns = [];
+        foreach ($this->changedColumns as $column) {
+            $oldName                  = isset($column->fromColumn)
+                ? $column->fromColumn->getName()
+                : $column->oldColumnName;
+            $changedColumns[$oldName] = $column;
+        }
+
+        foreach ($renamedColumns as $oldName => $column) {
+            if (isset($changedColumns[$oldName])) {
+                $existingCol = $changedColumns[$oldName];
+                $column      = $existingCol->getNewColumn()->cloneWithName($column->getName());
+                $converted[] = new ColumnDiff(
+                    $oldName,
+                    $column,
+                    $existingCol->changedProperties,
+                    $existingCol->getOldColumn(),
+                );
+            } else {
+                $converted[] = new ColumnDiff($oldName, $column, []);
+            }
+        }
+
+        return $converted;
+    }
+
     /**
      * @deprecated Use {@see getOldTable()} instead.
      *
@@ -277,7 +308,7 @@ public function getModifiedColumns(): array
         }));
     }
 
-    /** @return list<ColumnDiff> */
+    /** @return array<ColumnDiff> */
     public function getChangedColumns(): array
     {
         if (count($this->renamedColumns) > 0) {
@@ -289,12 +320,11 @@ public function getChangedColumns(): array
                 __METHOD__,
             );
 
-            $legacyChangedColumns = [];
-            foreach ($this->renamedColumns as $oldName => $column) {
-                $legacyChangedColumns[$oldName] = new ColumnDiff($oldName, $column, []);
-            }
-
-            return array_values(array_merge($this->changedColumns, $legacyChangedColumns));
+            $this->changedColumns = array_merge(
+                $this->changedColumns,
+                $this->convertLegacyRenamedColumn($this->renamedColumns),
+            );
+            $this->renamedColumns = [];
         }
 
         return array_values($this->changedColumns);