Drop support for DBAL 3

doctrine · Mar 3, 2024 · f2546e6 · f2546e6
1 parent fdd84a2
commit f2546e6
Show file tree

Hide file tree

Showing 48 changed files with 109 additions and 636 deletions.
diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
@@ -38,7 +38,6 @@ jobs:
           - "8.3"
         dbal-version:
           - "default"
-          - "3.7"
         extension:
           - "sqlite3"
           - "pdo_sqlite"
@@ -109,7 +108,6 @@ jobs:
           - "8.3"
         dbal-version:
           - "default"
-          - "3.7"
         postgres-version:
           - "15"
         extension:
@@ -121,8 +119,8 @@ jobs:
             postgres-version: "14"
             extension: pdo_pgsql
           - php-version: "8.2"
-            dbal-version: "3.7"
-            postgres-version: "9.6"
+            dbal-version: "default"
+            postgres-version: "10"
             extension: pdo_pgsql
 
     services:
@@ -182,7 +180,6 @@ jobs:
           - "8.3"
         dbal-version:
           - "default"
-          - "3.7"
           - "4@dev"
         mariadb-version:
           - "10.9"
@@ -248,7 +245,6 @@ jobs:
           - "8.3"
         dbal-version:
           - "default"
-          - "3.7"
         mysql-version:
           - "5.7"
           - "8.0"

diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml
@@ -27,14 +27,6 @@ jobs:
     name: Static Analysis with PHPStan
     runs-on: ubuntu-22.04
 
-    strategy:
-      matrix:
-        include:
-        - dbal-version: default
-          config: phpstan.neon
-        - dbal-version: 3.8.2
-          config: phpstan-dbal3.neon
-
     steps:
       - name: "Checkout code"
         uses: "actions/checkout@v4"
@@ -46,27 +38,16 @@ jobs:
           php-version: "8.3"
           tools: cs2pr
 
-      - name: Require specific DBAL version
-        run: "composer require doctrine/dbal ^${{ matrix.dbal-version }} --no-update"
-        if: "${{ matrix.dbal-version != 'default' }}"
-
-
       - name: Install dependencies with Composer
         uses: ramsey/composer-install@v2
 
       - name: Run static analysis with phpstan/phpstan
-        run: "vendor/bin/phpstan analyse -c ${{ matrix.config }} --error-format=checkstyle | cs2pr"
+        run: "vendor/bin/phpstan analyse --error-format=checkstyle | cs2pr"
 
   static-analysis-psalm:
     name: Static Analysis with Psalm
     runs-on: ubuntu-22.04
 
-    strategy:
-      matrix:
-        dbal-version:
-        - default
-        - 3.8.2
-
     steps:
       - name: "Checkout code"
         uses: "actions/checkout@v4"
@@ -76,11 +57,6 @@ jobs:
         with:
           coverage: none
           php-version: "8.3"
-          tools: cs2pr
-
-      - name: Require specific DBAL version
-        run: "composer require doctrine/dbal ^${{ matrix.dbal-version }} --no-update"
-        if: "${{ matrix.dbal-version != 'default' }}"
 
       - name: Install dependencies with Composer
         uses: ramsey/composer-install@v2

diff --git a/composer.json b/composer.json
@@ -24,7 +24,7 @@
         "composer-runtime-api": "^2",
         "ext-ctype": "*",
         "doctrine/collections": "^2.2",
-        "doctrine/dbal": "^3.8.2 || ^4",
+        "doctrine/dbal": "^4",
         "doctrine/deprecations": "^0.5.3 || ^1",
         "doctrine/event-manager": "^1.2 || ^2",
         "doctrine/inflector": "^1.4 || ^2.0",

diff --git a/phpstan-dbal3.neon b/phpstan-dbal3.neon
diff --git a/phpstan.neon b/phpstan.neon
@@ -12,39 +12,11 @@ parameters:
             message: '~^Match expression does not handle remaining values:~'
             path: src/Persisters/Entity/BasicEntityPersister.php
 
-        # DBAL 4 compatibility
-        -
-            message: '~^Method Doctrine\\ORM\\Query\\AST\\Functions\\TrimFunction::getTrimMode\(\) never returns .* so it can be removed from the return type\.$~'
-            path: src/Query/AST/Functions/TrimFunction.php
-        -
-            message: '~^Method Doctrine\\ORM\\Persisters\\Entity\\BasicEntityPersister\:\:getArrayBindingType\(\) never returns .* so it can be removed from the return type\.$~'
-            path: src/Persisters/Entity/BasicEntityPersister.php
-
+        # To be removed in 4.0
         -
             message: '~^Unreachable statement \- code above always terminates\.$~'
             path: src/Mapping/AssociationMapping.php
 
