Merge pull request #7553 from kenjis/refactor-Database-initDriver

refactor: Database::initDriver()

Author: kenjis

system/Database/Config.php

@@ -37,7 +37,7 @@ class Config extends BaseConfig
     protected static $factory;
 
     /**
-     * Creates the default
+     * Returns the database connection
      *
      * @param array|BaseConnection|string|null $group The name of the connection group to use,
      *                                                or an array of configuration settings.

system/Database/Database.php

@@ -16,7 +16,7 @@
 /**
  * Database Connection Factory
  *
- * Creates and returns an instance of the appropriate DatabaseConnection
+ * Creates and returns an instance of the appropriate Database Connection.
  */
 class Database
 {
@@ -32,8 +32,7 @@ class Database
     protected $connections = [];
 
     /**
-     * Parses the connection binds and returns an instance of the driver
-     * ready to go.
+     * Parses the connection binds and creates a Database Connection instance.
      *
      * @return BaseConnection
      *
@@ -83,7 +82,7 @@ public function loadUtils(ConnectionInterface $db): BaseUtils
     }
 
     /**
-     * Parse universal DSN string
+     * Parses universal DSN string
      *
      * @throws InvalidArgumentException
      */
@@ -121,21 +120,20 @@ protected function parseDSN(array $params): array
     }
 
     /**
-     * Initialize database driver.
+     * Creates a database object.
      *
      * @param string       $driver   Driver name. FQCN can be used.
-     * @param array|object $argument
+     * @param string       $class    'Connection'|'Forge'|'Utils'
+     * @param array|object $argument The constructor parameter.
      *
      * @return BaseConnection|BaseUtils|Forge
      */
     protected function initDriver(string $driver, string $class, $argument): object
     {
-        $class = $driver . '\\' . $class;
+        $classname = (strpos($driver, '\\') === false)
+            ? "CodeIgniter\\Database\\{$driver}\\{$class}"
+            : $driver . '\\' . $class;
 
-        if (strpos($driver, '\\') === false) {
-            $class = "CodeIgniter\\Database\\{$class}";
-        }
-
-        return new $class($argument);
+        return new $classname($argument);
     }
 }