Merge pull request #6051 from greg0ire/clear-up-confusion

Reference the right argument

Author: greg0ire

UPGRADE.md

@@ -260,9 +260,9 @@ if (! $diff->isEmpty()) {
 }
 ```
 
-## Deprecated not passing `$fromColumn` to the `TableDiff` constructor.
+## Deprecated not passing `$fromTable` to the `TableDiff` constructor.
 
-Not passing `$fromColumn` to the `TableDiff` constructor has been deprecated.
+Not passing `$fromTable` to the `TableDiff` constructor has been deprecated.
 
 The `TableDiff::$name` property and the `TableDiff::getName()` method have been deprecated as well. In order to obtain
 the name of the table that the diff describes, use `TableDiff::getOldTable()`.
@@ -1002,7 +1002,7 @@ deprecated in order to provide a more consistent API.
 
 ## Deprecated `Comparator::compare($fromSchema, $toSchema)`
 
-The usage of `Comparator::compare($fromSchema, $toSchema)` is deprecated and 
+The usage of `Comparator::compare($fromSchema, $toSchema)` is deprecated and
 replaced by `Comparator::compareSchemas($fromSchema, $toSchema)` in order to
 clarify the purpose of the method.
 

src/Schema/TableDiff.php

@@ -180,11 +180,11 @@ public function __construct(
         $this->changedForeignKeys = $changedForeignKeys;
         $this->removedForeignKeys = $removedForeignKeys;
 
-        if ($fromTable !== null) {
+        if ($fromTable === null) {
             Deprecation::trigger(
                 'doctrine/dbal',
                 'https://github.com/doctrine/dbal/pull/5678',
-                'Not passing the $fromColumn to %s is deprecated.',
+                'Not passing the $fromTable to %s is deprecated.',
                 __METHOD__,
             );
         }

tests/Schema/TableDiffTest.php

@@ -6,11 +6,14 @@
 use Doctrine\DBAL\Schema\Identifier;
 use Doctrine\DBAL\Schema\Table;
 use Doctrine\DBAL\Schema\TableDiff;
+use Doctrine\Deprecations\PHPUnit\VerifyDeprecations;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
 class TableDiffTest extends TestCase
 {
+    use VerifyDeprecations;
+
     /** @var AbstractPlatform&MockObject */
     private AbstractPlatform $platform;
 
@@ -53,4 +56,25 @@ public function testReturnsNewName(): void
 
         self::assertEquals(new Identifier('bar'), $tableDiff->getNewName());
     }
+
+    public function testOmittingFromTableInConstructorIsDeprecated(): void
+    {
+        $this->expectDeprecationWithIdentifier('https://github.com/doctrine/dbal/pull/5678');
+        $tableDiff = new TableDiff('foo');
+    }
+
+    public function testPassingFromTableToConstructorIsDeprecated(): void
+    {
+        $this->expectNoDeprecationWithIdentifier('https://github.com/doctrine/dbal/pull/5678');
+        $tableDiff = new TableDiff(
+            'foo',
+            [],
+            [],
+            [],
+            [],
+            [],
+            [],
+            new Table('foo'),
+        );
+    }
 }