From dacd4baacb9e5c53ed175daffc24022b61894ad2 Mon Sep 17 00:00:00 2001 From: Sergei Morozov Date: Mon, 29 Jun 2020 10:34:19 -0700 Subject: [PATCH 1/2] Fix base class alias in PDOSqlsrv\Connection --- lib/Doctrine/DBAL/Driver/PDOSqlsrv/Connection.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/Doctrine/DBAL/Driver/PDOSqlsrv/Connection.php b/lib/Doctrine/DBAL/Driver/PDOSqlsrv/Connection.php index a05f5898b22..8e36d2f1501 100644 --- a/lib/Doctrine/DBAL/Driver/PDOSqlsrv/Connection.php +++ b/lib/Doctrine/DBAL/Driver/PDOSqlsrv/Connection.php @@ -2,7 +2,7 @@ namespace Doctrine\DBAL\Driver\PDOSqlsrv; -use Doctrine\DBAL\Driver\PDO\Connection as BaseStatement; +use Doctrine\DBAL\Driver\PDO\Connection as BaseConnection; use Doctrine\DBAL\Driver\Result; use Doctrine\DBAL\ParameterType; use PDO; @@ -14,7 +14,7 @@ /** * Sqlsrv Connection implementation. */ -class Connection extends BaseStatement +class Connection extends BaseConnection { /** * {@inheritdoc} From 54b04e3380c1719a2bf89ffc36c1bf4da77f6a27 Mon Sep 17 00:00:00 2001 From: Sergei Morozov Date: Mon, 29 Jun 2020 13:31:52 -0700 Subject: [PATCH 2/2] Fix reference to the class recommended instead of PDOException --- lib/Doctrine/DBAL/Driver/PDOException.php | 2 ++ phpcs.xml.dist | 1 + 2 files changed, 3 insertions(+) diff --git a/lib/Doctrine/DBAL/Driver/PDOException.php b/lib/Doctrine/DBAL/Driver/PDOException.php index e82bcbcfc6b..b2c01eb4430 100644 --- a/lib/Doctrine/DBAL/Driver/PDOException.php +++ b/lib/Doctrine/DBAL/Driver/PDOException.php @@ -2,6 +2,8 @@ namespace Doctrine\DBAL\Driver; +use Doctrine\DBAL\Driver\PDO\Exception; + /** * @deprecated Use {@link Exception} instead * diff --git a/phpcs.xml.dist b/phpcs.xml.dist index 534b91cec44..768e383c47d 100644 --- a/phpcs.xml.dist +++ b/phpcs.xml.dist @@ -103,6 +103,7 @@ lib/Doctrine/DBAL/Driver/ExceptionConverterDriver.php + lib/Doctrine/DBAL/Driver/PDOException.php