Fix invalid signatures

laravel · taylorotwell · Jan 21, 2021 · Jan 21, 2021 · Jan 21, 2021 · Jan 21, 2021
commit c478b267502d94e48ad86a271857128b98a62936
diff --git a/src/Illuminate/Database/Connection.php b/src/Illuminate/Database/Connection.php
@@ -920,7 +920,7 @@ public function getDoctrineConnection()
             $this->doctrineConnection = new DoctrineConnection(array_filter([
                 'pdo' => $this->getPdo(),
                 'dbname' => $this->getDatabaseName(),
-                'driver' => method_exists($driver, 'getName') ? $driver->getName() : null,
+                'driver' => $driver->getName(),
                 'serverVersion' => $this->getConfig('server_version'),
             ]), $driver);
         }

diff --git a/src/Illuminate/Database/PDO/Concerns/ConnectsToDatabase.php b/src/Illuminate/Database/PDO/Concerns/ConnectsToDatabase.php
@@ -13,7 +13,7 @@ trait ConnectsToDatabase
      * @param  array  $params
      * @return \Illuminate\Database\PDO\Connection
      */
-    public function connect(array $params)
+    public function connect(array $params, $username = null, $password = null, array $driverOptions = [])
     {
         if (! isset($params['pdo']) || ! $params['pdo'] instanceof PDO) {
             throw new \InvalidArgumentException('Laravel requires the "pdo" property to be set and be a PDO instance.');

diff --git a/src/Illuminate/Database/PDO/MySqlDriver.php b/src/Illuminate/Database/PDO/MySqlDriver.php
@@ -8,4 +8,16 @@
 class MySqlDriver extends AbstractMySQLDriver
 {
     use ConnectsToDatabase;
+
+    /**
+     * Gets the name of the driver.
+     *
+     * @deprecated
+     *
+     * @return string The name of the driver.
+     */
+    public function getName()
+    {
+        return 'pdo_mysql';
+    }
 }
diff --git a/src/Illuminate/Database/PDO/PostgresDriver.php b/src/Illuminate/Database/PDO/PostgresDriver.php
@@ -8,4 +8,16 @@
 class PostgresDriver extends AbstractPostgreSQLDriver
 {
     use ConnectsToDatabase;
+
+    /**
+     * Gets the name of the driver.
+     *
+     * @deprecated
+     *
+     * @return string The name of the driver.
+     */
+    public function getName()
+    {
+        return 'pdo_pgsql';
+    }
 }
diff --git a/src/Illuminate/Database/PDO/SQLiteDriver.php b/src/Illuminate/Database/PDO/SQLiteDriver.php
@@ -8,4 +8,16 @@
 class SQLiteDriver extends AbstractSQLiteDriver
 {
     use ConnectsToDatabase;
+
+    /**
+     * Gets the name of the driver.
+     *
+     * @deprecated
+     *
+     * @return string The name of the driver.
+     */
+    public function getName()
+    {
+        return 'pdo_sqlite';
+    }
 }
diff --git a/src/Illuminate/Database/PDO/SqlServerDriver.php b/src/Illuminate/Database/PDO/SqlServerDriver.php
@@ -6,10 +6,22 @@
 
 class SqlServerDriver extends AbstractSQLServerDriver
 {
-    public function connect(array $params)
+    public function connect(array $params, $username = null, $password = null, array $driverOptions = [])
     {
         return new SqlServerConnection(
             new Connection($params['pdo'])
         );
     }
+
+    /**
+     * Gets the name of the driver.
+     *
+     * @deprecated
+     *
+     * @return string The name of the driver.
+     */
+    public function getName()
+    {
+        return 'pdo_sqlsrv';
+    }
 }