Remove deprecated exception classes

UPGRADE.md

 # Upgrade to 3.0
 
+## BC BREAK: Deprecated driver-level classes and interfaces are removed.
+
+- `AbstractDriverException`
+- `DriverException`
+- `PDOException`
+- `IBMDB2\DB2Exception`
+- `Mysqli\MysqliException`
+- `OCI8\OCI8Exception`
+- `SQLSrv\SQLSrvException`
+
 ## 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.

src/Connection.php

@@ -10,7 +10,7 @@ use Doctrine\DBAL\Cache\CacheException;
 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\Connection;
 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 @@ class DBALException extends Exception
             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 @@ namespace Doctrine\DBAL\Driver;
 
 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/AbstractDriverException.php

-<?php
-
-namespace Doctrine\DBAL\Driver;
-
-/**
- * @deprecated
- *
- * @psalm-immutable
- */
-abstract class AbstractDriverException extends AbstractException
-{
-}

src/Driver/AbstractException.php

@@ -14,7 +14,7 @@ use Throwable;
  *
  * @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 @@ namespace Doctrine\DBAL\Driver;
 
 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 @@ namespace Doctrine\DBAL\Driver;
 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 @@ namespace Doctrine\DBAL\Driver;
 
 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 @@ namespace Doctrine\DBAL\Driver;
 
 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 @@ namespace Doctrine\DBAL\Driver;
 
 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/DriverException.php