-        # Compatibility with DBAL 3
-        # See https://github.com/doctrine/dbal/pull/3480
-        -
-            message: '~^Result of method Doctrine\\DBAL\\Connection::commit\(\) \(void\) is used\.$~'
-            path: src/UnitOfWork.php
-        -
-            message: '~^Strict comparison using === between null and false will always evaluate to false\.$~'
-            path: src/UnitOfWork.php
-        -
-            message: '~^Variable \$e on left side of \?\? always exists and is not nullable\.$~'
-            path: src/UnitOfWork.php
-
-        -
-            message: '~^Parameter #1 \$command of method Symfony\\Component\\Console\\Application::add\(\) expects Symfony\\Component\\Console\\Command\\Command, Doctrine\\DBAL\\Tools\\Console\\Command\\ReservedWordsCommand given\.$~'
-            path: src/Tools/Console/ConsoleRunner.php
-
-        -
-            message: '~Strict comparison using \=\=\= between callable\(\)\: mixed and null will always evaluate to false\.~'
-            path: src/Tools/SchemaTool.php
-
-        # To be removed in 4.0
         -
             message: '#Negated boolean expression is always false\.#'
             paths:

diff --git a/psalm-baseline.xml b/psalm-baseline.xml
@@ -861,9 +861,6 @@
     </UninitializedProperty>
   </file>
   <file src="src/Query/Exec/MultiTableUpdateExecutor.php">
-    <InvalidArgument>
-      <code><![CDATA[$paramTypes]]></code>
-    </InvalidArgument>
     <InvalidReturnStatement>
       <code><![CDATA[$numUpdated]]></code>
     </InvalidReturnStatement>

diff --git a/psalm.xml b/psalm.xml
@@ -24,8 +24,6 @@
     <issueHandlers>
         <DeprecatedClass>
             <errorLevel type="suppress">
-                <!-- We wire the command as long as DBAL ships it -->
-                <referencedClass name="Doctrine\DBAL\Tools\Console\Command\ReservedWordsCommand" />
                 <!-- Remove on 3.0.x -->
                 <referencedClass name="Doctrine\ORM\Event\LifecycleEventArgs"/>
                 <referencedClass name="Doctrine\ORM\Exception\UnknownEntityNamespace"/>
@@ -45,22 +43,11 @@
                 <referencedClass name="Doctrine\ORM\Tools\Console\EntityManagerProvider\HelperSetManagerProvider"/>
             </errorLevel>
         </DeprecatedClass>
-        <DeprecatedMethod>
-            <errorLevel type="suppress">
-                <!-- Remove on 3.0.x -->
-                <!-- Compatibility with DBAL 3 -->
-                <referencedMethod name="Doctrine\DBAL\Connection::getEventManager"/>
-                <file name="src/Query/TreeWalkerChain.php"/>
-            </errorLevel>
-        </DeprecatedMethod>
         <DocblockTypeContradiction>
             <errorLevel type="suppress">
                 <!-- We're catching invalid input here. -->
                 <file name="src/Internal/Hydration/AbstractHydrator.php"/>
 
-                <!-- DBAL 3.2 forward compatibility -->
-                <file name="src/Tools/Pagination/CountOutputWalker.php"/>
-                <file name="src/Tools/Pagination/LimitSubqueryOutputWalker.php"/>
                 <!-- https://github.com/vimeo/psalm/issues/8520 -->
                 <file name="src/PersistentCollection.php"/>
                 <!-- Remove on 4.0.x -->
@@ -183,43 +170,13 @@
 
                 <!-- Persistence 2 compatibility -->
                 <referencedFunction name="Doctrine\Persistence\ObjectManager::clear"/>
-
-                <!-- See https://github.com/doctrine/orm/issues/8850 -->
-                <referencedFunction name="Doctrine\DBAL\Connection::lastInsertId"/>
-
-                <!-- FIXME -->
-                <referencedFunction name="Doctrine\DBAL\DriverManager::getConnection"/>
             </errorLevel>
         </TooManyArguments>
-        <TypeDoesNotContainNull>
-            <errorLevel type="suppress">
-                <!-- DBAL 3 compatibility -->
-                <file name="src/Tools/SchemaTool.php"/>
-            </errorLevel>
-        </TypeDoesNotContainNull>
         <TypeDoesNotContainType>
             <errorLevel type="suppress">
-                <file name="src/Internal/SQLResultCasing.php"/>
                 <file name="src/Mapping/ClassMetadataFactory.php"/>
-                <!-- DBAL 3 compatibility -->
-                <file name="src/UnitOfWork.php"/>
-                <file name="src/Utility/LockSqlHelper.php"/>
             </errorLevel>
         </TypeDoesNotContainType>
