Detect driver in tests based on configured driver name

tests/Functional/BlobTest.php

@@ -2,11 +2,10 @@
 
 namespace Doctrine\DBAL\Tests\Functional;
 
-use Doctrine\DBAL\Driver\OCI8\Driver as OCI8Driver;
-use Doctrine\DBAL\Driver\PDO;
 use Doctrine\DBAL\ParameterType;
 use Doctrine\DBAL\Schema\Table;
 use Doctrine\DBAL\Tests\FunctionalTestCase;
+use Doctrine\DBAL\Tests\TestUtil;
 use Doctrine\DBAL\Types\Type;
 
 use function fopen;
@@ -17,7 +16,7 @@ class BlobTest extends FunctionalTestCase
 {
     protected function setUp(): void
     {
-        if ($this->connection->getDriver() instanceof PDO\OCI\Driver) {
+        if (TestUtil::isDriverOneOf('pdo_oci')) {
             // inserting BLOBs as streams on Oracle requires Oracle-specific SQL syntax which is currently not supported
             // see http://php.net/manual/en/pdo.lobs.php#example-1035
             self::markTestSkipped('DBAL doesn\'t support storing LOBs represented as streams using PDO_OCI');
@@ -50,7 +49,7 @@ public function testInsert(): void
     public function testInsertProcessesStream(): void
     {
         // https://github.com/doctrine/dbal/issues/3290
-        if ($this->connection->getDriver() instanceof OCI8Driver) {
+        if (TestUtil::isDriverOneOf('oci8')) {
             self::markTestIncomplete('The oci8 driver does not support stream resources as parameters');
         }
 
@@ -106,7 +105,7 @@ public function testUpdate(): void
     public function testUpdateProcessesStream(): void
     {
         // https://github.com/doctrine/dbal/issues/3290
-        if ($this->connection->getDriver() instanceof OCI8Driver) {
+        if (TestUtil::isDriverOneOf('oci8')) {
             self::markTestIncomplete('The oci8 driver does not support stream resources as parameters');
         }
 
@@ -133,7 +132,7 @@ public function testUpdateProcessesStream(): void
 
     public function testBindParamProcessesStream(): void
     {
-        if ($this->connection->getDriver() instanceof OCI8Driver) {
+        if (TestUtil::isDriverOneOf('oci8')) {
             self::markTestIncomplete('The oci8 driver does not support stream resources as parameters');
         }
 

tests/Functional/ConnectionTest.php

@@ -4,11 +4,10 @@
 
 use Doctrine\DBAL\Connection;
 use Doctrine\DBAL\ConnectionException;
-use Doctrine\DBAL\Driver\AbstractSQLServerDriver;
 use Doctrine\DBAL\Driver\Connection as DriverConnection;
-use Doctrine\DBAL\Driver\IBMDB2;
 use Doctrine\DBAL\Driver\PDO\Connection as PDOConnection;
 use Doctrine\DBAL\DriverManager;
+use Doctrine\DBAL\Exception\DriverException;
 use Doctrine\DBAL\Exception\UniqueConstraintViolationException;
 use Doctrine\DBAL\ParameterType;
 use Doctrine\DBAL\Platforms\AbstractPlatform;
@@ -69,7 +68,7 @@ public function testTransactionNestingBehavior(): void
                 $this->connection->insert(self::TABLE, ['id' => 1]);
                 self::fail('Expected exception to be thrown because of the unique constraint.');
             } catch (Throwable $e) {
-                $this->assertIsUniqueConstraintException($e);
+                self::assertInstanceOf(UniqueConstraintViolationException::class, $e);
                 $this->connection->rollBack();
                 self::assertSame(1, $this->connection->getTransactionNestingLevel());
             }
@@ -144,7 +143,7 @@ public function testTransactionNestingBehaviorWithSavepoints(): void
                 $this->connection->insert(self::TABLE, ['id' => 1]);
                 self::fail('Expected exception to be thrown because of the unique constraint.');
             } catch (Throwable $e) {
-                $this->assertIsUniqueConstraintException($e);
+                self::assertInstanceOf(UniqueConstraintViolationException::class, $e);
                 $this->connection->rollBack();
                 self::assertSame(1, $this->connection->getTransactionNestingLevel());
             }
@@ -241,7 +240,7 @@ public function testTransactionBehaviorWithRollback(): void
             $this->connection->insert(self::TABLE, ['id' => 1]);
             self::fail('Expected exception to be thrown because of the unique constraint.');
         } catch (Throwable $e) {
-            $this->assertIsUniqueConstraintException($e);
+            self::assertInstanceOf(UniqueConstraintViolationException::class, $e);
             self::assertSame(1, $this->connection->getTransactionNestingLevel());
             $this->connection->rollBack();
             self::assertSame(0, $this->connection->getTransactionNestingLevel());
@@ -269,7 +268,7 @@ public function testTransactionalWithException(): void
             });
             self::fail('Expected exception to be thrown because of the unique constraint.');
         } catch (Throwable $e) {
-            $this->assertIsUniqueConstraintException($e);
+            self::assertInstanceOf(UniqueConstraintViolationException::class, $e);
             self::assertSame(0, $this->connection->getTransactionNestingLevel());
         }
     }
@@ -393,31 +392,39 @@ public function testPersistentConnection(): void
         self::assertTrue($pdo->getAttribute(PDO::ATTR_PERSISTENT));
     }
 
-    private function createTestTable(): void
+    public function testExceptionOnExecuteStatement(): void
     {
-        $table = new Table(self::TABLE);
-        $table->addColumn('id', 'integer');
-        $table->setPrimaryKey(['id']);
+        $this->expectException(DriverException::class);
 
-        $this->dropAndCreateTable($table);
+        $this->connection->executeStatement('foo');
+    }
 
-        $this->connection->insert(self::TABLE, ['id' => 1]);
+    public function testExceptionOnExecuteQuery(): void
+    {
+        $this->expectException(DriverException::class);
+
+        $this->connection->executeQuery('foo');
     }
 
-    private function assertIsUniqueConstraintException(Throwable $exception): void
+    /**
+     * Some drivers do not check the query server-side even though emulated prepared statements are disabled,
+     * so an exception is thrown only eventually.
+     */
+    public function testExceptionOnPrepareAndExecute(): void
     {
-        if ($this->connection->getDriver() instanceof IBMDB2\Driver) {
-            // The IBM DB2 driver currently doesn't instantiate specialized exceptions
+        $this->expectException(DriverException::class);
 
-            return;
-        }
+        $this->connection->prepare('foo')->executeStatement();
+    }
 
-        if ($this->connection->getDriver() instanceof AbstractSQLServerDriver) {
-            // The SQL Server drivers currently don't instantiate specialized exceptions
+    private function createTestTable(): void
+    {
+        $table = new Table(self::TABLE);
+        $table->addColumn('id', 'integer');
+        $table->setPrimaryKey(['id']);
 
-            return;
-        }
+        $this->dropAndCreateTable($table);
 
-        self::assertInstanceOf(UniqueConstraintViolationException::class, $exception);
+        $this->connection->insert(self::TABLE, ['id' => 1]);
     }
 }

tests/Functional/Driver/IBMDB2/ConnectionTest.php

@@ -3,10 +3,10 @@
 namespace Doctrine\DBAL\Tests\Functional\Driver\IBMDB2;
 
 use Doctrine\DBAL\Driver\IBMDB2\Connection;
-use Doctrine\DBAL\Driver\IBMDB2\Driver;
 use Doctrine\DBAL\Driver\IBMDB2\Exception\ConnectionFailed;
 use Doctrine\DBAL\Driver\IBMDB2\Exception\PrepareFailed;
 use Doctrine\DBAL\Tests\FunctionalTestCase;
+use Doctrine\DBAL\Tests\TestUtil;
 use ReflectionProperty;
 
 use function db2_close;
@@ -18,11 +18,11 @@ class ConnectionTest extends FunctionalTestCase
 {
     protected function setUp(): void
     {
-        if ($this->connection->getDriver() instanceof Driver) {
+        if (TestUtil::isDriverOneOf('ibm_db2')) {
             return;
         }
 
-        $this->markTestSkipped('ibm_db2 only test.');
+        self::markTestSkipped('This test requires the ibm_db2 driver.');
     }
 
     protected function tearDown(): void

tests/Functional/Driver/IBMDB2/DriverTest.php

@@ -5,6 +5,7 @@
 use Doctrine\DBAL\Driver as DriverInterface;
 use Doctrine\DBAL\Driver\IBMDB2\Driver;
 use Doctrine\DBAL\Tests\Functional\Driver\AbstractDriverTest;
+use Doctrine\DBAL\Tests\TestUtil;
 
 /**
  * @requires extension ibm_db2
@@ -15,11 +16,11 @@ protected function setUp(): void
     {
         parent::setUp();
 
-        if ($this->connection->getDriver() instanceof Driver) {
+        if (TestUtil::isDriverOneOf('ibm_db2')) {
             return;
         }
 
-        self::markTestSkipped('ibm_db2 only test.');
+        self::markTestSkipped('This test requires the ibm_db2 driver.');
     }
 
     public function testConnectsWithoutDatabaseNameParameter(): void

tests/Functional/Driver/IBMDB2/StatementTest.php

@@ -4,9 +4,9 @@
 
 namespace Doctrine\DBAL\Tests\Functional\Driver\IBMDB2;
 
-use Doctrine\DBAL\Driver\IBMDB2\Driver;
 use Doctrine\DBAL\Driver\IBMDB2\Exception\StatementError;
 use Doctrine\DBAL\Tests\FunctionalTestCase;
+use Doctrine\DBAL\Tests\TestUtil;
 
 use const E_ALL;
 use const E_NOTICE;
@@ -19,11 +19,11 @@ class StatementTest extends FunctionalTestCase
 {
     protected function setUp(): void
     {
-        if ($this->connection->getDriver() instanceof Driver) {
+        if (TestUtil::isDriverOneOf('ibm_db2')) {
             return;
         }
 
-        self::markTestSkipped('ibm_db2 only test.');
+        self::markTestSkipped('This test requires the ibm_db2 driver.');
     }
 
     public function testExecutionErrorsAreNotSuppressed(): void

tests/Functional/Driver/Mysqli/ConnectionTest.php

@@ -19,11 +19,11 @@ class ConnectionTest extends FunctionalTestCase
 {
     protected function setUp(): void
     {
-        if ($this->connection->getDriver() instanceof Driver) {
+        if (TestUtil::isDriverOneOf('mysqli')) {
             return;
         }
 
-        self::markTestSkipped('MySQLi only test.');
+        self::markTestSkipped('This test requires the mysqli driver.');
     }
 
     public function testSupportedDriverOptions(): void

tests/Functional/Driver/Mysqli/DriverTest.php

@@ -5,6 +5,7 @@
 use Doctrine\DBAL\Driver as DriverInterface;
 use Doctrine\DBAL\Driver\Mysqli\Driver;
 use Doctrine\DBAL\Tests\Functional\Driver\AbstractDriverTest;
+use Doctrine\DBAL\Tests\TestUtil;
 
 /**
  * @requires extension mysqli
@@ -15,11 +16,11 @@ protected function setUp(): void
     {
         parent::setUp();
 
-        if ($this->connection->getDriver() instanceof Driver) {
+        if (TestUtil::isDriverOneOf('mysqli')) {
             return;
         }
 
-        self::markTestSkipped('MySQLi only test.');
+        self::markTestSkipped('This test requires the mysqli driver.');
     }
 
     protected function createDriver(): DriverInterface

tests/Functional/Driver/OCI8/ConnectionTest.php

@@ -2,9 +2,9 @@
 
 namespace Doctrine\DBAL\Tests\Functional\Driver\OCI8;
 
-use Doctrine\DBAL\Driver\OCI8\Driver;
 use Doctrine\DBAL\Schema\Table;
 use Doctrine\DBAL\Tests\FunctionalTestCase;
+use Doctrine\DBAL\Tests\TestUtil;
 
 /**
  * @requires extension oci8
@@ -13,11 +13,11 @@ class ConnectionTest extends FunctionalTestCase
 {
     protected function setUp(): void
     {
-        if ($this->connection->getDriver() instanceof Driver) {
+        if (TestUtil::isDriverOneOf('oci8')) {
             return;
         }
 
-        self::markTestSkipped('oci8 only test.');
+        self::markTestSkipped('This test requires the oci8 driver.');
     }
 
     public function testLastInsertIdAcceptsFqn(): void

tests/Functional/Driver/OCI8/DriverTest.php

@@ -5,6 +5,7 @@
 use Doctrine\DBAL\Driver as DriverInterface;
 use Doctrine\DBAL\Driver\OCI8\Driver;
 use Doctrine\DBAL\Tests\Functional\Driver\AbstractDriverTest;
+use Doctrine\DBAL\Tests\TestUtil;
 
 /**
  * @requires extension oci8
@@ -15,11 +16,11 @@ protected function setUp(): void
     {
         parent::setUp();
 
-        if ($this->connection->getDriver() instanceof Driver) {
+        if (TestUtil::isDriverOneOf('oci8')) {
             return;
         }
 
-        self::markTestSkipped('oci8 only test.');
+        self::markTestSkipped('This test requires the oci8 driver.');
     }
 
     public function testConnectsWithoutDatabaseNameParameter(): void

tests/Functional/Driver/OCI8/ResultTest.php

@@ -4,7 +4,6 @@
 
 namespace Doctrine\DBAL\Tests\Functional\Driver\OCI8;
 
-use Doctrine\DBAL\Driver\OCI8\Driver;
 use Doctrine\DBAL\Exception\DriverException;
 use Doctrine\DBAL\Tests\FunctionalTestCase;
 use Doctrine\DBAL\Tests\TestUtil;
@@ -32,11 +31,11 @@ protected function setUp(): void
     {
         $this->connectionParams = TestUtil::getConnectionParams();
 
-        if ($this->connection->getDriver() instanceof Driver) {
+        if (TestUtil::isDriverOneOf('oci8')) {
             return;
         }
 
-        self::markTestSkipped('oci8 only test.');
+        self::markTestSkipped('This test requires the oci8 driver.');
     }
 
     protected function tearDown(): void

tests/Functional/Driver/OCI8/StatementTest.php

@@ -2,8 +2,8 @@
 
 namespace Doctrine\DBAL\Tests\Functional\Driver\OCI8;
 
-use Doctrine\DBAL\Driver\OCI8\Driver;
 use Doctrine\DBAL\Tests\FunctionalTestCase;
+use Doctrine\DBAL\Tests\TestUtil;
 
 /**
  * @requires extension oci8
@@ -12,11 +12,11 @@ class StatementTest extends FunctionalTestCase
 {
     protected function setUp(): void
     {
-        if ($this->connection->getDriver() instanceof Driver) {
+        if (TestUtil::isDriverOneOf('oci8')) {
             return;
         }
 
-        self::markTestSkipped('oci8 only test.');
+        self::markTestSkipped('This test requires the oci8 driver.');
     }
 
     /**