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

Removed Driver::getName()
doctrine · Nov 2, 2019 · 84e365d · 84e365d
2 parents a4158b5 + 5857be4
commit 84e365d
Show file tree

Hide file tree

Showing 23 changed files with 47 additions and 373 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
@@ -43,15 +43,6 @@ public function getDatabasePlatform();
      */
     public function getSchemaManager(Connection $conn);
 
-    /**
-     * Gets the name of the driver.
-     *
-     * @deprecated
-     *
-     * @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,14 +38,4 @@ public function connect(array $params, $username = null, $password = null, array
 
         return new DB2Connection($params, (string) $username, (string) $password, $driverOptions);
     }
-
-    /**
-     * {@inheritdoc}
-     *
-     * @deprecated
-     */
-    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,14 +43,4 @@ protected function _constructDsn(array $params)
     {
         return $this->getEasyConnectString($params);
     }
-
-    /**
-     * {@inheritdoc}
-     *
-     * @deprecated
-     */
-    public function getName()
-    {
-        return 'oci8';
-    }
 }
diff --git a/lib/Doctrine/DBAL/Driver/PDOMySql/Driver.php b/lib/Doctrine/DBAL/Driver/PDOMySql/Driver.php
@@ -66,14 +66,4 @@ protected function constructPdoDsn(array $params)
 
         return $dsn;
     }
-
-    /**
-     * {@inheritdoc}
-     *
-     * @deprecated
-     */
-    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,14 +111,4 @@ private function _constructPdoDsn(array $params)
 
         return $dsn;
     }
-
-    /**
-     * {@inheritdoc}
-     *
-     * @deprecated
-     */
-    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,14 +74,4 @@ protected function _constructPdoDsn(array $params)
 
         return $dsn;
     }
-
-    /**
-     * {@inheritdoc}
-     *
-     * @deprecated
-     */
-    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,14 +87,4 @@ private function getConnectionOptionsDsn(array $connectionOptions) : string
 
         return $connectionOptionsDsn;
     }
-
-    /**
-     * {@inheritdoc}
-     *
-     * @deprecated
-     */
-    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,16 +40,6 @@ public function connect(array $params, $username = null, $password = null, array
         }
     }
 
-    /**
-     * {@inheritdoc}
-     *
-     * @deprecated
-     */
-    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,14 +47,4 @@ public function connect(array $params, $username = null, $password = null, array
 
         return new SQLSrvConnection($serverName, $driverOptions);
     }
-
-    /**
-     * {@inheritdoc}
-     *
-     * @deprecated
-     */
-    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