Merge branch '3.2.x'

tests/functions/convert_30_dbms_to_31_test.php

@@ -22,7 +22,6 @@ class phpbb_convert_30_dbms_to_31_test extends phpbb_test_case
 			array('mysqli'),
 			array('oracle'),
 			array('postgres'),
-			array('sqlite'),
 		);
 	}
 

tests/migrator/schema_generator_test.php

@@ -29,7 +29,7 @@ class schema_generator_test extends phpbb_test_case
 		parent::setUp();
 
 		$this->config = new \phpbb\config\config(array());
-		$this->db = new \phpbb\db\driver\sqlite();
+		$this->db = new \phpbb\db\driver\sqlite3();
 		$factory = new \phpbb\db\tools\factory();
 		$this->db_tools = $factory->get($this->db);
 		$this->table_prefix = 'phpbb_';

tests/test_framework/phpbb_database_test_case.php

@@ -76,7 +76,7 @@ abstract class phpbb_database_test_case extends PHPUnit_Extensions_Database_Test
 
 			global $table_prefix;
 
-			$db = new \phpbb\db\driver\sqlite();
+			$db = new \phpbb\db\driver\sqlite3();
 			$factory = new \phpbb\db\tools\factory();
 			$db_tools = $factory->get($db, true);
 

tests/test_framework/phpbb_database_test_connection_manager.php

@@ -55,7 +55,6 @@ class phpbb_database_test_connection_manager
 
 		switch ($this->dbms['PDO'])
 		{
-			case 'sqlite2':
 			case 'sqlite':	// SQLite3 driver
 				$dsn .= $this->config['dbhost'];
 			break;
@@ -193,7 +192,6 @@ class phpbb_database_test_connection_manager
 	{
 		switch ($this->config['dbms'])
 		{
-			case 'phpbb\db\driver\sqlite':
 			case 'phpbb\db\driver\sqlite3':
 				$this->connect();
 				// Drop all of the tables
@@ -269,12 +267,6 @@ class phpbb_database_test_connection_manager
 				$sql = 'SHOW TABLES';
 			break;
 
-			case 'phpbb\db\driver\sqlite':
-				$sql = 'SELECT name
-					FROM sqlite_master
-					WHERE type = "table"';
-			break;
-
 			case 'phpbb\db\driver\sqlite3':
 				$sql = 'SELECT name
 					FROM sqlite_master
@@ -378,7 +370,7 @@ class phpbb_database_test_connection_manager
 			$classes = $finder->core_path('phpbb/db/migration/data/')
 				->get_classes();
 
-			$db = new \phpbb\db\driver\sqlite();
+			$db = new \phpbb\db\driver\sqlite3();
 			$factory = new \phpbb\db\tools\factory();
 			$db_tools = $factory->get($db, true);
 
@@ -454,11 +446,6 @@ class phpbb_database_test_connection_manager
 				'DELIM'			=> ';',
 				'PDO'			=> 'pgsql',
 			),
-			'phpbb\db\driver\sqlite'		=> array(
-				'SCHEMA'		=> 'sqlite',
-				'DELIM'			=> ';',
-				'PDO'			=> 'sqlite2',
-			),
 			'phpbb\db\driver\sqlite3'		=> array(
 				'SCHEMA'		=> 'sqlite',
 				'DELIM'			=> ';',

tests/test_framework/phpbb_test_case_helpers.php

@@ -122,17 +122,6 @@ class phpbb_test_case_helpers
 				'dbpasswd'	=> '',
 			));
 		}
-		else if (extension_loaded('sqlite'))
-		{
-			$config = array_merge($config, array(
-				'dbms'		=> 'phpbb\db\driver\sqlite',
-				'dbhost'	=> dirname(__FILE__) . '/../phpbb_unit_tests.sqlite2', // filename
-				'dbport'	=> '',
-				'dbname'	=> '',
-				'dbuser'	=> '',
-				'dbpasswd'	=> '',
-			));
-		}
 
 		if (isset($_SERVER['PHPBB_TEST_CONFIG']))
 		{