Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix more issues introduced by the deprecation of driver classes #4133

Merged
merged 2 commits into from
Jun 30, 2020
+5 −2
Merged

Fix more issues introduced by the deprecation of driver classes #4133

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dacd4ba
Fix base class alias in PDOSqlsrv\Connection
morozov Jun 29, 2020
54b04e3
Fix reference to the class recommended instead of PDOException
morozov Jun 29, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions lib/Doctrine/DBAL/Driver/PDOException.php
View file
Open in desktop
Original file line number Diff 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
4 changes: 2 additions & 2 deletions lib/Doctrine/DBAL/Driver/PDOSqlsrv/Connection.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -14,7 +14,7 @@
/**
* Sqlsrv Connection implementation.
*/
class Connection extends BaseStatement
class Connection extends BaseConnection
{
/**
* {@inheritdoc}
Expand Down
1 change: 1 addition & 0 deletions phpcs.xml.dist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 -->
Expand Down