Address more DBAL 3.2 deprecations (#9256)

* Instantiate comparator via the schema manager, if possible * Do not use AbstractPlatform::getName()
doctrine · Dec 16, 2021 · bea5e71 · bea5e71
1 parent 003090b
commit bea5e71
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 4 deletions.
diff --git a/lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php b/lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php
@@ -666,7 +666,7 @@ private function determineIdGeneratorStrategy(AbstractPlatform $platform): int
     private function truncateSequenceName(string $schemaElementName): string
     {
         $platform = $this->getTargetPlatform();
-        if (! in_array($platform->getName(), ['oracle', 'sqlanywhere'], true)) {
+        if (! $platform instanceof Platforms\OraclePlatform && ! $platform instanceof Platforms\SQLAnywherePlatform) {
             return $schemaElementName;
         }
 

diff --git a/lib/Doctrine/ORM/Tools/SchemaTool.php b/lib/Doctrine/ORM/Tools/SchemaTool.php
@@ -930,7 +930,12 @@ public function getUpdateSchemaSql(array $classes, $saveMode = false)
         $toSchema   = $this->getSchemaFromMetadata($classes);
         $fromSchema = $this->createSchemaForComparison($toSchema);
 
-        $comparator = new Comparator();
+        if (method_exists($this->schemaManager, 'createComparator')) {
+            $comparator = $this->schemaManager->createComparator();
+        } else {
+            $comparator = new Comparator();
+        }
+
         $schemaDiff = $comparator->compareSchemas($fromSchema, $toSchema);
 
         if ($saveMode) {

diff --git a/psalm.xml b/psalm.xml
@@ -96,6 +96,12 @@
                 <file name="lib/Doctrine/ORM/QueryBuilder.php"/>
             </errorLevel>
         </RedundantCastGivenDocblockType>
+        <RedundantCondition>
+            <errorLevel type="suppress">
+                <!-- The SQLAnywherePlatform class may or may not exist depending on the DBAL version -->
+                <file name="lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php"/>
+            </errorLevel>
+        </RedundantCondition>
         <!-- Workaround for https://github.com/vimeo/psalm/issues/7026 -->
         <ReservedWord>
             <errorLevel type="suppress">

diff --git a/tests/Doctrine/Tests/ORM/Functional/SchemaTool/DDC214Test.php b/tests/Doctrine/Tests/ORM/Functional/SchemaTool/DDC214Test.php
@@ -14,6 +14,7 @@
 use function array_filter;
 use function count;
 use function implode;
+use function method_exists;
 use function strpos;
 
 use const PHP_EOL;
@@ -96,8 +97,13 @@ public function assertCreatedSchemaNeedsNoUpdates($classes): void
         $fromSchema = $sm->createSchema();
         $toSchema   = $this->schemaTool->getSchemaFromMetadata($classMetadata);
 
-        $comparator = new Comparator();
-        $schemaDiff = $comparator->compare($fromSchema, $toSchema);
+        if (method_exists($sm, 'createComparator')) {
+            $comparator = $sm->createComparator();
+        } else {
+            $comparator = new Comparator();
+        }
+
+        $schemaDiff = $comparator->compareSchemas($fromSchema, $toSchema);
 
         $sql = $schemaDiff->toSql($this->_em->getConnection()->getDatabasePlatform());
         $sql = array_filter($sql, static function ($sql) {