Merge pull request #4125 from morozov/remove-deprecated-driver-classes

Remove deprecated driver classes

UPGRADE.md

@@ -1,5 +1,26 @@
 # Upgrade to 3.0
 
+## BC BREAK: Deprecated driver-level classes and interfaces are removed.
+
+- `AbstractDriverException`
+- `DriverException`
+- `PDOConnection`
+- `PDOException`
+- `PDOStatement`
+- `IBMDB2\DB2Connection`
+- `IBMDB2\DB2Driver`
+- `IBMDB2\DB2Exception`
+- `IBMDB2\DB2Statement`
+- `Mysqli\MysqliConnection`
+- `Mysqli\MysqliException`
+- `Mysqli\MysqliStatement`
+- `OCI8\OCI8Connection`
+- `OCI8\OCI8Exception`
+- `OCI8\OCI8Statement`
+- `SQLSrv\SQLSrvConnection`
+- `SQLSrv\SQLSrvException`
+- `SQLSrv\SQLSrvStatement`
+
 ## BC BREAK: `ServerInfoAwareConnection::requiresQueryForServerVersion()` is removed.
 
 The `ServerInfoAwareConnection::requiresQueryForServerVersion()` method has been removed as an implementation detail which is the same for all supported drivers.

phpcs.xml.dist

@@ -87,9 +87,8 @@
             phpcs wrongly complains about them, and that has been reported here:
             https://github.com/squizlabs/PHP_CodeSniffer/issues/2950
         -->
-        <exclude-pattern>src/Driver/IBMDB2/DB2Connection.php</exclude-pattern>
+        <exclude-pattern>src/Driver/IBMDB2/Connection.php</exclude-pattern>
         <exclude-pattern>src/Driver/Mysqli/Exception/ConnectionFailed.php</exclude-pattern>
-        <exclude-pattern>src/Driver/Mysqli/MysqliConnection.php</exclude-pattern>
         <!-- See https://github.com/squizlabs/PHP_CodeSniffer/issues/2837 -->
         <exclude-pattern>src/SQLParserUtils.php</exclude-pattern>
         <exclude-pattern>src/Tools/Dumper.php</exclude-pattern>
@@ -112,15 +111,9 @@
         <exclude-pattern>src/Schema/Comparator.php</exclude-pattern>
     </rule>
 
-    <!-- DB2_AUTOCOMMIT_ON/DB2_AUTOCOMMIT_OFF are of int type but db2_autocommit() incorrectly expects bool,
-         see https://bugs.php.net/bug.php?id=77591 -->
-    <rule ref="SlevomatCodingStandard.TypeHints.DeclareStrictTypes.DeclareStrictTypesMissing">
-        <exclude-pattern>src/Driver/IBMDB2/DB2Connection.php</exclude-pattern>
-    </rule>
-
     <!-- The SQLSRV_* functions are defined in the upper case by the sqlsrv extension and violate the standard
          see https://docs.microsoft.com/en-us/sql/connect/php/constants-microsoft-drivers-for-php-for-sql-server -->
     <rule ref="Squiz.PHP.LowercasePHPFunctions">
-        <exclude-pattern>src/Driver/SQLSrv/SQLSrvStatement.php</exclude-pattern>
+        <exclude-pattern>src/Driver/SQLSrv/Statement.php</exclude-pattern>
     </rule>
 </ruleset>

phpstan.neon.dist

@@ -19,7 +19,7 @@ parameters:
         # changing these would be a BC break, to be done in next major
         - "~^Casting to bool something that's already bool.~"
         - '~^Property Doctrine\\DBAL\\Schema\\Schema::\$_schemaConfig \(Doctrine\\DBAL\\Schema\\SchemaConfig\) does not accept default value of type false\.\z~'
-        - '~^Return type \(int\|false\) of method Doctrine\\DBAL\\Driver\\OCI8\\OCI8Connection\:\:lastInsertId\(\) should be compatible with return type \(string\) of method Doctrine\\DBAL\\Driver\\Connection::lastInsertId\(\)~'
+        - '~^Return type \(int\|false\) of method Doctrine\\DBAL\\Driver\\OCI8\\Connection\:\:lastInsertId\(\) should be compatible with return type \(string\) of method Doctrine\\DBAL\\Driver\\Connection::lastInsertId\(\)~'
 
         # https://github.com/phpstan/phpstan/issues/2857
         # TODO: remove in 4.0.0
@@ -48,12 +48,12 @@ parameters:
         # Requires a release of https://github.com/JetBrains/phpstorm-stubs/pull/553
         -
             message: '~^Call to function assert\(\) with true will always evaluate to true\.$~'
-            path: %currentWorkingDirectory%/src/Driver/PDOConnection.php
+            path: %currentWorkingDirectory%/src/Driver/PDO/Connection.php
 
         # Requires a release of https://github.com/JetBrains/phpstorm-stubs/pull/553
         -
             message: '~^Strict comparison using !== between int and false will always evaluate to true\.$~'