-<?php
-
-namespace Doctrine\DBAL\Driver;
-
-/**
- * @deprecated Use {@link Exception} instead
- *
- * @psalm-immutable
- */
-interface DriverException extends 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;
 
 /**

src/Driver/IBMDB2/DB2Connection.php

@@ -2,6 +2,7 @@
 
 namespace Doctrine\DBAL\Driver\IBMDB2;
 
+use Doctrine\DBAL\Driver\Exception;
 use Doctrine\DBAL\Driver\IBMDB2\Exception\ConnectionError;
 use Doctrine\DBAL\Driver\IBMDB2\Exception\ConnectionFailed;
 use Doctrine\DBAL\Driver\IBMDB2\Exception\PrepareFailed;
@@ -40,7 +41,7 @@ class DB2Connection implements ServerInfoAwareConnection
     /**
      * @param array<string,mixed> $driverOptions
      *
-     * @throws DB2Exception
+     * @throws Exception
      */
     public function __construct(
         string $database,

src/Driver/IBMDB2/DB2Exception.php

-<?php
-
-namespace Doctrine\DBAL\Driver\IBMDB2;
-
-use Doctrine\DBAL\Driver\AbstractDriverException;
-
-/**
- * @deprecated Use {@link Exception} instead
- *
- * @psalm-immutable
- */
-class DB2Exception extends AbstractDriverException
-{
-}

src/Driver/IBMDB2/DB2Statement.php

@@ -2,6 +2,7 @@
 
 namespace Doctrine\DBAL\Driver\IBMDB2;
 
+use Doctrine\DBAL\Driver\Exception;
 use Doctrine\DBAL\Driver\IBMDB2\Exception\CannotCopyStreamToStream;
 use Doctrine\DBAL\Driver\IBMDB2\Exception\CannotCreateTemporaryFile;
 use Doctrine\DBAL\Driver\IBMDB2\Exception\CannotWriteToTemporaryFile;
@@ -106,7 +107,7 @@ class DB2Statement implements StatementInterface
      * @param int   $position Parameter position
      * @param mixed $variable
      *
-     * @throws DB2Exception
+     * @throws Exception
      */
     private function bind($position, &$variable, int $parameterType, int $dataType): void
     {
@@ -160,7 +161,7 @@ class DB2Statement implements StatementInterface
     /**
      * @return resource
      *
-     * @throws DB2Exception
+     * @throws Exception
      */
     private function createTemporaryFile()
     {
@@ -177,7 +178,7 @@ class DB2Statement implements StatementInterface
      * @param resource $source
      * @param resource $target
      *
-     * @throws DB2Exception
+     * @throws Exception
      */
     private function copyStreamToStream($source, $target): void
     {
@@ -189,7 +190,7 @@ class DB2Statement implements StatementInterface
     /**
      * @param resource $target
      *
-     * @throws DB2Exception
+     * @throws Exception
      */
     private function writeStringToStream(string $string, $target): void
     {

src/Driver/IBMDB2/Exception/CannotCopyStreamToStream.php

@@ -4,14 +4,14 @@ declare(strict_types=1);
 
 namespace Doctrine\DBAL\Driver\IBMDB2\Exception;
 
-use Doctrine\DBAL\Driver\IBMDB2\DB2Exception;
+use Doctrine\DBAL\Driver\AbstractException;
 
 /**
  * @internal
  *
  * @psalm-immutable
  */
-final class CannotCopyStreamToStream extends DB2Exception
+final class CannotCopyStreamToStream extends AbstractException
 {
     public static function new(string $message): self
     {

src/Driver/IBMDB2/Exception/CannotCreateTemporaryFile.php

@@ -4,14 +4,14 @@ declare(strict_types=1);
 
 namespace Doctrine\DBAL\Driver\IBMDB2\Exception;
 
-use Doctrine\DBAL\Driver\IBMDB2\DB2Exception;
+use Doctrine\DBAL\Driver\AbstractException;
 
 /**
  * @internal
  *
  * @psalm-immutable
  */
-final class CannotCreateTemporaryFile extends DB2Exception
+final class CannotCreateTemporaryFile extends AbstractException
 {
     public static function new(string $message): self
     {

src/Driver/IBMDB2/Exception/CannotWriteToTemporaryFile.php

@@ -4,14 +4,14 @@ declare(strict_types=1);
 
 namespace Doctrine\DBAL\Driver\IBMDB2\Exception;
 
-use Doctrine\DBAL\Driver\IBMDB2\DB2Exception;
+use Doctrine\DBAL\Driver\AbstractException;
 
 /**
  * @internal
  *
  * @psalm-immutable
  */
-final class CannotWriteToTemporaryFile extends DB2Exception
+final class CannotWriteToTemporaryFile extends AbstractException
 {
     public static function new(string $message): self
     {

src/Driver/Mysqli/Driver.php

@@ -3,6 +3,7 @@
 namespace Doctrine\DBAL\Driver\Mysqli;
 
 use Doctrine\DBAL\Driver\AbstractMySQLDriver;
+use Doctrine\DBAL\Driver\Mysqli\Exception\HostRequired;
 use Doctrine\DBAL\Driver\Mysqli\Initializer\Charset;
 use Doctrine\DBAL\Driver\Mysqli\Initializer\Options;
 use Doctrine\DBAL\Driver\Mysqli\Initializer\Secure;

src/Driver/Mysqli/Exception/ConnectionError.php

@@ -4,7 +4,7 @@ declare(strict_types=1);
 
 namespace Doctrine\DBAL\Driver\Mysqli\Exception;
 
-use Doctrine\DBAL\Driver\Mysqli\MysqliException;
+use Doctrine\DBAL\Driver\AbstractException;
 use mysqli;
 
 /**
@@ -12,7 +12,7 @@ use mysqli;
  *
  * @psalm-immutable
  */
-final class ConnectionError extends MysqliException
+final class ConnectionError extends AbstractException
 {
     public static function new(mysqli $connection): self
     {

src/Driver/Mysqli/Exception/ConnectionFailed.php

@@ -4,7 +4,7 @@ declare(strict_types=1);
 
 namespace Doctrine\DBAL\Driver\Mysqli\Exception;
 
-use Doctrine\DBAL\Driver\Mysqli\MysqliException;
+use Doctrine\DBAL\Driver\AbstractException;
 use mysqli;
 
 /**
@@ -12,7 +12,7 @@ use mysqli;
  *
  * @psalm-immutable
  */
-final class ConnectionFailed extends MysqliException
+final class ConnectionFailed extends AbstractException
 {
     public static function new(mysqli $connection): self
     {

src/Driver/Mysqli/Exception/FailedReadingStreamOffset.php

@@ -4,7 +4,7 @@ declare(strict_types=1);
 
 namespace Doctrine\DBAL\Driver\Mysqli\Exception;
 
-use Doctrine\DBAL\Driver\Mysqli\MysqliException;
+use Doctrine\DBAL\Driver\AbstractException;
 
 use function sprintf;
 
@@ -13,7 +13,7 @@ use function sprintf;
  *
  * @psalm-immutable
  */
-final class FailedReadingStreamOffset extends MysqliException
+final class FailedReadingStreamOffset extends AbstractException
 {
     public static function new(int $offset): self
     {

src/Driver/Mysqli/HostRequired.php → src/Driver/Mysqli/Exception/HostRequired.php

@@ -2,14 +2,16 @@
 
 declare(strict_types=1);
 
-namespace Doctrine\DBAL\Driver\Mysqli;
+namespace Doctrine\DBAL\Driver\Mysqli\Exception;
+
+use Doctrine\DBAL\Driver\AbstractException;
 
 /**
  * @internal
  *
  * @psalm-immutable
  */
-final class HostRequired extends MysqliException
+final class HostRequired extends AbstractException
 {
     public static function forPersistentConnection(): self
     {

src/Driver/Mysqli/Exception/InvalidCharset.php

@@ -4,7 +4,7 @@ declare(strict_types=1);
 
 namespace Doctrine\DBAL\Driver\Mysqli\Exception;
 
-use Doctrine\DBAL\Driver\Mysqli\MysqliException;
+use Doctrine\DBAL\Driver\AbstractException;
 use mysqli;
 
 use function sprintf;
@@ -14,7 +14,7 @@ use function sprintf;
  *
  * @psalm-immutable
  */
-final class InvalidCharset extends MysqliException
+final class InvalidCharset extends AbstractException
 {
     public static function fromCharset(mysqli $connection, string $charset): self
     {

src/Driver/Mysqli/Exception/InvalidOption.php

@@ -4,7 +4,7 @@ declare(strict_types=1);
 
 namespace Doctrine\DBAL\Driver\Mysqli\Exception;
 
-use Doctrine\DBAL\Driver\Mysqli\MysqliException;
+use Doctrine\DBAL\Driver\AbstractException;
 
 use function sprintf;
 
@@ -13,7 +13,7 @@ use function sprintf;
  *
  * @psalm-immutable
  */
-final class InvalidOption extends MysqliException
+final class InvalidOption extends AbstractException
 {
     /**
      * @param mixed $value

src/Driver/Mysqli/Exception/StatementError.php

@@ -4,7 +4,7 @@ declare(strict_types=1);
 
 namespace Doctrine\DBAL\Driver\Mysqli\Exception;
 
-use Doctrine\DBAL\Driver\Mysqli\MysqliException;
+use Doctrine\DBAL\Driver\AbstractException;
 use mysqli_stmt;
 
 /**
@@ -12,7 +12,7 @@ use mysqli_stmt;
  *
  * @psalm-immutable
  */
-final class StatementError extends MysqliException
+final class StatementError extends AbstractException
 {
     public static function new(mysqli_stmt $statement): self
     {

src/Driver/Mysqli/Exception/UnknownType.php

@@ -4,7 +4,7 @@ declare(strict_types=1);
 
 namespace Doctrine\DBAL\Driver\Mysqli\Exception;
 
-use Doctrine\DBAL\Driver\Mysqli\MysqliException;
+use Doctrine\DBAL\Driver\AbstractException;
 
 use function sprintf;
 
@@ -13,7 +13,7 @@ use function sprintf;
  *
  * @psalm-immutable
  */
-final class UnknownType extends MysqliException
+final class UnknownType extends AbstractException
 {
     /**
      * @param mixed $type

src/Driver/Mysqli/Initializer.php

@@ -4,12 +4,13 @@ declare(strict_types=1);
 
 namespace Doctrine\DBAL\Driver\Mysqli;
 
+use Doctrine\DBAL\Driver\Exception;
 use mysqli;
 
 interface Initializer
 {
     /**
-     * @throws MysqliException
+     * @throws Exception
      */
     public function initialize(mysqli $connection): void;
 }

src/Driver/Mysqli/MysqliConnection.php

@@ -2,6 +2,7 @@
 
 namespace Doctrine\DBAL\Driver\Mysqli;
 
+use Doctrine\DBAL\Driver\Exception;
 use Doctrine\DBAL\Driver\Mysqli\Exception\ConnectionError;
 use Doctrine\DBAL\Driver\Mysqli\Exception\ConnectionFailed;
 use Doctrine\DBAL\Driver\PingableConnection;
@@ -32,7 +33,7 @@ class MysqliConnection implements PingableConnection, ServerInfoAwareConnection
      * @param iterable<Initializer> $preInitializers
      * @param iterable<Initializer> $postInitializers
      *
-     * @throws MysqliException
+     * @throws Exception
      */
     public function __construct(
         ?string $host = null,

src/Driver/Mysqli/MysqliException.php

-<?php
-
-namespace Doctrine\DBAL\Driver\Mysqli;
-
-use Doctrine\DBAL\Driver\AbstractDriverException;
-
-/**
- * @deprecated Use {@link Exception} instead
- *
- * @psalm-immutable
- */
-class MysqliException extends AbstractDriverException
-{
-}

src/Driver/Mysqli/MysqliStatement.php

@@ -2,6 +2,7 @@
 
 namespace Doctrine\DBAL\Driver\Mysqli;
 
+use Doctrine\DBAL\Driver\Exception;
 use Doctrine\DBAL\Driver\Mysqli\Exception\ConnectionError;
 use Doctrine\DBAL\Driver\Mysqli\Exception\FailedReadingStreamOffset;
 use Doctrine\DBAL\Driver\Mysqli\Exception\StatementError;
@@ -62,7 +63,7 @@ class MysqliStatement implements StatementInterface
      *
      * @param string $prepareString
      *
-     * @throws MysqliException
+     * @throws Exception
      */
     public function __construct(mysqli $conn, $prepareString)
     {
@@ -186,7 +187,7 @@ class MysqliStatement implements StatementInterface
      *
      * @param array<int, resource> $streams
      *
-     * @throws MysqliException
+     * @throws Exception
      */
     private function sendLongData(array $streams): void
     {

src/Driver/Mysqli/Result.php

@@ -4,6 +4,7 @@ declare(strict_types=1);
 
 namespace Doctrine\DBAL\Driver\Mysqli;
 
+use Doctrine\DBAL\Driver\Exception;
 use Doctrine\DBAL\Driver\FetchUtils;
 use Doctrine\DBAL\Driver\Mysqli\Exception\StatementError;
 use Doctrine\DBAL\Driver\Result as ResultInterface;
@@ -42,7 +43,7 @@ final class Result implements ResultInterface
     private $boundValues = [];
 
     /**
-     * @throws MysqliException
+     * @throws Exception
      */
     public function __construct(mysqli_stmt $statement)
     {

src/Driver/OCI8/ConvertPositionalToNamedPlaceholders.php

@@ -4,6 +4,7 @@ declare(strict_types=1);
 
 namespace Doctrine\DBAL\Driver\OCI8;
 
+use Doctrine\DBAL\Driver\Exception;
 use Doctrine\DBAL\Driver\OCI8\Exception\NonTerminatedStringLiteral;
 
 use function count;
@@ -31,7 +32,7 @@ final class ConvertPositionalToNamedPlaceholders
      *
      * @return mixed[] [0] => the statement value (string), [1] => the paramMap value (array).
      *
-     * @throws OCI8Exception
+     * @throws Exception
      */
     public function __invoke(string $statement): array
     {

src/Driver/OCI8/Exception/ConnectionFailed.php

@@ -4,7 +4,7 @@ declare(strict_types=1);
 
 namespace Doctrine\DBAL\Driver\OCI8\Exception;
 
-use Doctrine\DBAL\Driver\OCI8\OCI8Exception;
+use Doctrine\DBAL\Driver\AbstractException;
 
 use function assert;
 use function oci_error;
@@ -14,7 +14,7 @@ use function oci_error;
  *
  * @psalm-immutable
  */
-final class ConnectionFailed extends OCI8Exception
+final class ConnectionFailed extends AbstractException
 {
     public static function new(): self
     {

src/Driver/OCI8/Exception/Error.php

@@ -4,7 +4,7 @@ declare(strict_types=1);
 
 namespace Doctrine\DBAL\Driver\OCI8\Exception;
 
-use Doctrine\DBAL\Driver\OCI8\OCI8Exception;
+use Doctrine\DBAL\Driver\AbstractException;
 
 use function assert;
 use function oci_error;
@@ -14,7 +14,7 @@ use function oci_error;
  *
  * @psalm-immutable
  */
-final class Error extends OCI8Exception
+final class Error extends AbstractException
 {
     /**
      * @param resource $resource

src/Driver/OCI8/Exception/NonTerminatedStringLiteral.php

@@ -4,7 +4,7 @@ declare(strict_types=1);
 
 namespace Doctrine\DBAL\Driver\OCI8\Exception;
 
-use Doctrine\DBAL\Driver\OCI8\OCI8Exception;
+use Doctrine\DBAL\Driver\AbstractException;
 
 use function sprintf;
 
@@ -13,7 +13,7 @@ use function sprintf;
  *
  * @psalm-immutable
  */
-final class NonTerminatedStringLiteral extends OCI8Exception
+final class NonTerminatedStringLiteral extends AbstractException
 {
     public static function new(int $offset): self
     {

src/Driver/OCI8/Exception/SequenceDoesNotExist.php

@@ -4,14 +4,14 @@ declare(strict_types=1);
 
 namespace Doctrine\DBAL\Driver\OCI8\Exception;
 
-use Doctrine\DBAL\Driver\OCI8\OCI8Exception;
+use Doctrine\DBAL\Driver\AbstractException;
 
 /**
  * @internal
  *
  * @psalm-immutable
  */
-final class SequenceDoesNotExist extends OCI8Exception
+final class SequenceDoesNotExist extends AbstractException
 {
     public static function new(): self
     {

src/Driver/OCI8/Exception/UnknownParameterIndex.php

@@ -4,7 +4,7 @@ declare(strict_types=1);
 
 namespace Doctrine\DBAL\Driver\OCI8\Exception;
 
-use Doctrine\DBAL\Driver\OCI8\OCI8Exception;
+use Doctrine\DBAL\Driver\AbstractException;
 
 use function sprintf;
 
@@ -13,7 +13,7 @@ use function sprintf;
  *
  * @psalm-immutable
  */
-final class UnknownParameterIndex extends OCI8Exception
+final class UnknownParameterIndex extends AbstractException
 {
     public static function new(int $index): self
     {

src/Driver/OCI8/OCI8Connection.php

@@ -3,6 +3,7 @@
 namespace Doctrine\DBAL\Driver\OCI8;
 
 use Doctrine\DBAL\Driver\Connection as ConnectionInterface;
+use Doctrine\DBAL\Driver\Exception;
 use Doctrine\DBAL\Driver\OCI8\Exception\ConnectionFailed;
 use Doctrine\DBAL\Driver\OCI8\Exception\Error;
 use Doctrine\DBAL\Driver\OCI8\Exception\SequenceDoesNotExist;
@@ -49,7 +50,7 @@ class OCI8Connection implements ConnectionInterface, ServerInfoAwareConnection
      * @param int    $sessionMode
      * @param bool   $persistent
      *
-     * @throws OCI8Exception
+     * @throws Exception
      */
     public function __construct(
         $username,

src/Driver/OCI8/OCI8Exception.php

-<?php
-
-namespace Doctrine\DBAL\Driver\OCI8;
-
-use Doctrine\DBAL\Driver\AbstractDriverException;
-
-/**
- * @deprecated Use {@link Exception} instead
- *
- * @psalm-immutable
- */
-class OCI8Exception extends AbstractDriverException
-{
-}

src/Driver/PDO/Exception.php

@@ -4,17 +4,25 @@ declare(strict_types=1);
 
 namespace Doctrine\DBAL\Driver\PDO;
 
-use Doctrine\DBAL\Driver\PDOException;
+use Doctrine\DBAL\Driver\AbstractException;
+use PDOException;
 
 /**
  * @internal
  *
  * @psalm-immutable
  */
-final class Exception extends PDOException
+final class Exception extends AbstractException
 {
-    public static function new(\PDOException $exception): self
+    public static function new(PDOException $exception): self
     {
-        return new self($exception);
+        if ($exception->errorInfo !== null) {
+            [$sqlState, $code] = $exception->errorInfo;
+        } else {
+            $code     = $exception->getCode();
+            $sqlState = null;
+        }
+
+        return new self($exception->getMessage(), $sqlState, $code, $exception);
     }
 }

src/Driver/PDOConnection.php

@@ -2,6 +2,7 @@
 
 namespace Doctrine\DBAL\Driver;
 
+use Doctrine\DBAL\Driver\Exception as ExceptionInterface;
 use Doctrine\DBAL\Driver\PDO\Exception;
 use Doctrine\DBAL\Driver\PDO\Result;
 use Doctrine\DBAL\Driver\PDO\Statement;
@@ -32,7 +33,7 @@ class PDOConnection implements ServerInfoAwareConnection
      * @param string|null  $password
      * @param mixed[]|null $options
      *
-     * @throws PDOException In case of an error.
+     * @throws ExceptionInterface
      */
     public function __construct($dsn, $user = null, $password = null, ?array $options = null)
     {

src/Driver/PDOException.php

-<?php
-
-namespace Doctrine\DBAL\Driver;
-
-/**
- * @deprecated Use {@link Exception} instead
- *
- * @psalm-immutable
- */
-class PDOException extends AbstractDriverException
-{
-    /**
-     * @param \PDOException $exception The PDO exception to wrap.
-     */
-    public function __construct(\PDOException $exception)
-    {
-        if ($exception->errorInfo !== null) {
-            [$sqlState, $code] = $exception->errorInfo;
-        } else {
-            $code     = $exception->getCode();
-            $sqlState = null;
-        }
-
-        parent::__construct($exception->getMessage(), $sqlState, $code, $exception);
-    }
-}

src/Driver/SQLSrv/Exception/Error.php

@@ -4,7 +4,7 @@ declare(strict_types=1);
 
 namespace Doctrine\DBAL\Driver\SQLSrv\Exception;
 
-use Doctrine\DBAL\Driver\SQLSrv\SQLSrvException;
+use Doctrine\DBAL\Driver\AbstractException;
 
 use function rtrim;
 use function sqlsrv_errors;
@@ -16,7 +16,7 @@ use const SQLSRV_ERR_ERRORS;
  *
  * @psalm-immutable
  */
-final class Error extends SQLSrvException
+final class Error extends AbstractException
 {
     public static function new(): self
     {

src/Driver/SQLSrv/SQLSrvConnection.php

@@ -2,6 +2,7 @@
 
 namespace Doctrine\DBAL\Driver\SQLSrv;
 
+use Doctrine\DBAL\Driver\Exception;
 use Doctrine\DBAL\Driver\Result as ResultInterface;
 use Doctrine\DBAL\Driver\ServerInfoAwareConnection;
 use Doctrine\DBAL\Driver\SQLSrv\Exception\Error;
@@ -38,7 +39,7 @@ class SQLSrvConnection implements ServerInfoAwareConnection
      * @param string  $serverName
      * @param mixed[] $connectionOptions
      *
-     * @throws SQLSrvException
+     * @throws Exception
      */
     public function __construct($serverName, $connectionOptions)
     {

src/Driver/SQLSrv/SQLSrvException.php

-<?php
-
-namespace Doctrine\DBAL\Driver\SQLSrv;
-
-use Doctrine\DBAL\Driver\AbstractDriverException;
-use Doctrine\DBAL\Driver\SQLSrv\Exception\Error;
-
-/**
- * @deprecated Use {@link Exception} instead
- *
- * @psalm-immutable
- */
-class SQLSrvException extends AbstractDriverException
-{
-    /**
-     * Helper method to turn sql server errors into exception.
-     *
-     * @return SQLSrvException
-     */
-    public static function fromSqlSrvErrors()
-    {
-        return Error::new();
-    }
-}

src/Driver/SQLSrv/SQLSrvStatement.php

@@ -2,6 +2,7 @@
 
 namespace Doctrine\DBAL\Driver\SQLSrv;
 
+use Doctrine\DBAL\Driver\Exception;
 use Doctrine\DBAL\Driver\Result as ResultInterface;
 use Doctrine\DBAL\Driver\SQLSrv\Exception\Error;
 use Doctrine\DBAL\Driver\Statement as StatementInterface;
@@ -161,7 +162,7 @@ class SQLSrvStatement implements StatementInterface
      *
      * @return resource
      *
-     * @throws SQLSrvException
+     * @throws Exception
      */
     private function prepare()
     {

src/Driver/Statement.php

@@ -66,7 +66,7 @@ interface Statement
      * @param mixed[]|null $params A numeric array of values with as many elements as there are
      *                             bound parameters in the SQL statement being executed.
      *
-     * @throws DriverException
+     * @throws Exception
      */
     public function execute($params = null): Result;
 }

src/Exception/DriverException.php

@@ -3,7 +3,7 @@
 namespace Doctrine\DBAL\Exception;
 
 use Doctrine\DBAL\DBALException;
-use Doctrine\DBAL\Driver\DriverException as DeprecatedDriverException;
+use Doctrine\DBAL\Driver\Exception as TheDriverException;
 
 use function assert;
 
@@ -12,13 +12,13 @@ use function assert;
  *
  * @psalm-immutable
  */
-class DriverException extends DBALException implements DeprecatedDriverException
+class DriverException extends DBALException implements TheDriverException
 {
     /**
-     * @param string                    $message         The exception message.
-     * @param DeprecatedDriverException $driverException The DBAL driver exception to chain.
+     * @param string             $message         The exception message.
+     * @param TheDriverException $driverException The DBAL driver exception to chain.
      */
-    public function __construct($message, DeprecatedDriverException $driverException)
+    public function __construct($message, TheDriverException $driverException)
     {
         parent::__construct($message, $driverException->getCode(), $driverException);
     }
@@ -29,7 +29,7 @@ class DriverException extends DBALException implements DeprecatedDriverException
     public function getSQLState()
     {
         $previous = $this->getPrevious();
-        assert($previous instanceof DeprecatedDriverException);
+        assert($previous instanceof TheDriverException);
 
         return $previous->getSQLState();
     }

src/Result.php

@@ -5,7 +5,7 @@ declare(strict_types=1);
 namespace Doctrine\DBAL;
 
 use Doctrine\DBAL\Abstraction\Result as ResultInterface;
-use Doctrine\DBAL\Driver\DriverException;
+use Doctrine\DBAL\Driver\Exception as DriverException;
 use Doctrine\DBAL\Driver\Result as DriverResult;
 use Traversable;
 

tests/DBALExceptionTest.php

@@ -4,7 +4,7 @@ namespace Doctrine\DBAL\Tests;
 
 use Doctrine\DBAL\DBALException;
 use Doctrine\DBAL\Driver;
-use Doctrine\DBAL\Driver\DriverException as InnerDriverException;
+use Doctrine\DBAL\Driver\Exception as InnerDriverException;
 use Doctrine\DBAL\Exception\DriverException;
 use Exception;
 use PHPUnit\Framework\TestCase;

tests/Driver/AbstractDriverTest.php

@@ -5,7 +5,7 @@ namespace Doctrine\DBAL\Tests\Driver;
 use Doctrine\DBAL\Connection;
 use Doctrine\DBAL\DBALException;
 use Doctrine\DBAL\Driver;
-use Doctrine\DBAL\Driver\DriverException as DriverExceptionInterface;
+use Doctrine\DBAL\Driver\Exception as DriverExceptionInterface;
 use Doctrine\DBAL\Driver\ExceptionConverterDriver;
 use Doctrine\DBAL\Exception\ConnectionException;
 use Doctrine\DBAL\Exception\ConstraintViolationException;

tests/Driver/Mysqli/MysqliConnectionTest.php

@@ -3,7 +3,7 @@
 namespace Doctrine\DBAL\Tests\Driver\Mysqli;
 
 use Doctrine\DBAL\Driver\Mysqli\Driver;
-use Doctrine\DBAL\Driver\Mysqli\HostRequired;
+use Doctrine\DBAL\Driver\Mysqli\Exception\HostRequired;
 use Doctrine\DBAL\Tests\FunctionalTestCase;
 
 use function extension_loaded;

tests/Driver/OCI8/ConvertPositionalToNamedPlaceholdersTest.php

@@ -5,7 +5,7 @@ declare(strict_types=1);
 namespace Doctrine\Tests\DBAL\Driver\OCI8;
 
 use Doctrine\DBAL\Driver\OCI8\ConvertPositionalToNamedPlaceholders;
-use Doctrine\DBAL\Driver\OCI8\OCI8Exception;
+use Doctrine\DBAL\Driver\OCI8\Exception\NonTerminatedStringLiteral;
 use PHPUnit\Framework\TestCase;
 
 class ConvertPositionalToNamedPlaceholdersTest extends TestCase
@@ -95,7 +95,7 @@ class ConvertPositionalToNamedPlaceholdersTest extends TestCase
      */
     public function testConvertNonTerminatedLiteral(string $sql, string $expectedExceptionMessageRegExp): void
     {
-        $this->expectException(OCI8Exception::class);
+        $this->expectException(NonTerminatedStringLiteral::class);
         $this->expectExceptionMessageMatches($expectedExceptionMessageRegExp);
         ($this->convertPositionalToNamedPlaceholders)($sql);
     }

tests/Driver/PDO/ExceptionTest.php

@@ -40,7 +40,7 @@ class ExceptionTest extends TestCase
 
         $this->wrappedException->errorInfo = [self::SQLSTATE, self::ERROR_CODE];
 
-        $this->exception = new Exception($this->wrappedException);
+        $this->exception = Exception::new($this->wrappedException);
     }
 
     public function testReturnsCode(): void

tests/Functional/Driver/Mysqli/ConnectionTest.php

@@ -2,9 +2,9 @@
 
 namespace Doctrine\DBAL\Tests\Functional\Driver\Mysqli;
 
+use Doctrine\DBAL\Driver\Exception;
 use Doctrine\DBAL\Driver\Mysqli\Driver;
 use Doctrine\DBAL\Driver\Mysqli\MysqliConnection;
-use Doctrine\DBAL\Driver\Mysqli\MysqliException;
 use Doctrine\DBAL\Tests\FunctionalTestCase;
 use Doctrine\DBAL\Tests\TestUtil;
 
@@ -43,7 +43,7 @@ class ConnectionTest extends FunctionalTestCase
 
     public function testUnsupportedDriverOption(): void
     {
-        $this->expectException(MysqliException::class);
+        $this->expectException(Exception::class);
 
         $this->getConnection([12345 => 'world']);
     }
@@ -52,7 +52,7 @@ class ConnectionTest extends FunctionalTestCase
     {
         $params = TestUtil::getConnectionParams();
 
-        $this->expectException(MysqliException::class);
+        $this->expectException(Exception::class);
         (new Driver())->connect(
             array_merge(
                 $params,

tests/Functional/Driver/SQLSrv/StatementTest.php

@@ -2,8 +2,8 @@
 
 namespace Doctrine\DBAL\Tests\Functional\Driver\SQLSrv;
 
+use Doctrine\DBAL\Driver\Exception;
 use Doctrine\DBAL\Driver\SQLSrv\Driver;
-use Doctrine\DBAL\Driver\SQLSrv\SQLSrvException;
 use Doctrine\DBAL\Tests\FunctionalTestCase;
 
 use function extension_loaded;
@@ -32,7 +32,7 @@ class StatementTest extends FunctionalTestCase
 
         // it's impossible to prepare the statement without bound variables for SQL Server,
         // so the preparation happens before the first execution when variables are already in place
-        $this->expectException(SQLSrvException::class);
+        $this->expectException(Exception::class);
         $stmt->execute();
     }
 }