Merge pull request #3553 from morozov/remove-driver-name

Removed Driver::getName()
doctrine · May 24, 2019 · 0723eeb · 0723eeb
2 parents d1c6699 + 40f26b1
commit 0723eeb
Show file tree

Hide file tree

Showing 25 changed files with 79 additions and 367 deletions.
diff --git a/UPGRADE.md b/UPGRADE.md
@@ -1,5 +1,9 @@
 # Upgrade to 3.0
 
+## BC BREAK: `Doctrine\DBAL\Driver::getName()` removed
+
+The `Doctrine\DBAL\Driver::getName()` has been removed.
+
 ## BC BREAK Removed previously deprecated features
 
  * Removed `json_array` type and all associated hacks.

diff --git a/lib/Doctrine/DBAL/Driver.php b/lib/Doctrine/DBAL/Driver.php
@@ -41,13 +41,6 @@ public function getDatabasePlatform();
      */
     public function getSchemaManager(Connection $conn);
 
-    /**
-     * Gets the name of the driver.
-     *
-     * @return string The name of the driver.
-     */
-    public function getName();
-
     /**
      * Gets the name of the database connected to for this driver.
      *

diff --git a/lib/Doctrine/DBAL/Driver/IBMDB2/DB2Driver.php b/lib/Doctrine/DBAL/Driver/IBMDB2/DB2Driver.php
@@ -38,12 +38,4 @@ public function connect(array $params, $username = null, $password = null, array
 
         return new DB2Connection($params, (string) $username, (string) $password, $driverOptions);
     }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getName()
-    {
-        return 'ibm_db2';
-    }
 }
diff --git a/lib/Doctrine/DBAL/Driver/Mysqli/Driver.php b/lib/Doctrine/DBAL/Driver/Mysqli/Driver.php
@@ -20,12 +20,4 @@ public function connect(array $params, $username = null, $password = null, array
             throw DBALException::driverException($this, $e);
         }
     }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getName()
-    {
-        return 'mysqli';
-    }
 }
diff --git a/lib/Doctrine/DBAL/Driver/OCI8/Driver.php b/lib/Doctrine/DBAL/Driver/OCI8/Driver.php
@@ -43,12 +43,4 @@ protected function _constructDsn(array $params)
     {
         return $this->getEasyConnectString($params);
     }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getName()
-    {
-        return 'oci8';
-    }
 }
diff --git a/lib/Doctrine/DBAL/Driver/PDOMySql/Driver.php b/lib/Doctrine/DBAL/Driver/PDOMySql/Driver.php
@@ -66,12 +66,4 @@ protected function constructPdoDsn(array $params)
 
         return $dsn;
     }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getName()
-    {
-        return 'pdo_mysql';
-    }
 }
diff --git a/lib/Doctrine/DBAL/Driver/PDOOracle/Driver.php b/lib/Doctrine/DBAL/Driver/PDOOracle/Driver.php
@@ -58,12 +58,4 @@ private function constructPdoDsn(array $params)
 
         return $dsn;
     }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getName()
-    {
-        return 'pdo_oracle';
-    }
 }
diff --git a/lib/Doctrine/DBAL/Driver/PDOPgSql/Driver.php b/lib/Doctrine/DBAL/Driver/PDOPgSql/Driver.php
@@ -111,12 +111,4 @@ private function _constructPdoDsn(array $params)
 
         return $dsn;
     }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getName()
-    {
-        return 'pdo_pgsql';
-    }
 }
diff --git a/lib/Doctrine/DBAL/Driver/PDOSqlite/Driver.php b/lib/Doctrine/DBAL/Driver/PDOSqlite/Driver.php
@@ -74,12 +74,4 @@ protected function _constructPdoDsn(array $params)
 
         return $dsn;
     }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getName()
-    {
-        return 'pdo_sqlite';
-    }
 }
diff --git a/lib/Doctrine/DBAL/Driver/PDOSqlsrv/Driver.php b/lib/Doctrine/DBAL/Driver/PDOSqlsrv/Driver.php
@@ -87,12 +87,4 @@ private function getConnectionOptionsDsn(array $connectionOptions) : string
 
         return $connectionOptionsDsn;
     }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getName()
-    {
-        return 'pdo_sqlsrv';
-    }
 }
diff --git a/lib/Doctrine/DBAL/Driver/SQLAnywhere/Driver.php b/lib/Doctrine/DBAL/Driver/SQLAnywhere/Driver.php
@@ -40,14 +40,6 @@ public function connect(array $params, $username = null, $password = null, array
         }
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getName()
-    {
-        return 'sqlanywhere';
-    }
-
     /**
      * Build the connection string for given connection parameters and driver options.
      *

diff --git a/lib/Doctrine/DBAL/Driver/SQLSrv/Driver.php b/lib/Doctrine/DBAL/Driver/SQLSrv/Driver.php
@@ -47,12 +47,4 @@ public function connect(array $params, $username = null, $password = null, array
 
         return new SQLSrvConnection($serverName, $driverOptions);
     }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getName()
-    {
-        return 'sqlsrv';
-    }
 }
diff --git a/tests/Doctrine/Tests/DBAL/Driver/IBMDB2/DB2DriverTest.php b/tests/Doctrine/Tests/DBAL/Driver/IBMDB2/DB2DriverTest.php
diff --git a/tests/Doctrine/Tests/DBAL/Driver/Mysqli/DriverTest.php b/tests/Doctrine/Tests/DBAL/Driver/Mysqli/DriverTest.php
diff --git a/tests/Doctrine/Tests/DBAL/Driver/OCI8/DriverTest.php b/tests/Doctrine/Tests/DBAL/Driver/OCI8/DriverTest.php
diff --git a/tests/Doctrine/Tests/DBAL/Driver/PDOMySql/DriverTest.php b/tests/Doctrine/Tests/DBAL/Driver/PDOMySql/DriverTest.php
diff --git a/tests/Doctrine/Tests/DBAL/Driver/PDOOracle/DriverTest.php b/tests/Doctrine/Tests/DBAL/Driver/PDOOracle/DriverTest.php
diff --git a/tests/Doctrine/Tests/DBAL/Driver/PDOPgSql/DriverTest.php b/tests/Doctrine/Tests/DBAL/Driver/PDOPgSql/DriverTest.php
@@ -8,24 +8,25 @@
 use Doctrine\DBAL\Driver\PDOPgSql\Driver;
 use Doctrine\Tests\DBAL\Driver\AbstractPostgreSQLDriverTest;
 use PDO;
-use PDOException;
-use PHPUnit_Framework_SkippedTestError;
-use function defined;
 
 class DriverTest extends AbstractPostgreSQLDriverTest
 {
-    public function testReturnsName()
+    protected function setUp() : void
     {
-        self::assertSame('pdo_pgsql', $this->driver->getName());
+        parent::setUp();
+
+        if (isset($GLOBALS['db_type']) && $GLOBALS['db_type'] === 'pdo_pgsql') {
+            return;
+        }
+
+        $this->markTestSkipped('Test enabled only when using pdo_pgsql specific phpunit.xml');
     }
 
     /**
      * @group DBAL-920
      */
