Housekeeping fixes

doctrine · Sep 14, 2020 · 8510571 · 8510571
1 parent 9385110
commit 8510571
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 6 deletions.
diff --git a/lib/Doctrine/DBAL/Driver/AbstractPostgreSQLDriver.php b/lib/Doctrine/DBAL/Driver/AbstractPostgreSQLDriver.php
@@ -85,7 +85,7 @@ public function convertException($message, DeprecatedDriverException $exception)
  return new TableExistsException($message, $exception);
 
  case '08006':
- return new Exception\ConnectionException($message, $exception);
+ return new ConnectionException($message, $exception);
 
  case '7':
  // Prior to fixing https://bugs.php.net/bug.php?id=64705 (PHP 7.3.22 and PHP 7.4.10),

diff --git a/tests/Doctrine/Tests/DBAL/Functional/WriteTest.php b/tests/Doctrine/Tests/DBAL/Functional/WriteTest.php
@@ -3,7 +3,7 @@
 namespace Doctrine\Tests\DBAL\Functional;
 
 use DateTime;
-use Doctrine\DBAL\Driver\LowLevelDriverException;
+use Doctrine\DBAL\Driver\DriverException;
 use Doctrine\DBAL\ParameterType;
 use Doctrine\DBAL\Schema\Sequence;
 use Doctrine\DBAL\Schema\Table;
@@ -369,13 +369,13 @@ public function testDeleteWhereIsNull(): void
  *
  * @return string|false
  *
- * @throws LowLevelDriverException
+ * @throws DriverException
  */
  private function lastInsertId(?string $name = null)
  {
  try {
  return $this->connection->lastInsertId($name);
- } catch (LowLevelDriverException $e) {
+ } catch (DriverException $e) {
  if ($e->getCode() === 'IM001') {
  $this->markTestSkipped($e->getMessage());
  }

diff --git a/tests/Doctrine/Tests/DBAL/Platforms/AbstractPlatformTestCase.php b/tests/Doctrine/Tests/DBAL/Platforms/AbstractPlatformTestCase.php
@@ -264,7 +264,7 @@ public function testGeneratesForeignKeySqlOnlyWhenSupportingForeignKeys(): void
  if ($this->platform->supportsForeignKeyConstraints()) {
  self::assertIsString($this->platform->getCreateForeignKeySQL($fk, 'test'));
  } else {
- $this->expectException(Exception::class);
+ $this->expectException(DBALException::class);
  $this->platform->getCreateForeignKeySQL($fk, 'test');
  }
  }

diff --git a/tests/Doctrine/Tests/DBAL/Platforms/SQLServer2012PlatformTest.php b/tests/Doctrine/Tests/DBAL/Platforms/SQLServer2012PlatformTest.php
@@ -2,7 +2,6 @@
 
 namespace Doctrine\Tests\DBAL\Platforms;
 
-use Doctrine\DBAL\DBALException;
 use Doctrine\DBAL\Platforms\AbstractPlatform;
 use Doctrine\DBAL\Platforms\SQLServer2012Platform;
 use Doctrine\DBAL\Schema\Sequence;