Merge branch 'bpo/2.9/#3456' into 2.9

lib/Doctrine/DBAL/Schema/Comparator.php

@@ -11,6 +11,7 @@ use function array_merge;
 use function array_shift;
 use function array_unique;
 use function count;
+use function get_class;
 use function strtolower;
 
 /**
@@ -417,7 +418,11 @@ class Comparator
 
         $changedProperties = [];
 
-        foreach (['type', 'notnull', 'unsigned', 'autoincrement'] as $property) {
+        if (get_class($properties1['type']) !== get_class($properties2['type'])) {
+            $changedProperties[] = 'type';
+        }
+
+        foreach (['notnull', 'unsigned', 'autoincrement'] as $property) {
             if ($properties1[$property] === $properties2[$property]) {
                 continue;
             }

tests/Doctrine/Tests/DBAL/Schema/ComparatorTest.php

@@ -16,6 +16,7 @@ use Doctrine\DBAL\Schema\TableDiff;
 use Doctrine\DBAL\Types\Type;
 use PHPUnit\Framework\TestCase;
 use function array_keys;
+use function get_class;
 
 class ComparatorTest extends TestCase
 {
@@ -193,6 +194,36 @@ class ComparatorTest extends TestCase
         self::assertEquals([], $c->diffColumn($column1, $column1));
     }
 
+    public function testCompareColumnsMultipleTypeInstances() : void
+    {
+        $integerType1 = Type::getType('integer');
+        Type::overrideType('integer', get_class($integerType1));
+        $integerType2 = Type::getType('integer');
+
+        $column1 = new Column('integerfield1', $integerType1);
+        $column2 = new Column('integerfield1', $integerType2);
+
+        $c = new Comparator();
+        self::assertEquals([], $c->diffColumn($column1, $column2));
+    }
+
+    public function testCompareColumnsOverriddenType() : void
+    {
+        $oldStringInstance = Type::getType('string');
+        $integerType       = Type::getType('integer');
+
+        Type::overrideType('string', get_class($integerType));
+        $overriddenStringType = Type::getType('string');
+
+        Type::overrideType('string', get_class($oldStringInstance));
+
+        $column1 = new Column('integerfield1', $integerType);
+        $column2 = new Column('integerfield1', $overriddenStringType);
+
+        $c = new Comparator();
+        self::assertEquals([], $c->diffColumn($column1, $column2));
+    }
+
     public function testCompareChangedColumnsChangeCustomSchemaOption()
     {
         $column1 = new Column('charfield1', Type::getType('string'));