[6.2] use DatabaseFactory in DatabaseServiceProvider

administrator/components/com_config/src/Model/ApplicationModel.php

@@ -29,7 +29,7 @@
 use Joomla\CMS\Table\Extension;
 use Joomla\CMS\Uri\Uri;
 use Joomla\CMS\User\UserHelper;
-use Joomla\Database\DatabaseDriver;
+use Joomla\Database\DatabaseFactory;
 use Joomla\Database\ParameterType;
 use Joomla\Filesystem\File;
 use Joomla\Filesystem\Folder;
@@ -322,7 +322,7 @@ public function save($data)
         }
 
         try {
-            $revisedDbo = DatabaseDriver::getInstance($options);
+            $revisedDbo = (new DatabaseFactory())->getDriver($options['driver'], $options);
             $revisedDbo->getVersion();
         } catch (\Exception $e) {
             $app->enqueueMessage(Text::sprintf('COM_CONFIG_ERROR_DATABASE_NOT_AVAILABLE', $e->getCode(), $e->getMessage()), 'error');

installation/src/Helper/DatabaseHelper.php

@@ -12,7 +12,7 @@
 use Joomla\CMS\Factory;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\User\UserHelper;
-use Joomla\Database\DatabaseDriver;
+use Joomla\Database\DatabaseFactory;
 use Joomla\Database\DatabaseInterface;
 use Joomla\Filesystem\File;
 use Joomla\Filesystem\Path;
@@ -113,7 +113,7 @@ public static function getDbo($driver, $host, $user, $password, $database, $pref
             }
 
             // Get a database object.
-            $db = DatabaseDriver::getInstance($options);
+            $db = (new DatabaseFactory())->getDriver($options['driver'], $options);
         }
 
         return $db;

installation/src/Model/DatabaseModel.php

@@ -14,7 +14,7 @@
 use Joomla\CMS\Installation\Helper\DatabaseHelper;
 use Joomla\CMS\Language\LanguageHelper;
 use Joomla\CMS\Language\Text;
-use Joomla\Database\DatabaseDriver;
+use Joomla\Database\DatabaseFactory;
 use Joomla\Database\DatabaseInterface;
 use Joomla\Utilities\ArrayHelper;
 
@@ -159,7 +159,7 @@ public function createDatabase(array $options)
                     ];
                 }
 
-                $altDB = DatabaseDriver::getInstance($altDBoptions);
+                $altDB = (new DatabaseFactory())->getDriver($altDBoptions['driver'], $altDBoptions);
 
                 // Check database server parameters
                 $dbServerCheck = DatabaseHelper::checkDbServerParameters($altDB, $options);