-            path: %currentWorkingDirectory%/src/Driver/PDOConnection.php
+            path: %currentWorkingDirectory%/src/Driver/PDO/Connection.php
 
         # False Positive
         - '~Strict comparison using === between 1 and 2 will always evaluate to false~'

psalm.xml

@@ -38,7 +38,7 @@
                     Fixing these issues requires an API change
                 -->
                 <file name="src/Driver/PDOSqlsrv/Connection.php"/>
-                <file name="src/Driver/SQLSrv/SQLSrvConnection.php"/>
+                <file name="src/Driver/SQLSrv/Connection.php"/>
             </errorLevel>
         </FalsableReturnStatement>
         <NullableReturnStatement>
@@ -55,7 +55,7 @@
                     Requires a release of
                     https://github.com/JetBrains/phpstorm-stubs/pull/727
                 -->
-                <file name="src/Driver/SQLSrv/SQLSrvStatement.php"/>
+                <file name="src/Driver/SQLSrv/Statement.php"/>
             </errorLevel>
         </TooFewArguments>
         <UndefinedConstant>

src/Connection.php

@@ -10,7 +10,7 @@
 use Doctrine\DBAL\Cache\CachingResult;
 use Doctrine\DBAL\Cache\QueryCacheProfile;
 use Doctrine\DBAL\Driver\Connection as DriverConnection;
-use Doctrine\DBAL\Driver\DriverException;
+use Doctrine\DBAL\Driver\Exception as DriverException;
 use Doctrine\DBAL\Driver\PingableConnection;
 use Doctrine\DBAL\Driver\Result as DriverResult;
 use Doctrine\DBAL\Driver\ServerInfoAwareConnection;

src/Connections/PrimaryReadReplicaConnection.php

@@ -8,7 +8,7 @@
 use Doctrine\DBAL\DBALException;
 use Doctrine\DBAL\Driver;
 use Doctrine\DBAL\Driver\Connection as DriverConnection;
-use Doctrine\DBAL\Driver\DriverException;
+use Doctrine\DBAL\Driver\Exception as DriverException;
 use Doctrine\DBAL\Driver\Result;
 use Doctrine\DBAL\Driver\Statement;
 use Doctrine\DBAL\Event\ConnectionEventArgs;

src/DBALException.php

@@ -2,7 +2,7 @@
 
 namespace Doctrine\DBAL;
 
-use Doctrine\DBAL\Driver\DriverException as DeprecatedDriverException;
+use Doctrine\DBAL\Driver\Exception as TheDriverException;
 use Doctrine\DBAL\Driver\ExceptionConverterDriver;
 use Doctrine\DBAL\Exception\DriverException;
 use Doctrine\DBAL\Platforms\AbstractPlatform;
@@ -169,7 +169,7 @@ private static function wrapException(Driver $driver, Throwable $driverEx, strin
             return $driverEx;
         }
 
