diff --git a/phpBB/composer.json b/phpBB/composer.json index fb121c9f68..21b0b5e7ba 100644 --- a/phpBB/composer.json +++ b/phpBB/composer.json @@ -28,6 +28,7 @@ "php": "^7.3 || ^8.0", "ext-json": "*", "ext-mbstring": "*", + "ext-pdo": "*", "bantu/ini-get-wrapper": "~1.0", "chita/topological_sort": "^3.0", "composer/composer": "^2.0", diff --git a/phpBB/phpbb/db/doctrine/connection_factory.php b/phpBB/phpbb/db/doctrine/connection_factory.php index aa29a6bcb6..93c5b8c03e 100644 --- a/phpBB/phpbb/db/doctrine/connection_factory.php +++ b/phpBB/phpbb/db/doctrine/connection_factory.php @@ -35,7 +35,7 @@ class connection_factory * @return Connection Doctrine DBAL connection. * * @throws runtime_exception If the database connection could not be established. - * @throws InvalidArgumentException If $driver_name is not a valid phpBB database driver. + * @throws InvalidArgumentException If the provided driver name is not a valid phpBB database driver. */ public static function get_connection(config_php_file $config) : Connection { @@ -69,7 +69,7 @@ class connection_factory * @return Connection Doctrine DBAL connection. * * @throws runtime_exception If the database connection could not be established. - * @throws InvalidArgumentException If $driver_name is not a valid phpBB database driver. + * @throws InvalidArgumentException If $driver is not a valid phpBB database driver. */ public static function get_connection_from_params( string $driver, diff --git a/phpBB/phpbb/db/doctrine/driver_convertor.php b/phpBB/phpbb/db/doctrine/driver_convertor.php index cf0f296538..b729b1065e 100644 --- a/phpBB/phpbb/db/doctrine/driver_convertor.php +++ b/phpBB/phpbb/db/doctrine/driver_convertor.php @@ -41,23 +41,23 @@ trait driver_convertor case 'mssql_odbc': case 'mssqlnative': $name = 'pdo_sqlsrv'; - break; + break; case 'mysqli': $name = 'pdo_mysql'; - break; + break; case 'oracle': $name = 'oci8'; - break; + break; case 'postgres': $name = 'pdo_pgsql'; - break; + break; case 'sqlite3': $name = 'pdo_sqlite'; - break; + break; default: throw new InvalidArgumentException('Invalid phpBB database driver provided: ' . $driver_name); diff --git a/phpBB/phpbb/install/database_task.php b/phpBB/phpbb/install/database_task.php index 7405e3d075..81864773c5 100644 --- a/phpBB/phpbb/install/database_task.php +++ b/phpBB/phpbb/install/database_task.php @@ -29,14 +29,10 @@ use phpbb\install\helper\iohandler\iohandler_interface; */ abstract class database_task extends task_base { - /** - * @var Connection - */ + /** @var Connection */ private $conn; - /** - * @var iohandler_interface - */ + /** @var iohandler_interface */ private $io; /** diff --git a/phpBB/phpbb/install/module/install_database/task/add_default_data.php b/phpBB/phpbb/install/module/install_database/task/add_default_data.php index 6ea02622fa..bf64f2276a 100644 --- a/phpBB/phpbb/install/module/install_database/task/add_default_data.php +++ b/phpBB/phpbb/install/module/install_database/task/add_default_data.php @@ -68,7 +68,7 @@ class add_default_data extends database_task language $language, string $root_path) { - $this->db = self::get_doctrine_connection($db_helper, $config); + $this->db = self::get_doctrine_connection($db_helper, $config); $this->database_helper = $db_helper; $this->config = $config; $this->language = $language;