Remove DBAL 2 compat code

doctrine · Dec 16, 2021 · f2e34bd · f2e34bd
1 parent 5bbd1d2
commit f2e34bd
Show file tree

Hide file tree

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

diff --git a/lib/Doctrine/ORM/Tools/SchemaTool.php b/lib/Doctrine/ORM/Tools/SchemaTool.php
@@ -4,11 +4,9 @@
 
 namespace Doctrine\ORM\Tools;
 
-use Doctrine\DBAL\Connection;
 use Doctrine\DBAL\Platforms\AbstractPlatform;
 use Doctrine\DBAL\Schema\AbstractAsset;
 use Doctrine\DBAL\Schema\AbstractSchemaManager;
-use Doctrine\DBAL\Schema\Comparator;
 use Doctrine\DBAL\Schema\Index;
 use Doctrine\DBAL\Schema\Schema;
 use Doctrine\DBAL\Schema\Table;
@@ -36,7 +34,6 @@
 use function in_array;
 use function is_array;
 use function is_numeric;
-use function method_exists;
 use function strtolower;
 
 /**
@@ -927,13 +924,7 @@ public function getUpdateSchemaSql(array $classes, $saveMode = false)
     {
         $toSchema   = $this->getSchemaFromMetadata($classes);
         $fromSchema = $this->createSchemaForComparison($toSchema);
-
-        if (method_exists($this->schemaManager, 'createComparator')) {
-            $comparator = $this->schemaManager->createComparator();
-        } else {
-            $comparator = new Comparator();
-        }
-
+        $comparator = $this->schemaManager->createComparator();
         $schemaDiff = $comparator->compareSchemas($fromSchema, $toSchema);
 
         if ($saveMode) {

diff --git a/psalm.xml b/psalm.xml
@@ -81,12 +81,6 @@
                 <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
@@ -5,16 +5,13 @@
 namespace Doctrine\Tests\ORM\Functional\SchemaTool;
 
 use Doctrine\DBAL\Platforms\SqlitePlatform;
-use Doctrine\DBAL\Schema\Comparator;
 use Doctrine\ORM\Tools;
 use Doctrine\Tests\Models;
 use Doctrine\Tests\OrmFunctionalTestCase;
 use Exception;
 
 use function array_filter;
-use function count;
 use function implode;
-use function method_exists;
 use function strpos;
 
 use const PHP_EOL;
@@ -96,13 +93,7 @@ public function assertCreatedSchemaNeedsNoUpdates($classes): void
 
         $fromSchema = $sm->createSchema();
         $toSchema   = $this->schemaTool->getSchemaFromMetadata($classMetadata);
-
-        if (method_exists($sm, 'createComparator')) {
-            $comparator = $sm->createComparator();
-        } else {
-            $comparator = new Comparator();
-        }
-
+        $comparator = $sm->createComparator();
         $schemaDiff = $comparator->compareSchemas($fromSchema, $toSchema);
 
         $sql = $schemaDiff->toSql($this->_em->getConnection()->getDatabasePlatform());