@@ -321,8 +321,8 @@ public function createTables(string $schema, array $options)
     /**
      * Method to backup all tables in a database with a given prefix.
      *
-     * @param   DatabaseDriver  $db      DatabaseDriver object.
-     * @param   string          $prefix  Database table prefix.
+     * @param   DatabaseInterface  $db      Database object.
+     * @param   string             $prefix  Database table prefix.
      *
      * @return  boolean  True on success.
      *

libraries/src/Console/SetConfigurationCommand.php

@@ -12,7 +12,7 @@
 use Joomla\CMS\Factory;
 use Joomla\CMS\Language\Text;
 use Joomla\Console\Command\AbstractCommand;
-use Joomla\Database\DatabaseDriver;
+use Joomla\Database\DatabaseFactory;
 use Joomla\Registry\Registry;
 use Symfony\Component\Console\Input\Input;
 use Symfony\Component\Console\Input\InputArgument;
@@ -363,7 +363,7 @@ public function checkDb($options): bool
 
         // Get a database object.
         try {
-            $db = DatabaseDriver::getInstance($settings);
+            $db = (new DatabaseFactory())->getDriver($settings['driver'], $settings);
             $db->getVersion();
         } catch (\Exception $e) {
             $this->ioStyle->error(

libraries/src/Log/Logger/DatabaseLogger.php

@@ -13,6 +13,7 @@
 use Joomla\CMS\Log\LogEntry;
 use Joomla\CMS\Log\Logger;
 use Joomla\Database\DatabaseDriver;
+use Joomla\Database\DatabaseFactory;
 
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
@@ -171,6 +172,6 @@ protected function connect()
             'prefix'   => $this->prefix,
         ];
 
-        $this->db = DatabaseDriver::getInstance($options);
+        $this->db = (new DatabaseFactory())->getDriver($options['driver'], $options);
     }
 }

libraries/src/Service/Provider/Database.php

@@ -10,6 +10,7 @@
 namespace Joomla\CMS\Service\Provider;
 
 use Joomla\Database\DatabaseDriver;
+use Joomla\Database\DatabaseFactory;
 use Joomla\Database\DatabaseInterface;
 use Joomla\Database\Mysql\MysqlDriver;
 use Joomla\DI\Container;
@@ -83,7 +84,6 @@ function (Container $container) {
                     }
 
                     $options = [
-                        'driver'   => $dbtype,
                         'host'     => $conf->get('host'),
                         'user'     => $conf->get('user'),
                         'password' => $conf->get('password'),
@@ -120,7 +120,7 @@ function (Container $container) {
                     }
 
                     try {
-                        $db = DatabaseDriver::getInstance($options);
+                        $db = (new DatabaseFactory())->getDriver($dbtype, $options);
                     } catch (\RuntimeException $e) {
                         if (!headers_sent()) {
                             header('HTTP/1.1 500 Internal Server Error');

phpstan-baseline.neon

@@ -790,15 +790,6 @@ parameters:
 			count: 2
 			path: administrator/components/com_config/src/Model/ApplicationModel.php
 
-		-
-			message: '''
-				#^Call to deprecated method getInstance\(\) of class Joomla\\Database\\DatabaseDriver\:
-				3\.0  Use DatabaseFactory\:\:getDriver\(\) instead$#
-			'''
-			identifier: staticMethod.deprecated
-			count: 1
-			path: administrator/components/com_config/src/Model/ApplicationModel.php
-
 		-
 			message: '#^Instantiated class JConfig not found\.$#'
 			identifier: class.notFound
@@ -7976,15 +7967,6 @@ parameters:
 			count: 1
 			path: installation/src/Form/Field/Installation/PrefixField.php
 
-		-
-			message: '''
-				#^Call to deprecated method getInstance\(\) of class Joomla\\Database\\DatabaseDriver\:
-				3\.0  Use DatabaseFactory\:\:getDriver\(\) instead$#
-			'''
-			identifier: staticMethod.deprecated
-			count: 1
-			path: installation/src/Helper/DatabaseHelper.php
-
 		-
 			message: '''
 				#^Call to deprecated method getSession\(\) of class Joomla\\CMS\\Factory\:
@@ -8032,15 +8014,6 @@ parameters:
 			count: 3
 			path: installation/src/Model/ConfigurationModel.php
 
-		-
-			message: '''
-				#^Call to deprecated method getInstance\(\) of class Joomla\\Database\\DatabaseDriver\:
-				3\.0  Use DatabaseFactory\:\:getDriver\(\) instead$#
-			'''
-			identifier: staticMethod.deprecated
-			count: 1
-			path: installation/src/Model/DatabaseModel.php
-
 		-
 			message: '''
 				#^Call to deprecated method getLanguage\(\) of class Joomla\\CMS\\Factory\:
@@ -8899,15 +8872,6 @@ parameters:
 			count: 1
 			path: libraries/src/Console/RemoveUserFromGroupCommand.php
 
-		-
-			message: '''
-				#^Call to deprecated method getInstance\(\) of class Joomla\\Database\\DatabaseDriver\:
-				3\.0  Use DatabaseFactory\:\:getDriver\(\) instead$#
-			'''
-			identifier: staticMethod.deprecated
-			count: 1
-			path: libraries/src/Console/SetConfigurationCommand.php
-
 		-
 			message: '''
 				#^Call to deprecated method getLanguage\(\) of class Joomla\\CMS\\Factory\:
@@ -12044,15 +12008,6 @@ parameters:
 			count: 1
 			path: libraries/src/Log/Logger/DatabaseLogger.php
 
-		-
-			message: '''
-				#^Call to deprecated method getInstance\(\) of class Joomla\\Database\\DatabaseDriver\:
-				3\.0  Use DatabaseFactory\:\:getDriver\(\) instead$#
-			'''
-			identifier: staticMethod.deprecated
-			count: 1
-			path: libraries/src/Log/Logger/DatabaseLogger.php
-
 		-
 			message: '''
 				#^Call to deprecated method getError\(\) of class Joomla\\CMS\\MVC\\Model\\BaseModel\:
@@ -12938,15 +12893,6 @@ parameters:
 			count: 1
 			path: libraries/src/Service/Provider/Console.php
 
-		-
-			message: '''
-				#^Call to deprecated method getInstance\(\) of class Joomla\\Database\\DatabaseDriver\:
-				3\.0  Use DatabaseFactory\:\:getDriver\(\) instead$#
-			'''
-			identifier: staticMethod.deprecated
-			count: 1
-			path: libraries/src/Service/Provider/Database.php
-
 		-
 			message: '''
 				#^Call to deprecated method getUser\(\) of class Joomla\\CMS\\Factory\:

tests/System/integration/cli/Config.cy.js

@@ -0,0 +1,22 @@
+describe('Test that console command config', () => {
+  it('can get sitename', () => {
+    cy.exec(`php ${Cypress.expose('cmsPath')}/cli/joomla.php config:get sitename`)
+      .its('stdout')
+      .should('contain', Cypress.expose('sitename'));
+  });
+
+  it('can set sitename', () => {
+    cy.exec(`php ${Cypress.expose('cmsPath')}/cli/joomla.php config:set sitename="${Cypress.expose('sitename')}"`)
+      .its('stdout')
+      .should('contain', '[OK] Configuration set');
+  });
+
+  it('can not set invalid database name', () => {
+    cy.exec(`php ${Cypress.expose('cmsPath')}/cli/joomla.php config:set db=invalid`, { failOnNonZeroExit: false }).then((result) => {
+      cy.wrap(result).its('exitCode')
+        .should('equal', 4);
+      cy.wrap(result).its('stdout')
+        .should('contain', '[ERROR] Cannot connect to database');
+    });
+  });
+});