feat: dbal 4.0 compatibility

Author: williarin

composer.json

@@ -20,7 +20,7 @@
     "require": {
         "php": ">=8.0",
         "doctrine/annotations": "^2.0",
-        "doctrine/dbal": "^3.3",
+        "doctrine/dbal": "^3.8 || ^4.0",
         "phpdocumentor/reflection-docblock": "^5.3",
         "phpstan/phpdoc-parser": "^1.27",
         "symfony/config": "^6.0 || ^7.0",

src/Bridge/Repository/AbstractEntityRepository.php

@@ -6,6 +6,7 @@
 
 use Doctrine\DBAL\Query\Expression\CompositeExpression;
 use Doctrine\DBAL\Query\QueryBuilder;
+use Doctrine\DBAL\Query\QueryException;
 use JetBrains\PhpStorm\ArrayShape;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 use Symfony\Component\Serializer\NameConverter\CamelCaseToSnakeCaseNameConverter;
@@ -174,8 +175,10 @@ public function createFindByQueryBuilder(array $criteria, ?array $orderBy): Quer
 
         $this->addOrderByClause($queryBuilder, $orderBy);
 
-        $queryBuilder->addSelect(...$this->additionalFieldsToSelect);
-        $this->additionalFieldsToSelect = [];
+        if (!empty($this->additionalFieldsToSelect)) {
+            $queryBuilder->addSelect(...$this->additionalFieldsToSelect);
+            $this->additionalFieldsToSelect = [];
+        }
 
         return $queryBuilder;
     }
@@ -561,8 +564,12 @@ private function joinSelfMetaTable(QueryBuilder $queryBuilder, bool $incrementIf
 
     private function hasJoin(QueryBuilder $queryBuilder, string $joinAlias): bool
     {
-        if (preg_match_all('/JOIN (\w+) (\w+) ON p\./im', $queryBuilder->getSQL(), $matches, PREG_SET_ORDER)) {
-            return count(array_filter($matches, static fn (array $match) => $match[2] === $joinAlias)) > 0;
+        try {
+            if (preg_match_all('/JOIN (\w+) (\w+) ON p\./im', $queryBuilder->getSQL(), $matches, PREG_SET_ORDER)) {
+                return count(array_filter($matches, static fn (array $match) => $match[2] === $joinAlias)) > 0;
+            }
+        } catch (QueryException) {
+            return false;
         }
 
         return false;

src/Bridge/Repository/TermRepository.php

@@ -50,10 +50,10 @@ public function createFindByQueryBuilder(array $criteria, ?array $orderBy): Quer
                 $this->getPrefixedFields(['term_id', 'name', 'slug', 'taxonomy', 'term_taxonomy_id', 'count']),
             );
 
-            $queryBuilder->select([
+            $queryBuilder->select(
                 ...$this->getPrefixedFields(['term_id', 'name', 'slug', 'taxonomy', 'term_taxonomy_id', 'count']),
-                ...$extraFields,
-            ]);
+                ...$extraFields
+            );
         } else {
             foreach ($this->getPrefixedFields($selectedFields) as $field) {
                 if (!\in_array($field, $groupByFields, true)) {
@@ -152,19 +152,21 @@ public function removeTermsFromEntity(BaseEntity $entity, array $terms): void
 
     private function recountTerms(): void
     {
+        $tableName = $this->entityManager->getTablesPrefix() . 'term_taxonomy';
+
         $subSelect = $this->entityManager->getConnection()
             ->createQueryBuilder()
             ->select('COUNT(*)')
             ->from($this->entityManager->getTablesPrefix() . 'term_relationships', 'tr')
             ->leftJoin('tr', $this->entityManager->getTablesPrefix() . 'posts', 'p', 'p.id = tr.object_id')
-            ->where('tr.term_taxonomy_id = tt.term_taxonomy_id')
-            ->andWhere("tt.taxonomy NOT IN ('link_category')")
+            ->where("tr.term_taxonomy_id = $tableName.term_taxonomy_id")
+            ->andWhere("$tableName.taxonomy NOT IN ('link_category')")
             ->andWhere("p.post_status IN ('publish', 'future')")
         ;
 
         $this->entityManager->getConnection()
             ->createQueryBuilder()
-            ->update($this->entityManager->getTablesPrefix() . 'term_taxonomy', 'tt')
+            ->update($tableName)
             ->set('count', sprintf('(%s)', $subSelect->getSQL()))
             ->executeStatement()
         ;

test/Test/TestCase.php

@@ -7,6 +7,7 @@
 use Doctrine\Common\Annotations\AnnotationReader;
 use Doctrine\DBAL\Connection;
 use Doctrine\DBAL\DriverManager;
+use Doctrine\DBAL\Tools\DsnParser;
 use PHPUnit\Framework\TestCase as BaseTestCase;
 use Symfony\Component\PropertyInfo\Extractor\ReflectionExtractor;
 use Symfony\Component\Serializer\Mapping\Factory\ClassMetadataFactory;
@@ -39,7 +40,10 @@ abstract class TestCase extends BaseTestCase
 
     protected function setUp(): void
     {
-        $this->connection = DriverManager::getConnection(['url' => getenv('WORDPRESS_DATABASE_URL')]);
+        $dsnParser  = new DsnParser(['mysql' => 'pdo_mysql']);
+        $this->connection = DriverManager::getConnection(
+            $dsnParser->parse(getenv('WORDPRESS_DATABASE_URL'))
+        );
 
         $loader = class_exists('\\Symfony\\Component\\Serializer\\Mapping\\Loader\\AnnotationLoader')
             ? new AnnotationLoader(new AnnotationReader())