Revert "Merge pull request doctrine#4253 from morozov/deprecate-dbal-…

…exception"

This reverts commit f97ee94, reversing
changes made to f69c990.

UPGRADE.md

@@ -84,10 +84,6 @@ The non-interface methods of driver-level classes have been marked internal:
 - `OCI8Connection::getExecuteMode()`
 - `OCI8Statement::convertPositionalToNamedPlaceholders()`
 
-## Deprecated `DBALException`
-
-The `Doctrine\DBAL\DBALException` class has been deprecated in favor of `Doctrine\DBAL\Exception`.
-
 ## Inconsistently and ambiguously named driver-level classes are deprecated
 
 The following classes under the `Driver` namespace have been deprecated in favor of their consistently named counterparts:

lib/Doctrine/DBAL/Abstraction/Result.php

@@ -4,8 +4,8 @@
 
 namespace Doctrine\DBAL\Abstraction;
 
+use Doctrine\DBAL\DBALException;
 use Doctrine\DBAL\Driver\Result as DriverResult;
-use Doctrine\DBAL\Exception;
 use Traversable;
 
 /**
@@ -19,7 +19,7 @@ interface Result extends DriverResult
  *
  * @return Traversable<int,array<int,mixed>>
  *
- * @throws Exception
+ * @throws DBALException
  */
  public function iterateNumeric(): Traversable;
 
@@ -28,7 +28,7 @@ public function iterateNumeric(): Traversable;
  *
  * @return Traversable<int,array<string,mixed>>
  *
- * @throws Exception
+ * @throws DBALException
  */
  public function iterateAssociative(): Traversable;
 
@@ -37,7 +37,7 @@ public function iterateAssociative(): Traversable;
  *
  * @return Traversable<int,mixed>
  *
- * @throws Exception
+ * @throws DBALException
  */
  public function iterateColumn(): Traversable;
 }

lib/Doctrine/DBAL/Cache/CacheException.php

@@ -2,12 +2,12 @@
 
 namespace Doctrine\DBAL\Cache;
 
-use Doctrine\DBAL\Exception;
+use Doctrine\DBAL\DBALException;
 
 /**
  * @psalm-immutable
  */
