Merge pull request #5553 from morozov/query-builder-enums

Remove deprecated QueryBuilder methods and constants

UPGRADE.md

@@ -289,9 +289,22 @@ DBAL is now tested only with SQL Server 2017 and newer.
 
 The `Statement::execute()` method has been marked private.
 
-## BC BREAK: Removed `QueryBuilder::execute()`.
+## BC BREAK: Removed `QueryBuilder` methods and contstants.
 
-The `QueryBuilder::execute()` method has been removed.
+The following `QueryBuilder` methods have been removed:
+
+1. `execute()`,
+2. `getState()`,
+3. `getType()`.
+
+The following `QueryBuilder` constants have been removed:
+
+1. `SELECT`,
+2. `DELETE`,
+3. `UPDATE`,
+4. `INSERT`,
+5. `STATE_DIRTY`,
+6. `STATE_CLEAN`.
 
 ## BC BREAK: Removed the `Constraint` interface.
 

psalm.xml.dist

@@ -32,27 +32,13 @@
                 <file name="src/Driver/OCI8/ConvertPositionalToNamedPlaceholders.php"/>
             </errorLevel>
         </ConflictingReferenceConstraint>
-        <DeprecatedConstant>
-            <errorLevel type="suppress">
-                <!--
-                    TODO: remove in 4.0.0
-                -->
-                <file name="src/Query/QueryBuilder.php"/>
-                <file name="tests/Query/QueryBuilderTest.php"/>
-            </errorLevel>
-        </DeprecatedConstant>
         <DeprecatedMethod>
             <errorLevel type="suppress">
                 <!--
                     This suppression should be removed after 2022
                     See https://github.com/doctrine/dbal/pull/4317
                 -->
                 <file name="tests/Functional/LegacyAPITest.php"/>
-                <!--
-                    TODO: remove in 4.0.0
-                -->
-                <referencedMethod name="Doctrine\DBAL\Query\QueryBuilder::getState"/>
-                <referencedMethod name="Doctrine\DBAL\Query\QueryBuilder::getType"/>
             </errorLevel>
         </DeprecatedMethod>
         <DocblockTypeContradiction>