From bd02c5bd085e957aa4341e7fc2df2199081ab069 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Sun, 6 Oct 2019 12:07:35 +0200
Subject: [ticket/16051] Remove mysql driver as it's no longer supported in PHP
 >= 7.0

PHPBB3-16051
---
 tests/RUNNING_TESTS.md                                   |  1 -
 tests/di/fixtures/config.php                             |  2 +-
 tests/functions/convert_30_dbms_to_31_test.php           |  1 -
 .../phpbb_database_test_connection_manager.php           | 16 +---------------
 4 files changed, 2 insertions(+), 18 deletions(-)

(limited to 'tests')

diff --git a/tests/RUNNING_TESTS.md b/tests/RUNNING_TESTS.md
index 56f2818078..6e9171e7ed 100644
--- a/tests/RUNNING_TESTS.md
+++ b/tests/RUNNING_TESTS.md
@@ -34,7 +34,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)
diff --git a/tests/di/fixtures/config.php b/tests/di/fixtures/config.php
index 1e9207d924..d6b8a567c7 100644
--- a/tests/di/fixtures/config.php
+++ b/tests/di/fixtures/config.php
@@ -1,7 +1,7 @@
 <?php
 // phpBB 3.1.x auto-generated configuration file
 // Do not change anything in this file!
-$dbms = 'mysql';
+$dbms = 'mysqli';
 $dbhost = '127.0.0.1';
 $dbport = '';
 $dbname = 'phpbb';
diff --git a/tests/functions/convert_30_dbms_to_31_test.php b/tests/functions/convert_30_dbms_to_31_test.php
index 456eb64461..05c42610bb 100644
--- a/tests/functions/convert_30_dbms_to_31_test.php
+++ b/tests/functions/convert_30_dbms_to_31_test.php
@@ -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'),
diff --git a/tests/test_framework/phpbb_database_test_connection_manager.php b/tests/test_framework/phpbb_database_test_connection_manager.php
index f3adbefc1b..fec4709fbd 100644
--- a/tests/test_framework/phpbb_database_test_connection_manager.php
+++ b/tests/test_framework/phpbb_database_test_connection_manager.php
@@ -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',
-- 
cgit v1.2.1