-class CacheException extends Exception
+class CacheException extends DBALException
 {
  /**
  * @return CacheException

lib/Doctrine/DBAL/Connection.php

@@ -20,6 +20,7 @@
 use Doctrine\DBAL\Query\QueryBuilder;
 use Doctrine\DBAL\Schema\AbstractSchemaManager;
 use Doctrine\DBAL\Types\Type;
+use Exception;
 use Throwable;
 use Traversable;
 
@@ -174,7 +175,7 @@ class Connection implements DriverConnection
  * @param Configuration|null $config The configuration, optional.
  * @param EventManager|null $eventManager The event manager, optional.
  *
- * @throws Exception
+ * @throws DBALException
  */
  public function __construct(
  array $params,
@@ -192,7 +193,7 @@ public function __construct(
 
  if (isset($params['platform'])) {
  if (! $params['platform'] instanceof Platforms\AbstractPlatform) {
- throw Exception::invalidPlatformType($params['platform']);
+ throw DBALException::invalidPlatformType($params['platform']);
  }
 
  $this->platform = $params['platform'];
@@ -320,7 +321,7 @@ public function getEventManager()
  *
  * @return AbstractPlatform
  *
- * @throws Exception
+ * @throws DBALException
  */
  public function getDatabasePlatform()
  {
@@ -378,7 +379,7 @@ public function connect()
  *
  * Evaluates custom platform class and version in order to set the correct platform.
  *
- * @throws Exception If an invalid platform was specified for this connection.
+ * @throws DBALException If an invalid platform was specified for this connection.
  */
  private function detectDatabasePlatform(): void
  {
@@ -405,7 +406,7 @@ private function detectDatabasePlatform(): void
  *
  * @return string|null
  *
- * @throws Throwable
+ * @throws Exception
  */
  private function getDatabasePlatformVersion()
  {
@@ -549,7 +550,7 @@ public function setFetchMode($fetchMode)
  *
  * @return mixed[]|false False is returned if no rows are found.
  *
- * @throws Exception
+ * @throws DBALException
  */
  public function fetchAssoc($sql, array $params = [], array $types = [])
  {
@@ -586,7 +587,7 @@ public function fetchArray($sql, array $params = [], array $types = [])
  *
  * @return mixed|false False is returned if no rows are found.
  *
- * @throws Exception
+ * @throws DBALException
  */
  public function fetchColumn($sql, array $params = [], $column = 0, array $types = [])
  {
@@ -603,7 +604,7 @@ public function fetchColumn($sql, array $params = [], $column = 0, array $types
  *
  * @return array<string, mixed>|false False is returned if no rows are found.
  *
- * @throws Exception
+ * @throws DBALException
  */
  public function fetchAssociative(string $query, array $params = [], array $types = [])
  {
@@ -630,7 +631,7 @@ public function fetchAssociative(string $query, array $params = [], array $types
  *
  * @return array<int, mixed>|false False is returned if no rows are found.
  *
- * @throws Exception
+ * @throws DBALException
  */
  public function fetchNumeric(string $query, array $params = [], array $types = [])
  {
@@ -657,7 +658,7 @@ public function fetchNumeric(string $query, array $params = [], array $types = [
  *
  * @return mixed|false False is returned if no rows are found.
  *
- * @throws Exception
+ * @throws DBALException
  */
  public function fetchOne(string $query, array $params = [], array $types = [])
  {
@@ -702,7 +703,7 @@ public function isTransactionActive()
  * @param mixed[] $values Column values
  * @param string[] $conditions Key conditions
  *
- * @throws Exception
+ * @throws DBALException
  */
  private function addIdentifierCondition(
  array $identifier,
@@ -735,7 +736,8 @@ private function addIdentifierCondition(
  *
  * @return int The number of affected rows.
  *
- * @throws Exception
+ * @throws DBALException
+ * @throws InvalidArgumentException
  */
  public function delete($table, array $identifier, array $types = [])
  {
@@ -804,7 +806,7 @@ public function getTransactionIsolation()
  *
  * @return int The number of affected rows.
  *
- * @throws Exception
+ * @throws DBALException
  */
  public function update($table, array $data, array $identifier, array $types = [])
  {
@@ -839,7 +841,7 @@ public function update($table, array $data, array $identifier, array $types = []
  *
  * @return int The number of affected rows.
  *
- * @throws Exception
+ * @throws DBALException
  */
  public function insert($table, array $data, array $types = [])
  {
@@ -940,7 +942,7 @@ public function fetchAll($sql, array $params = [], $types = [])
  *
  * @return array<int,array<int,mixed>>
  *
- * @throws Exception
+ * @throws DBALException
  */
  public function fetchAllNumeric(string $query, array $params = [], array $types = []): array
  {
@@ -966,7 +968,7 @@ public function fetchAllNumeric(string $query, array $params = [], array $types
  *
  * @return array<int,array<string,mixed>>
  *
- * @throws Exception
+ * @throws DBALException
  */
  public function fetchAllAssociative(string $query, array $params = [], array $types = []): array
  {
@@ -992,7 +994,7 @@ public function fetchAllAssociative(string $query, array $params = [], array $ty
  *
  * @return array<int,mixed>
  *
- * @throws Exception
+ * @throws DBALException
  */
  public function fetchFirstColumn(string $query, array $params = [], array $types = []): array
  {
@@ -1018,7 +1020,7 @@ public function fetchFirstColumn(string $query, array $params = [], array $types
  *
  * @return Traversable<int,array<int,mixed>>
  *
- * @throws Exception
+ * @throws DBALException
  */
  public function iterateNumeric(string $query, array $params = [], array $types = []): Traversable
  {
@@ -1047,7 +1049,7 @@ public function iterateNumeric(string $query, array $params = [], array $types =
  *
  * @return Traversable<int,array<string,mixed>>
  *
- * @throws Exception
+ * @throws DBALException
  */
  public function iterateAssociative(string $query, array $params = [], array $types = []): Traversable
  {
@@ -1075,7 +1077,7 @@ public function iterateAssociative(string $query, array $params = [], array $typ
  *
  * @return Traversable<int,mixed>
  *
- * @throws Exception
+ * @throws DBALException
  */
  public function iterateColumn(string $query, array $params = [], array $types = []): Traversable
  {
@@ -1101,7 +1103,7 @@ public function iterateColumn(string $query, array $params = [], array $types =
  *
  * @return Statement The prepared statement.
  *
- * @throws Exception
+ * @throws DBALException
  */
  public function prepare($sql)
  {
@@ -1129,7 +1131,7 @@ public function prepare($sql)
  *
  * @return ResultStatement The executed statement.
  *
- * @throws Exception
+ * @throws DBALException
  */
  public function executeQuery($sql, array $params = [], $types = [], ?QueryCacheProfile $qcp = null)
  {
@@ -1263,7 +1265,7 @@ public function project($sql, array $params, Closure $function)
  *
  * @return \Doctrine\DBAL\Driver\Statement
  *
- * @throws Exception
+ * @throws DBALException
  */
  public function query()
  {
@@ -1305,7 +1307,7 @@ public function query()
  *
  * @return int The number of affected rows.
  *
- * @throws Exception
+ * @throws DBALException
  */
  public function executeUpdate($sql, array $params = [], array $types = [])
  {
@@ -1330,7 +1332,7 @@ public function executeUpdate($sql, array $params = [], array $types = [])
  *
  * @return int The number of affected rows.
  *
- * @throws Exception
+ * @throws DBALException
  */
  public function executeStatement($sql, array $params = [], array $types = [])
  {
@@ -1383,7 +1385,7 @@ public function executeStatement($sql, array $params = [], array $types = [])
  *
  * @return int The number of affected rows.
  *
- * @throws Exception
+ * @throws DBALException
  */
  public function exec($sql)
  {
@@ -1468,6 +1470,7 @@ public function lastInsertId($name = null)
  *
  * @return mixed The value returned by $func
  *
+ * @throws Exception
  * @throws Throwable
  */
  public function transactional(Closure $func)
@@ -1478,6 +1481,10 @@ public function transactional(Closure $func)
  $this->commit();
 
  return $res;
+ } catch (Exception $e) {
+ $this->rollBack();
+
+ throw $e;
  } catch (Throwable $e) {
  $this->rollBack();
 
@@ -2007,14 +2014,14 @@ public function ping()
  * @param array<int, mixed>|array<string, mixed> $params
  * @param array<int, int|string>|array<string, int|string> $types
  *
- * @throws Exception
+ * @throws DBALException
  *
  * @psalm-return never-return
  */
  public function handleExceptionDuringQuery(Throwable $e, string $sql, array $params = [], array $types = []): void
  {
  $this->throw(
- Exception::driverExceptionDuringQuery(
+ DBALException::driverExceptionDuringQuery(
  $this->_driver,
  $e,
  $sql,
@@ -2026,14 +2033,14 @@ public function handleExceptionDuringQuery(Throwable $e, string $sql, array $par
  /**
  * @internal
  *
- * @throws Exception
+ * @throws DBALException
  *
  * @psalm-return never-return
  */
  public function handleDriverException(Throwable $e): void
  {
  $this->throw(
- Exception::driverException(
+ DBALException::driverException(
  $this->_driver,
  $e
  )
@@ -2043,11 +2050,11 @@ public function handleDriverException(Throwable $e): void
  /**
  * @internal
  *
- * @throws Exception
+ * @throws DBALException
  *
  * @psalm-return never-return
  */
- private function throw(Exception $e): void
+ private function throw(DBALException $e): void
  {
  if ($e instanceof ConnectionLost) {
  $this->close();

lib/Doctrine/DBAL/ConnectionException.php

@@ -5,7 +5,7 @@
 /**
  * @psalm-immutable
  */
-class ConnectionException extends Exception
+class ConnectionException extends DBALException
 {
  /**
  * @return ConnectionException