makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-08 04:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/16643] Fixes

Browse source 
PHPBB3-16643
This commit is contained in:
Máté Bartus 2021-02-01 22:09:15 +01:00
parent 0f7b89838a
commit 1ce97fe8ea
5 changed files with 11 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
phpBB/composer.json
View file

@ -28,6 +28,7 @@
"php": "^7.3 || ^8.0", "php": "^7.3 || ^8.0",
"ext-json": "*", "ext-json": "*",
"ext-mbstring": "*", "ext-mbstring": "*",
"ext-pdo": "*",
"bantu/ini-get-wrapper": "~1.0", "bantu/ini-get-wrapper": "~1.0",
"chita/topological_sort": "^3.0", "chita/topological_sort": "^3.0",
"composer/composer": "^2.0", "composer/composer": "^2.0",

4
phpBB/phpbb/db/doctrine/connection_factory.php
View file

@ -35,7 +35,7 @@ class connection_factory
* @return Connection Doctrine DBAL connection. * @return Connection Doctrine DBAL connection.
* *
* @throws runtime_exception If the database connection could not be established. * @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 public static function get_connection(config_php_file $config) : Connection
{ {
@ -69,7 +69,7 @@ class connection_factory
* @return Connection Doctrine DBAL connection. * @return Connection Doctrine DBAL connection.
* *
* @throws runtime_exception If the database connection could not be established. * @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( public static function get_connection_from_params(
string $driver, string $driver,

10
phpBB/phpbb/db/doctrine/driver_convertor.php
View file

@ -41,23 +41,23 @@ trait driver_convertor
case 'mssql_odbc': case 'mssql_odbc':
case 'mssqlnative': case 'mssqlnative':
$name = 'pdo_sqlsrv'; $name = 'pdo_sqlsrv';
break; break;
case 'mysqli': case 'mysqli':
$name = 'pdo_mysql'; $name = 'pdo_mysql';
break; break;
case 'oracle': case 'oracle':
$name = 'oci8'; $name = 'oci8';
break; break;
case 'postgres': case 'postgres':
$name = 'pdo_pgsql'; $name = 'pdo_pgsql';
break; break;
case 'sqlite3': case 'sqlite3':
$name = 'pdo_sqlite'; $name = 'pdo_sqlite';
break; break;
default: default:
throw new InvalidArgumentException('Invalid phpBB database driver provided: ' . $driver_name); throw new InvalidArgumentException('Invalid phpBB database driver provided: ' . $driver_name);

8
phpBB/phpbb/install/database_task.php
View file

@ -29,14 +29,10 @@ use phpbb\install\helper\iohandler\iohandler_interface;
*/ */
abstract class database_task extends task_base abstract class database_task extends task_base
{ {
/** /** @var Connection */
* @var Connection
*/
private $conn; private $conn;
/** /** @var iohandler_interface */
* @var iohandler_interface
*/
private $io; private $io;
/** /**

2
phpBB/phpbb/install/module/install_database/task/add_default_data.php
View file

@ -68,7 +68,7 @@ class add_default_data extends database_task
language $language, language $language,
string $root_path) 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->database_helper = $db_helper;
$this->config = $config; $this->config = $config;
$this->language = $language; $this->language = $language;