-    public function testConnectionDisablesPreparesOnPhp56()
+    public function testConnectionDisablesPrepares()
     {
-        $this->skipWhenNotUsingPhp56AndPdoPgsql();
-
         $connection = $this->createDriver()->connect(
             [
                 'host' => $GLOBALS['db_host'],
@@ -36,22 +37,16 @@ public function testConnectionDisablesPreparesOnPhp56()
         );
 
         self::assertInstanceOf(PDOConnection::class, $connection);
-
-        try {
-            self::assertTrue($connection->getWrappedConnection()->getAttribute(PDO::PGSQL_ATTR_DISABLE_PREPARES));
-        } catch (PDOException $ignored) {
-            /** @link https://bugs.php.net/bug.php?id=68371 */
-            $this->markTestIncomplete('See https://bugs.php.net/bug.php?id=68371');
-        }
+        self::assertTrue(
+            $connection->getWrappedConnection()->getAttribute(PDO::PGSQL_ATTR_DISABLE_PREPARES)
+        );
     }
 
     /**
      * @group DBAL-920
      */
-    public function testConnectionDoesNotDisablePreparesOnPhp56WhenAttributeDefined()
+    public function testConnectionDoesNotDisablePreparesWhenAttributeDefined()
     {
-        $this->skipWhenNotUsingPhp56AndPdoPgsql();
-
         $connection = $this->createDriver()->connect(
             [
                 'host' => $GLOBALS['db_host'],
@@ -63,25 +58,16 @@ public function testConnectionDoesNotDisablePreparesOnPhp56WhenAttributeDefined(
         );
 
         self::assertInstanceOf(PDOConnection::class, $connection);
-
-        try {
-            self::assertNotSame(
-                true,
-                $connection->getWrappedConnection()->getAttribute(PDO::PGSQL_ATTR_DISABLE_PREPARES)
-            );
-        } catch (PDOException $ignored) {
-            /** @link https://bugs.php.net/bug.php?id=68371 */
-            $this->markTestIncomplete('See https://bugs.php.net/bug.php?id=68371');
-        }
+        self::assertNotTrue(
+            $connection->getWrappedConnection()->getAttribute(PDO::PGSQL_ATTR_DISABLE_PREPARES)
+        );
     }
 
     /**
      * @group DBAL-920
      */
-    public function testConnectionDisablePreparesOnPhp56WhenDisablePreparesIsExplicitlyDefined()
+    public function testConnectionDisablePreparesWhenDisablePreparesIsExplicitlyDefined()
     {
-        $this->skipWhenNotUsingPhp56AndPdoPgsql();
-
         $connection = $this->createDriver()->connect(
             [
                 'host' => $GLOBALS['db_host'],
@@ -93,13 +79,9 @@ public function testConnectionDisablePreparesOnPhp56WhenDisablePreparesIsExplici
         );
 
         self::assertInstanceOf(PDOConnection::class, $connection);
-
-        try {
-            self::assertTrue($connection->getWrappedConnection()->getAttribute(PDO::PGSQL_ATTR_DISABLE_PREPARES));
-        } catch (PDOException $ignored) {
-            /** @link https://bugs.php.net/bug.php?id=68371 */
-            $this->markTestIncomplete('See https://bugs.php.net/bug.php?id=68371');
-        }
+        self::assertTrue(
+            $connection->getWrappedConnection()->getAttribute(PDO::PGSQL_ATTR_DISABLE_PREPARES)
+        );
     }
 
     /**
@@ -109,20 +91,4 @@ protected function createDriver()
     {
         return new Driver();
     }
-
-    /**
-     * @throws PHPUnit_Framework_SkippedTestError
-     */
-    private function skipWhenNotUsingPhp56AndPdoPgsql()
-    {
-        if (! defined('PDO::PGSQL_ATTR_DISABLE_PREPARES')) {
-            $this->markTestSkipped('Test requires PHP 5.6+');
-        }
-
-        if (isset($GLOBALS['db_type']) && $GLOBALS['db_type'] === 'pdo_pgsql') {
-            return;
-        }
-
-        $this->markTestSkipped('Test enabled only when using pdo_pgsql specific phpunit.xml');
-    }
 }