Merge pull request doctrine#5768 from morozov/rename-diff-parameters

Rename parameters of the diff-related methods
derrabus · Oct 17, 2022 · 750c448 · 750c448
2 parents aae1184 + fc39724
commit 750c448
Show file tree

Hide file tree

Showing 9 changed files with 134 additions and 133 deletions.
diff --git a/src/Platforms/MySQL/Comparator.php b/src/Platforms/MySQL/Comparator.php
@@ -30,11 +30,11 @@ public function __construct(
         parent::__construct($platform);
     }
 
-    public function diffTable(Table $fromTable, Table $toTable): ?TableDiff
+    public function diffTable(Table $oldTable, Table $newTable): ?TableDiff
     {
         return parent::diffTable(
-            $this->normalizeTable($fromTable),
-            $this->normalizeTable($toTable),
+            $this->normalizeTable($oldTable),
+            $this->normalizeTable($newTable),
         );
     }
 

diff --git a/src/Platforms/SQLServer/Comparator.php b/src/Platforms/SQLServer/Comparator.php
@@ -22,15 +22,15 @@ public function __construct(SQLServerPlatform $platform, private readonly string
         parent::__construct($platform);
     }
 
-    public function diffTable(Table $fromTable, Table $toTable): ?TableDiff
+    public function diffTable(Table $oldTable, Table $newTable): ?TableDiff
     {
-        $fromTable = clone $fromTable;
-        $toTable   = clone $toTable;
+        $oldTable = clone $oldTable;
+        $newTable = clone $newTable;
 
-        $this->normalizeColumns($fromTable);
-        $this->normalizeColumns($toTable);
+        $this->normalizeColumns($oldTable);
+        $this->normalizeColumns($newTable);
 
-        return parent::diffTable($fromTable, $toTable);
+        return parent::diffTable($oldTable, $newTable);
     }
 
     private function normalizeColumns(Table $table): void

diff --git a/src/Platforms/SQLite/Comparator.php b/src/Platforms/SQLite/Comparator.php
@@ -24,15 +24,15 @@ public function __construct(SQLitePlatform $platform)
         parent::__construct($platform);
     }
 
-    public function diffTable(Table $fromTable, Table $toTable): ?TableDiff
+    public function diffTable(Table $oldTable, Table $newTable): ?TableDiff
     {
-        $fromTable = clone $fromTable;
-        $toTable   = clone $toTable;
+        $oldTable = clone $oldTable;
+        $newTable = clone $newTable;
 
-        $this->normalizeColumns($fromTable);
-        $this->normalizeColumns($toTable);
+        $this->normalizeColumns($oldTable);
+        $this->normalizeColumns($newTable);
 
-        return parent::diffTable($fromTable, $toTable);
+        return parent::diffTable($oldTable, $newTable);
     }
 
     private function normalizeColumns(Table $table): void

diff --git a/src/Platforms/SQLitePlatform.php b/src/Platforms/SQLitePlatform.php
@@ -785,11 +785,11 @@ private function getSimpleAlterTableSQL(TableDiff $diff): array|false
     }
 
     /** @return string[] */
-    private function getColumnNamesInAlteredTable(TableDiff $diff, Table $fromTable): array
+    private function getColumnNamesInAlteredTable(TableDiff $diff, Table $oldTable): array
     {
         $columns = [];
 
-        foreach ($fromTable->getColumns() as $column) {
+        foreach ($oldTable->getColumns() as $column) {
             $columnName                       = $column->getName();
             $columns[strtolower($columnName)] = $columnName;
         }
@@ -825,10 +825,10 @@ private function getColumnNamesInAlteredTable(TableDiff $diff, Table $fromTable)
     }
 
     /** @return Index[] */
-    private function getIndexesInAlteredTable(TableDiff $diff, Table $fromTable): array
+    private function getIndexesInAlteredTable(TableDiff $diff, Table $oldTable): array
     {
-        $indexes     = $fromTable->getIndexes();
-        $columnNames = $this->getColumnNamesInAlteredTable($diff, $fromTable);
+        $indexes     = $oldTable->getIndexes();
+        $columnNames = $this->getColumnNamesInAlteredTable($diff, $oldTable);
 
         foreach ($indexes as $key => $index) {
             foreach ($diff->getRenamedIndexes() as $oldIndexName => $renamedIndex) {
@@ -899,10 +899,10 @@ private function getIndexesInAlteredTable(TableDiff $diff, Table $fromTable): ar
     }
 
     /** @return ForeignKeyConstraint[] */
-    private function getForeignKeysInAlteredTable(TableDiff $diff, Table $fromTable): array
+    private function getForeignKeysInAlteredTable(TableDiff $diff, Table $oldTable): array
     {
-        $foreignKeys = $fromTable->getForeignKeys();
-        $columnNames = $this->getColumnNamesInAlteredTable($diff, $fromTable);
+        $foreignKeys = $oldTable->getForeignKeys();
+        $columnNames = $this->getColumnNamesInAlteredTable($diff, $oldTable);
 
         foreach ($foreignKeys as $key => $constraint) {
             $changed      = false;
@@ -959,11 +959,11 @@ private function getForeignKeysInAlteredTable(TableDiff $diff, Table $fromTable)
     }
 
     /** @return Index[] */
-    private function getPrimaryIndexInAlteredTable(TableDiff $diff, Table $fromTable): array
+    private function getPrimaryIndexInAlteredTable(TableDiff $diff, Table $oldTable): array
     {
         $primaryIndex = [];
 
-        foreach ($this->getIndexesInAlteredTable($diff, $fromTable) as $index) {
+        foreach ($this->getIndexesInAlteredTable($diff, $oldTable) as $index) {
             if (! $index->isPrimary()) {
                 continue;
             }

diff --git a/src/Schema/AbstractSchemaManager.php b/src/Schema/AbstractSchemaManager.php
@@ -606,10 +606,10 @@ public function alterSchema(SchemaDiff $schemaDiff): void
      *
      * @throws Exception
      */
-    public function migrateSchema(Schema $toSchema): void
+    public function migrateSchema(Schema $newSchema): void
     {
         $schemaDiff = $this->createComparator()
-            ->compareSchemas($this->introspectSchema(), $toSchema);
+            ->compareSchemas($this->introspectSchema(), $newSchema);
 
         $this->alterSchema($schemaDiff);
     }