-        <UndefinedClass>
-            <errorLevel type="suppress">
-                <!-- Compatibility with DBAL 3 -->
-                <referencedClass name="Doctrine\DBAL\Platforms\SQLitePlatform"/>
-            </errorLevel>
-        </UndefinedClass>
-        <UndefinedMethod>
-            <errorLevel type="suppress">
-                <!-- Compatibility with DBAL 3 -->
-                <referencedMethod name="Doctrine\DBAL\Connection::getEventManager"/>
-                <!-- FIXME -->
-                <referencedMethod name="Doctrine\DBAL\Schema\SchemaDiff::toSaveSql"/>
-            </errorLevel>
-        </UndefinedMethod>
         <UndefinedPropertyFetch>
             <errorLevel type="suppress">
                 <!-- https://github.com/vimeo/psalm/issues/7878 -->

diff --git a/src/AbstractQuery.php b/src/AbstractQuery.php
@@ -321,16 +321,16 @@ public function setParameters(ArrayCollection|array $parameters): static
     /**
      * Sets a query parameter.
      *
-     * @param string|int                                       $key   The parameter position or name.
-     * @param mixed                                            $value The parameter value.
-     * @param ParameterType|ArrayParameterType|string|int|null $type  The parameter type. If specified, the given value
-     *                                                                will be run through the type conversion of this
-     *                                                                type. This is usually not needed for strings and
-     *                                                                numeric types.
+     * @param string|int                                   $key   The parameter position or name.
+     * @param mixed                                        $value The parameter value.
+     * @param ParameterType|ArrayParameterType|string|null $type  The parameter type. If specified, the given value
+     *                                                            will be run through the type conversion of this
+     *                                                            type. This is usually not needed for strings and
+     *                                                            numeric types.
      *
      * @return $this
      */
-    public function setParameter(string|int $key, mixed $value, ParameterType|ArrayParameterType|string|int|null $type = null): static
+    public function setParameter(string|int $key, mixed $value, ParameterType|ArrayParameterType|string|null $type = null): static
     {
         $existingParameter = $this->getParameter($key);
 

diff --git a/src/Cache/Persister/Entity/AbstractEntityPersister.php b/src/Cache/Persister/Entity/AbstractEntityPersister.php
@@ -90,7 +90,7 @@ public function getInserts(): array
     public function getSelectSQL(
         array|Criteria $criteria,
         AssociationMapping|null $assoc = null,
-        LockMode|int|null $lockMode = null,
+        LockMode|null $lockMode = null,
         int|null $limit = null,
         int|null $offset = null,
         array|null $orderBy = null,
@@ -290,7 +290,7 @@ public function load(
         object|null $entity = null,
         AssociationMapping|null $assoc = null,
         array $hints = [],
-        LockMode|int|null $lockMode = null,
+        LockMode|null $lockMode = null,
         int|null $limit = null,
         array|null $orderBy = null,
     ): object|null {
@@ -533,15 +533,15 @@ public function loadOneToOneEntity(AssociationMapping $assoc, object $sourceEnti
     /**
      * {@inheritDoc}
      */
-    public function lock(array $criteria, LockMode|int $lockMode): void
+    public function lock(array $criteria, LockMode $lockMode): void
     {
         $this->persister->lock($criteria, $lockMode);
     }
 
     /**
      * {@inheritDoc}
      */
-    public function refresh(array $id, object $entity, LockMode|int|null $lockMode = null): void
+    public function refresh(array $id, object $entity, LockMode|null $lockMode = null): void
     {
         $this->persister->refresh($id, $entity, $lockMode);
     }

diff --git a/src/Decorator/EntityManagerDecorator.php b/src/Decorator/EntityManagerDecorator.php
@@ -107,17 +107,17 @@ public function close(): void
         $this->wrapped->close();
     }
 
-    public function lock(object $entity, LockMode|int $lockMode, DateTimeInterface|int|null $lockVersion = null): void
+    public function lock(object $entity, LockMode $lockMode, DateTimeInterface|int|null $lockVersion = null): void
     {
         $this->wrapped->lock($entity, $lockMode, $lockVersion);
     }
 
-    public function find(string $className, mixed $id, LockMode|int|null $lockMode = null, int|null $lockVersion = null): object|null
+    public function find(string $className, mixed $id, LockMode|null $lockMode = null, int|null $lockVersion = null): object|null
     {
         return $this->wrapped->find($className, $id, $lockMode, $lockVersion);
     }
 
-    public function refresh(object $object, LockMode|int|null $lockMode = null): void
+    public function refresh(object $object, LockMode|null $lockMode = null): void
     {
         $this->wrapped->refresh($object, $lockMode);
     }