Merge pull request #4133 from morozov/driver-deprecation-fixes

Fix more issues introduced by the deprecation of driver classes
doctrine · Jun 30, 2020 · e8510d1 · e8510d1
2 parents f42cab9 + 54b04e3
commit e8510d1
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git 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/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}

diff --git a/phpcs.xml.dist b/phpcs.xml.dist
@@ -103,6 +103,7 @@
     <!-- See https://github.com/slevomat/coding-standard/issues/770 -->
     <rule ref="SlevomatCodingStandard.Namespaces.UnusedUses">
         <exclude-pattern>lib/Doctrine/DBAL/Driver/ExceptionConverterDriver.php</exclude-pattern>
+        <exclude-pattern>lib/Doctrine/DBAL/Driver/PDOException.php</exclude-pattern>
     </rule>
 
     <!-- see https://github.com/doctrine/dbal/issues/3377 -->
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,6 +2,8 @@ @@
     namespace Doctrine\DBAL\Driver;
+    use Doctrine\DBAL\Driver\PDO\Exception;
     /**
      * @deprecated Use {@link Exception} instead
      *
@@ Expand Down @@