mirror of
https://github.com/phpbb/phpbb.git
synced 2025-07-30 21:40:43 +02:00
Merge pull request #5708 from marc1706/ticket/16051
[ticket/16051] Remove mysql driver as it's no longer supported in PHP >= 7.0
This commit is contained in:
@@ -33,7 +33,6 @@ will be skipped:
|
||||
- apcu (APCu cache driver - native API, php7+)
|
||||
- apcu_bc, apcu (APCu cache driver - APC API, php7+)
|
||||
- bz2 (compress tests)
|
||||
- mysql, pdo_mysql (MySQL database driver)
|
||||
- mysqli, pdo_mysql (MySQLi database driver)
|
||||
- pcntl (flock class)
|
||||
- pdo (any database tests)
|
||||
|
@@ -18,7 +18,6 @@ class phpbb_convert_30_dbms_to_31_test extends phpbb_test_case
|
||||
return array(
|
||||
array('mssql_odbc'),
|
||||
array('mssqlnative'),
|
||||
array('mysql'),
|
||||
array('mysqli'),
|
||||
array('oracle'),
|
||||
array('postgres'),
|
||||
|
@@ -150,7 +150,6 @@ class phpbb_database_test_connection_manager
|
||||
|
||||
switch ($this->config['dbms'])
|
||||
{
|
||||
case 'phpbb\db\driver\mysql':
|
||||
case 'phpbb\db\driver\mysqli':
|
||||
$this->pdo->exec('SET NAMES utf8');
|
||||
|
||||
@@ -270,7 +269,6 @@ class phpbb_database_test_connection_manager
|
||||
|
||||
switch ($this->config['dbms'])
|
||||
{
|
||||
case 'phpbb\db\driver\mysql':
|
||||
case 'phpbb\db\driver\mysqli':
|
||||
$sql = 'SHOW TABLES';
|
||||
break;
|
||||
@@ -336,14 +334,7 @@ class phpbb_database_test_connection_manager
|
||||
$sth = $this->pdo->query('SELECT VERSION() AS version');
|
||||
$row = $sth->fetch(PDO::FETCH_ASSOC);
|
||||
|
||||
if (version_compare($row['version'], '4.1.3', '>='))
|
||||
{
|
||||
$schema .= '_41';
|
||||
}
|
||||
else
|
||||
{
|
||||
$schema .= '_40';
|
||||
}
|
||||
$schema .= '_41';
|
||||
}
|
||||
|
||||
$filename = $directory . $schema . '_schema.sql';
|
||||
@@ -424,11 +415,6 @@ class phpbb_database_test_connection_manager
|
||||
'DELIM' => ';',
|
||||
'PDO' => 'mysql',
|
||||
),
|
||||
'phpbb\db\driver\mysql' => array(
|
||||
'SCHEMA' => 'mysql',
|
||||
'DELIM' => ';',
|
||||
'PDO' => 'mysql',
|
||||
),
|
||||
'phpbb\db\driver\mssql' => array(
|
||||
'SCHEMA' => 'mssql',
|
||||
'DELIM' => 'GO',
|
||||
|
Reference in New Issue
Block a user