Drop support for DBAL 2 (#451)

doctrine · Oct 29, 2023 · ef616ec · ef616ec
1 parent 621898f
commit ef616ec
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 69 deletions.
diff --git a/composer.json b/composer.json
@@ -19,14 +19,14 @@
         "doctrine/persistence": "^2.0|^3.0"
     },
     "conflict": {
-        "doctrine/dbal": "<2.13",
+        "doctrine/dbal": "<3",
         "doctrine/orm": "<2.14",
         "doctrine/phpcr-odm": "<1.3.0"
     },
     "require-dev": {
         "ext-sqlite3": "*",
         "doctrine/coding-standard": "^11.1",
-        "doctrine/dbal": "^2.13 || ^3.0",
+        "doctrine/dbal": "^3.0",
         "doctrine/mongodb-odm": "^1.3.0 || ^2.0.0",
         "doctrine/orm": "^2.14",
         "phpstan/phpstan": "^1.10",

diff --git a/src/Purger/ORMPurger.php b/src/Purger/ORMPurger.php
@@ -15,8 +15,6 @@
 use function assert;
 use function count;
 use function in_array;
-use function method_exists;
-use function preg_match;
 
 /**
  * Class responsible for purging databases of data before reloading data fixtures.
@@ -147,31 +145,18 @@ private function getPurgeStatements(): array
 
         $connectionConfiguration = $connection->getConfiguration();
 
-        $filterExpr = method_exists(
-            $connectionConfiguration,
-            'getFilterSchemaAssetsExpression',
-        ) ? $connectionConfiguration->getFilterSchemaAssetsExpression() : null;
-
-        $schemaAssetsFilter = method_exists(
-            $connectionConfiguration,
-            'getSchemaAssetsFilter',
-        ) ? $connectionConfiguration->getSchemaAssetsFilter() : null;
+        $schemaAssetsFilter = $connectionConfiguration->getSchemaAssetsFilter()
+            ?? static fn (): bool => true;
 
         $this->cachedSqlStatements = [];
-        $hasFilterExpression       = ! empty($filterExpr);
         foreach ($orderedTables as $tbl) {
-            // If we have a filter expression, check it and skip if necessary
-            if ($hasFilterExpression && ! preg_match($filterExpr, $tbl)) {
-                continue;
-            }
-
             // If the table is excluded, skip it as well
             if (in_array($tbl, $this->excluded)) {
                 continue;
             }
 
             // Support schema asset filters as presented in
-            if ($schemaAssetsFilter !== null && ! $schemaAssetsFilter($tbl)) {
+            if (! $schemaAssetsFilter($tbl)) {
                 continue;
             }
 
@@ -190,7 +175,7 @@ private function getPurgeStatements(): array
      *
      * @return ClassMetadata[]
      */
-    private function getCommitOrder(EntityManagerInterface $em, array $classes)
+    private function getCommitOrder(EntityManagerInterface $em, array $classes): array
     {
         $sorter = new TopologicalSorter();
 
@@ -249,7 +234,7 @@ private function getCommitOrder(EntityManagerInterface $em, array $classes)
      *
      * @return string[]
      */
-    private function getAssociationTables(array $classes, AbstractPlatform $platform)
+    private function getAssociationTables(array $classes, AbstractPlatform $platform): array
     {
         $associationTables = [];
 
@@ -268,13 +253,6 @@ private function getAssociationTables(array $classes, AbstractPlatform $platform
 
     private function getTableName(ClassMetadata $class, AbstractPlatform $platform): string
     {
-        if (isset($class->table['schema']) && ! method_exists($class, 'getSchemaName')) {
-            return $class->table['schema'] . '.' .
-                $this->em->getConfiguration()
-                ->getQuoteStrategy()
-                ->getTableName($class, $platform);
-        }
-
         return $this->em->getConfiguration()->getQuoteStrategy()->getTableName($class, $platform);
     }
 
@@ -284,13 +262,6 @@ private function getJoinTableName(
         ClassMetadata $class,
         AbstractPlatform $platform
     ): string {
-        if (isset($assoc['joinTable']['schema']) && ! method_exists($class, 'getSchemaName')) {
-            return $assoc['joinTable']['schema'] . '.' .
-                $this->em->getConfiguration()
-                ->getQuoteStrategy()
-                ->getJoinTableName($assoc, $class, $platform);
-        }
-
         return $this->em->getConfiguration()->getQuoteStrategy()->getJoinTableName($assoc, $class, $platform);
     }
 

diff --git a/src/ReferenceRepository.php b/src/ReferenceRepository.php
@@ -7,13 +7,13 @@
 use BadMethodCallException;
 use Doctrine\Deprecations\Deprecation;
 use Doctrine\ODM\PHPCR\DocumentManager as PhpcrDocumentManager;
+use Doctrine\ORM\UnitOfWork as OrmUnitOfWork;
 use Doctrine\Persistence\ObjectManager;
 use OutOfBoundsException;
 
 use function array_key_exists;
 use function array_keys;
 use function get_class;
-use function method_exists;
 use function sprintf;
 
 /**
@@ -85,7 +85,7 @@ protected function getIdentifier($reference, $uow)
         }
 
         // Dealing with ORM UnitOfWork
-        if (method_exists($uow, 'getEntityIdentifier')) {
+        if ($uow instanceof OrmUnitOfWork) {
             return $uow->getEntityIdentifier($reference);
         }
 

diff --git a/tests/Common/DataFixtures/Purger/ORMPurgerExcludeTest.php b/tests/Common/DataFixtures/Purger/ORMPurgerExcludeTest.php
@@ -14,7 +14,6 @@
 
 use function count;
 use function extension_loaded;
-use function method_exists;
 use function preg_match;
 
 class ORMPurgerExcludeTest extends BaseTestCase
@@ -35,12 +34,6 @@ protected function loadTestData(): EntityManager
         $config   = ORMSetup::createAnnotationMetadataConfiguration([__DIR__ . '/../TestPurgeEntity'], true);
         $em       = new EntityManager(DriverManager::getConnection($dbParams, $config), $config);
 
-        $connection    = $em->getConnection();
-        $configuration = $connection->getConfiguration();
-        if (method_exists($configuration, 'setFilterSchemaAssetsExpression')) {
-            $configuration->setFilterSchemaAssetsExpression(null);
-        }
-
         $schemaTool = new SchemaTool($em);
         $schemaTool->dropDatabase();
         $schemaTool->createSchema([
@@ -66,7 +59,7 @@ protected function loadTestData(): EntityManager
      *
      * @param string[] $list
      */
-    public function executeTestPurge(?string $expression, array $list, ?callable $filter = null): void
+    private function executeTestPurge(array $list, ?callable $filter): void
     {
         $em                 = $this->loadTestData();
         $excludedRepository = $em->getRepository(self::TEST_ENTITY_EXCLUDED);
@@ -80,19 +73,8 @@ public function executeTestPurge(?string $expression, array $list, ?callable $fi
 
         $connection    = $em->getConnection();
         $configuration = $connection->getConfiguration();
-        if ($expression !== null) {
-            if (! method_exists($configuration, 'setFilterSchemaAssetsExpression')) {
-                $this->markTestSkipped('DBAL 2 is required to test schema assets filters');
-            }
-
-            $configuration->setFilterSchemaAssetsExpression($expression);
-        }
 
         if ($filter !== null) {
-            if (! method_exists($configuration, 'setSchemaAssetsFilter')) {
-                $this->markTestSkipped('DBAL 2.9 or newer is required to test schema assets filters');
-            }
-
             $configuration->setSchemaAssetsFilter($filter);
         }
 
@@ -106,26 +88,19 @@ public function executeTestPurge(?string $expression, array $list, ?callable $fi
         $this->assertGreaterThan(0, count($excluded));
     }
 
-    /**
-     * Test for purge exclusion usig dbal filter expression regexp.
-     */
-    public function testPurgeExcludeUsingFilterExpression(): void
-    {
-        $this->executeTestPurge('~^(?!ExcludedEntity)~', [], null);
-    }
-
     /**
      * Test for purge exclusion usig explicit exclution list.
      */
     public function testPurgeExcludeUsingList(): void
     {
-        $this->executeTestPurge(null, ['ExcludedEntity'], null);
+        $this->executeTestPurge(['ExcludedEntity'], null);
     }
 
     public function testPurgeExcludeUsingFilterCallable(): void
     {
-        $this->executeTestPurge(null, [], static function (string $table): bool {
-            return (bool) preg_match('~^(?!ExcludedEntity)~', $table);
-        });
+        $this->executeTestPurge(
+            [],
+            static fn (string $table): bool => (bool) preg_match('~^(?!ExcludedEntity)~', $table),
+        );
     }
 }