-        if ($driver instanceof ExceptionConverterDriver && $driverEx instanceof DeprecatedDriverException) {
+        if ($driver instanceof ExceptionConverterDriver && $driverEx instanceof TheDriverException) {
             return $driver->convertException($msg, $driverEx);
         }
 

src/Driver.php

@@ -3,7 +3,7 @@
 namespace Doctrine\DBAL;
 
 use Doctrine\DBAL\Driver\Connection as DriverConnection;
-use Doctrine\DBAL\Driver\DriverException;
+use Doctrine\DBAL\Driver\Exception;
 use Doctrine\DBAL\Platforms\AbstractPlatform;
 use Doctrine\DBAL\Schema\AbstractSchemaManager;
 
@@ -20,7 +20,7 @@ interface Driver
      *
      * @return DriverConnection The database connection.
      *
-     * @throws DriverException
+     * @throws Exception
      */
     public function connect(array $params);
 

src/Driver/AbstractDB2Driver.php

@@ -4,7 +4,7 @@
 
 use Doctrine\DBAL\Connection;
 use Doctrine\DBAL\Driver;
-use Doctrine\DBAL\Driver\DriverException as TheDriverException;
+use Doctrine\DBAL\Driver\Exception as TheDriverException;
 use Doctrine\DBAL\Exception\DriverException;
 use Doctrine\DBAL\Platforms\DB2Platform;
 use Doctrine\DBAL\Schema\DB2SchemaManager;

src/Driver/AbstractException.php

@@ -14,7 +14,7 @@
  *
  * @psalm-immutable
  */
-abstract class AbstractException extends BaseException implements DriverException
+abstract class AbstractException extends BaseException implements Exception
 {
     /**
      * The SQLSTATE of the driver.

src/Driver/AbstractMySQLDriver.php

@@ -4,7 +4,7 @@
 
 use Doctrine\DBAL\Connection;
 use Doctrine\DBAL\DBALException;
-use Doctrine\DBAL\Driver\DriverException as DeprecatedDriverException;
+use Doctrine\DBAL\Driver\Exception as TheDriverException;
 use Doctrine\DBAL\Exception\ConnectionException;
 use Doctrine\DBAL\Exception\ConnectionLost;
 use Doctrine\DBAL\Exception\DeadlockException;
@@ -40,7 +40,7 @@ abstract class AbstractMySQLDriver implements ExceptionConverterDriver, VersionA
      * @link https://dev.mysql.com/doc/refman/8.0/en/client-error-reference.html
      * @link https://dev.mysql.com/doc/refman/8.0/en/server-error-reference.html
      */
-    public function convertException($message, DeprecatedDriverException $exception)
+    public function convertException($message, TheDriverException $exception)
     {
         switch ($exception->getCode()) {
             case 1213:

src/Driver/AbstractOracleDriver.php

@@ -5,7 +5,7 @@
 use Doctrine\DBAL\Connection;
 use Doctrine\DBAL\Driver;
 use Doctrine\DBAL\Driver\AbstractOracleDriver\EasyConnectString;
-use Doctrine\DBAL\Driver\DriverException as DeprecatedDriverException;
+use Doctrine\DBAL\Driver\Exception as TheDriverException;
 use Doctrine\DBAL\Exception\ConnectionException;
 use Doctrine\DBAL\Exception\DriverException;
 use Doctrine\DBAL\Exception\ForeignKeyConstraintViolationException;
@@ -27,7 +27,7 @@ abstract class AbstractOracleDriver implements Driver, ExceptionConverterDriver
     /**
      * {@inheritdoc}
      */
-    public function convertException($message, DeprecatedDriverException $exception)
+    public function convertException($message, TheDriverException $exception)
     {
         switch ($exception->getCode()) {
             case 1:

src/Driver/AbstractPostgreSQLDriver.php

@@ -4,7 +4,7 @@
 
 use Doctrine\DBAL\Connection;
 use Doctrine\DBAL\DBALException;
-use Doctrine\DBAL\Driver\DriverException as DeprecatedDriverException;
+use Doctrine\DBAL\Driver\Exception as TheDriverException;
 use Doctrine\DBAL\Exception\ConnectionException;
 use Doctrine\DBAL\Exception\DeadlockException;
 use Doctrine\DBAL\Exception\DriverException;
@@ -35,7 +35,7 @@ abstract class AbstractPostgreSQLDriver implements ExceptionConverterDriver, Ver
      *
      * @link http://www.postgresql.org/docs/9.4/static/errcodes-appendix.html
      */
-    public function convertException($message, DeprecatedDriverException $exception)
+    public function convertException($message, TheDriverException $exception)
     {
         switch ($exception->getSQLState()) {
             case '40001':

src/Driver/AbstractSQLServerDriver.php

@@ -4,7 +4,7 @@
 
 use Doctrine\DBAL\Connection;
 use Doctrine\DBAL\Driver;
-use Doctrine\DBAL\Driver\DriverException as TheDriverException;
+use Doctrine\DBAL\Driver\Exception as TheDriverException;
 use Doctrine\DBAL\Exception\DriverException;
 use Doctrine\DBAL\Platforms\SQLServer2012Platform;
 use Doctrine\DBAL\Schema\SQLServerSchemaManager;

src/Driver/AbstractSQLiteDriver.php

@@ -4,7 +4,7 @@
 
 use Doctrine\DBAL\Connection;
 use Doctrine\DBAL\Driver;
-use Doctrine\DBAL\Driver\DriverException as DeprecatedDriverException;
+use Doctrine\DBAL\Driver\Exception as TheDriverException;
 use Doctrine\DBAL\Exception\ConnectionException;
 use Doctrine\DBAL\Exception\DriverException;
 use Doctrine\DBAL\Exception\ForeignKeyConstraintViolationException;
@@ -32,7 +32,7 @@ abstract class AbstractSQLiteDriver implements Driver, ExceptionConverterDriver
      *
      * @link http://www.sqlite.org/c3ref/c_abort.html
      */
-    public function convertException($message, DeprecatedDriverException $exception)
+    public function convertException($message, TheDriverException $exception)
     {
         if (strpos($exception->getMessage(), 'database is locked') !== false) {
             return new LockWaitTimeoutException($message, $exception);

src/Driver/ExceptionConverterDriver.php

@@ -3,7 +3,7 @@
 namespace Doctrine\DBAL\Driver;
 
 use Doctrine\DBAL\Driver;
-use Doctrine\DBAL\Driver\DriverException as TheDriverException;
+use Doctrine\DBAL\Driver\Exception as TheDriverException;
 use Doctrine\DBAL\Exception\DriverException;
 
 /**