Skip to content

Commit

Permalink
[ticket/13421] Move tools to subdirectory
Browse files Browse the repository at this point in the history 
PHPBB3-13421
  • Loading branch information
@nickvergessen
nickvergessen committed Dec 6, 2014
1 parent d78bb28 commit d968801
Show file tree
Hide file tree
Showing 25 changed files with 41 additions and 41 deletions.
2 changes: 1 addition & 1 deletion phpBB/config/default/container/services_db.yml
View file
Expand Up @@ -10,7 +10,7 @@ services:
- [sql_connect, [%dbal.dbhost%, %dbal.dbuser%, %dbal.dbpasswd%, %dbal.dbname%, %dbal.dbport%, false, %dbal.new_link%]]

dbal.tools:
class: phpbb\db\tools
class: phpbb\db\tools\tools
arguments:
- @dbal.conn

Expand Down
4 changes: 2 additions & 2 deletions phpBB/develop/create_schema_files.php
View file
Expand Up @@ -49,9 +49,9 @@
->get_classes();

$db = new \phpbb\db\driver\sqlite();
$schema_generator = new \phpbb\db\migration\schema_generator($classes, new \phpbb\config\config(array()), $db, new \phpbb\db\tools($db, true), $phpbb_root_path, $phpEx, $table_prefix);
$schema_generator = new \phpbb\db\migration\schema_generator($classes, new \phpbb\config\config(array()), $db, new \phpbb\db\tools\tools($db, true), $phpbb_root_path, $phpEx, $table_prefix);
$schema_data = $schema_generator->get_schema();
$dbms_type_map = phpbb\db\tools::get_dbms_type_map();
$dbms_type_map = phpbb\db\tools\tools::get_dbms_type_map();

$fp = fopen($schema_path . 'schema.json', 'wb');
fwrite($fp, json_encode($schema_data, JSON_PRETTY_PRINT));
Expand Down
4 changes: 2 additions & 2 deletions phpBB/develop/mysql_upgrader.php
View file
Expand Up @@ -63,9 +63,9 @@
@set_time_limit(0);

require($phpbb_root_path . 'includes/db/schema_data.' . $phpEx);
require($phpbb_root_path . 'phpbb/db/tools.' . $phpEx);
require($phpbb_root_path . 'phpbb/db/tools/tools.' . $phpEx);

$dbms_type_map = phpbb\db\tools::get_dbms_type_map();
$dbms_type_map = phpbb\db\tools\tools::get_dbms_type_map();

foreach ($schema_data as $table_name => $table_data)
{
Expand Down
2 changes: 1 addition & 1 deletion phpBB/includes/acp/acp_database.php
View file
Expand Up @@ -29,7 +29,7 @@ function main($id, $mode)
global $cache, $db, $user, $auth, $template, $table_prefix;
global $config, $phpbb_root_path, $phpbb_admin_path, $phpEx;

$this->db_tools = new \phpbb\db\tools($db);
$this->db_tools = new \phpbb\db\tools\tools($db);

$user->add_lang('acp/database');

Expand Down
2 changes: 1 addition & 1 deletion phpBB/includes/functions_install.php
View file
Expand Up @@ -188,7 +188,7 @@ function dbms_select($default = '', $only_20x_options = false)
*/
function get_tables(&$db)
{
$db_tools = new \phpbb\db\tools($db);
$db_tools = new \phpbb\db\tools\tools($db);

return $db_tools->sql_list_tables();
}
Expand Down
2 changes: 1 addition & 1 deletion phpBB/install/convertors/functions_phpbb20.php
View file
Expand Up @@ -1926,7 +1926,7 @@ function phpbb_check_username_collisions()
function phpbb_convert_timezone($timezone)
{
global $config, $db, $phpbb_root_path, $phpEx, $table_prefix;
$timezone_migration = new \phpbb\db\migration\data\v310\timezone($config, $db, new \phpbb\db\tools($db), $phpbb_root_path, $phpEx, $table_prefix);
$timezone_migration = new \phpbb\db\migration\data\v310\timezone($config, $db, new \phpbb\db\tools\tools($db), $phpbb_root_path, $phpEx, $table_prefix);
return $timezone_migration->convert_phpbb30_timezone($timezone, 0);
}

Expand Down
4 changes: 2 additions & 2 deletions phpBB/install/install_install.php
View file
Expand Up @@ -1197,7 +1197,7 @@ function load_schema($mode, $sub)
->get_classes();

$sqlite_db = new \phpbb\db\driver\sqlite();
$schema_generator = new \phpbb\db\migration\schema_generator($classes, new \phpbb\config\config(array()), $sqlite_db, new \phpbb\db\tools($sqlite_db, true), $phpbb_root_path, $phpEx, $table_prefix);
$schema_generator = new \phpbb\db\migration\schema_generator($classes, new \phpbb\config\config(array()), $sqlite_db, new \phpbb\db\tools\tools($sqlite_db, true), $phpbb_root_path, $phpEx, $table_prefix);
$db_table_schema = $schema_generator->get_schema();
}

Expand All @@ -1209,7 +1209,7 @@ function load_schema($mode, $sub)
define('CONFIG_TABLE', $data['table_prefix'] . 'config');
}

$db_tools = new \phpbb\db\tools($db);
$db_tools = new \phpbb\db\tools\tools($db);
foreach ($db_table_schema as $table_name => $table_data)
{
$db_tools->sql_create_table(
Expand Down
4 changes: 2 additions & 2 deletions phpBB/phpbb/captcha/plugins/qa.php
View file
Expand Up @@ -115,7 +115,7 @@ public function is_installed()
{
global $db;

$db_tool = new \phpbb\db\tools($db);
$db_tool = new \phpbb\db\tools\tools($db);

return $db_tool->sql_table_exists($this->table_captcha_questions);
}
Expand Down Expand Up @@ -308,7 +308,7 @@ function install()
{
global $db;

$db_tool = new \phpbb\db\tools($db);
$db_tool = new \phpbb\db\tools\tools($db);

$tables = array($this->table_captcha_questions, $this->table_captcha_answers, $this->table_qa_confirm);

Expand Down
2 changes: 1 addition & 1 deletion phpBB/phpbb/db/migration/data/v30x/release_3_0_9_rc1.php
View file
Expand Up @@ -34,7 +34,7 @@ public function update_schema()
// this column was removed from the database updater
// after 3.0.9-RC3 was released. It might still exist
// in 3.0.9-RCX installations and has to be dropped as
// soon as the db_tools class is capable of properly
// soon as the \phpbb\db\tools\tools class is capable of properly
// removing a primary key.
// 'attempt_id' => array('UINT', NULL, 'auto_increment'),
'attempt_ip' => array('VCHAR:40', ''),
Expand Down
6 changes: 3 additions & 3 deletions phpBB/phpbb/db/migration/migration.php
View file
Expand Up @@ -28,7 +28,7 @@ abstract class migration
/** @var \phpbb\db\driver\driver_interface */
protected $db;

/** @var \phpbb\db\tools_interface */
/** @var \phpbb\db\tools\tools_interface */
protected $db_tools;

/** @var string */
Expand All @@ -51,12 +51,12 @@ abstract class migration
*
* @param \phpbb\config\config $config
* @param \phpbb\db\driver\driver_interface $db
* @param \phpbb\db\tools_interface $db_tools
* @param \phpbb\db\tools\tools_interface $db_tools
* @param string $phpbb_root_path
* @param string $php_ext
* @param string $table_prefix
*/
public function __construct(\phpbb\config\config $config, \phpbb\db\driver\driver_interface $db, \phpbb\db\tools_interface $db_tools, $phpbb_root_path, $php_ext, $table_prefix)
public function __construct(\phpbb\config\config $config, \phpbb\db\driver\driver_interface $db, \phpbb\db\tools\tools_interface $db_tools, $phpbb_root_path, $php_ext, $table_prefix)
{
$this->config = $config;
$this->db = $db;
Expand Down
4 changes: 2 additions & 2 deletions phpBB/phpbb/db/migration/schema_generator.php
View file
Expand Up @@ -24,7 +24,7 @@ class schema_generator
/** @var \phpbb\db\driver\driver_interface */
protected $db;

/** @var \phpbb\db\tools */
/** @var \phpbb\db\tools\tools_interface */
protected $db_tools;

/** @var array */
Expand All @@ -48,7 +48,7 @@ class schema_generator
/**
* Constructor
*/
public function __construct(array $class_names, \phpbb\config\config $config, \phpbb\db\driver\driver_interface $db, \phpbb\db\tools $db_tools, $phpbb_root_path, $php_ext, $table_prefix)
public function __construct(array $class_names, \phpbb\config\config $config, \phpbb\db\driver\driver_interface $db, \phpbb\db\tools\tools_interface $db_tools, $phpbb_root_path, $php_ext, $table_prefix)
{
$this->config = $config;
$this->db = $db;
Expand Down
4 changes: 2 additions & 2 deletions phpBB/phpbb/db/migrator.php
View file
Expand Up @@ -24,7 +24,7 @@ class migrator
/** @var \phpbb\db\driver\driver_interface */
protected $db;

/** @var \phpbb\db\tools_interface */
/** @var \phpbb\db\tools\tools_interface */
protected $db_tools;

/** @var \phpbb\db\migration\helper */
Expand Down Expand Up @@ -84,7 +84,7 @@ class migrator
/**
* Constructor of the database migrator
*/
public function __construct(\phpbb\config\config $config, \phpbb\db\driver\driver_interface $db, \phpbb\db\tools_interface $db_tools, $migrations_table, $phpbb_root_path, $php_ext, $table_prefix, $tools, \phpbb\db\migration\helper $helper)
public function __construct(\phpbb\config\config $config, \phpbb\db\driver\driver_interface $db, \phpbb\db\tools\tools_interface $db_tools, $migrations_table, $phpbb_root_path, $php_ext, $table_prefix, $tools, \phpbb\db\migration\helper $helper)
{
$this->config = $config;
$this->db = $db;
Expand Down
2 changes: 1 addition & 1 deletion phpBB/phpbb/db/tools.php → phpBB/phpbb/db/tools/tools.php
View file
Expand Up @@ -11,7 +11,7 @@
*
*/

namespace phpbb\db;
namespace phpbb\db\tools;

/**
* Database Tools for handling cross-db actions such as altering columns, etc.
Expand Down
2 changes: 1 addition & 1 deletion phpBB/phpbb/db/tools_interface.php → phpBB/phpbb/db/tools/tools_interface.php
View file
Expand Up @@ -11,7 +11,7 @@
*
*/

namespace phpbb\db;
namespace phpbb\db\tools;

/**
* Interface for a Database Tools for handling cross-db actions such as altering columns, etc.
Expand Down
6 changes: 3 additions & 3 deletions phpBB/phpbb/search/fulltext_sphinx.php
View file
Expand Up @@ -85,7 +85,7 @@ class fulltext_sphinx

/**
* Database Tools object
* @var \phpbb\db\tools_interface
* @var \phpbb\db\tools\tools_interface
*/
protected $db_tools;

Expand Down Expand Up @@ -135,8 +135,8 @@ public function __construct(&$error, $phpbb_root_path, $phpEx, $auth, $config, $
$this->db = $db;
$this->auth = $auth;

// Initialize \phpbb\db\tools object
$this->db_tools = new \phpbb\db\tools($this->db);
// Initialize \phpbb\db\tools\tools object
$this->db_tools = new \phpbb\db\tools\tools($this->db);

if(!$this->config['fulltext_sphinx_id'])
{
Expand Down
2 changes: 1 addition & 1 deletion tests/dbal/auto_increment_test.php
View file
Expand Up @@ -30,7 +30,7 @@ protected function setUp()
parent::setUp();

$this->db = $this->new_dbal();
$this->tools = new \phpbb\db\tools($this->db);
$this->tools = new \phpbb\db\tools\tools($this->db);

$this->table_data = array(
'COLUMNS' => array(
Expand Down
8 changes: 4 additions & 4 deletions tests/dbal/db_tools_test.php
View file
Expand Up @@ -17,7 +17,7 @@ class phpbb_dbal_db_tools_test extends phpbb_database_test_case
{
/** @var \phpbb\db\driver\driver_interface */
protected $db;
/** @var \phpbb\db\tools_interface */
/** @var \phpbb\db\tools\tools_interface */
protected $tools;
protected $table_exists;
protected $table_data;
Expand All @@ -32,7 +32,7 @@ protected function setUp()
parent::setUp();

$this->db = $this->new_dbal();
$this->tools = new \phpbb\db\tools($this->db);
$this->tools = new \phpbb\db\tools\tools($this->db);

$this->table_data = array(
'COLUMNS' => array(
Expand Down Expand Up @@ -340,7 +340,7 @@ public function test_table_drop()

public function test_perform_schema_changes_drop_tables()
{
$db_tools = $this->getMock('\phpbb\db\tools', array(
$db_tools = $this->getMock('\phpbb\db\tools\tools', array(
'sql_table_exists',
'sql_table_drop',
), array(&$this->db));
Expand All @@ -366,7 +366,7 @@ public function test_perform_schema_changes_drop_tables()

public function test_perform_schema_changes_drop_columns()
{
$db_tools = $this->getMock('\phpbb\db\tools', array(
$db_tools = $this->getMock('\phpbb\db\tools\tools', array(
'sql_column_exists',
'sql_column_remove',
), array(&$this->db));
Expand Down
2 changes: 1 addition & 1 deletion tests/dbal/migrator_test.php
View file
Expand Up @@ -38,7 +38,7 @@ public function setUp()
parent::setUp();

$this->db = $this->new_dbal();
$this->db_tools = new \phpbb\db\tools($this->db);
$this->db_tools = new \phpbb\db\tools\tools($this->db);

$this->config = new \phpbb\config\db($this->db, new phpbb_mock_cache, 'phpbb_config');

Expand Down
2 changes: 1 addition & 1 deletion tests/extension/manager_test.php
View file
Expand Up @@ -150,7 +150,7 @@ protected function create_extension_manager($with_cache = true)

$config = new \phpbb\config\config(array('version' => PHPBB_VERSION));
$db = $this->new_dbal();
$db_tools = new \phpbb\db\tools($db);
$db_tools = new \phpbb\db\tools\tools($db);
$phpbb_root_path = __DIR__ . './../../phpBB/';
$php_ext = 'php';
$table_prefix = 'phpbb_';
Expand Down
2 changes: 1 addition & 1 deletion tests/extension/metadata_manager_test.php
View file
Expand Up @@ -41,7 +41,7 @@ protected function setUp()
'version' => '3.1.0',
));
$this->db = $this->new_dbal();
$this->db_tools = new \phpbb\db\tools($this->db);
$this->db_tools = new \phpbb\db\tools\tools($this->db);
$this->phpbb_root_path = dirname(__FILE__) . '/';
$this->phpEx = 'php';
$this->user = new \phpbb\user('\phpbb\datetime');
Expand Down
6 changes: 3 additions & 3 deletions tests/migrator/convert_timezones_test.php
View file
Expand Up @@ -18,7 +18,7 @@ class phpbb_migrator_convert_timezones_test extends phpbb_database_test_case
public function getDataSet()
{
$this->db = $this->new_dbal();
$db_tools = new \phpbb\db\tools($this->db);
$db_tools = new \phpbb\db\tools\tools($this->db);

// user_dst doesn't exist anymore, must re-add it to test this
$db_tools->sql_column_add('phpbb_users', 'user_dst', array('BOOL', 1));
Expand Down Expand Up @@ -59,7 +59,7 @@ protected function setUp()
$this->migration = new \phpbb\db\migration\data\v310\timezone(
new \phpbb\config\config(array()),
$this->db,
new \phpbb\db\tools($this->db),
new \phpbb\db\tools\tools($this->db),
$phpbb_root_path,
$phpEx,
'phpbb_'
Expand Down Expand Up @@ -90,7 +90,7 @@ public function test_convert()
}
$this->db->sql_freeresult($result);

$db_tools = new \phpbb\db\tools($this->db);
$db_tools = new \phpbb\db\tools\tools($this->db);

// Remove the user_dst field again
$db_tools->sql_column_remove('phpbb_users', 'user_dst');
Expand Down
2 changes: 1 addition & 1 deletion tests/notification/convert_test.php
View file
Expand Up @@ -32,7 +32,7 @@ protected function setUp()
$this->migration = new \phpbb\db\migration\data\v310\notification_options_reconvert(
new \phpbb\config\config(array()),
$this->db,
new \phpbb\db\tools($this->db),
new \phpbb\db\tools\tools($this->db),
$phpbb_root_path,
$phpEx,
'phpbb_'
Expand Down
2 changes: 1 addition & 1 deletion tests/test_framework/phpbb_database_test_case.php
View file
Expand Up @@ -77,7 +77,7 @@ static public function setUpBeforeClass()
global $table_prefix;

$db = new \phpbb\db\driver\sqlite();
$schema_generator = new \phpbb\db\migration\schema_generator($classes, new \phpbb\config\config(array()), $db, new \phpbb\db\tools($db, true), $phpbb_root_path, $phpEx, $table_prefix);
$schema_generator = new \phpbb\db\migration\schema_generator($classes, new \phpbb\config\config(array()), $db, new \phpbb\db\tools\tools($db, true), $phpbb_root_path, $phpEx, $table_prefix);
file_put_contents(self::$schema_file, json_encode($schema_generator->get_schema()));
}

Expand Down
4 changes: 2 additions & 2 deletions tests/test_framework/phpbb_database_test_connection_manager.php
View file
Expand Up @@ -370,11 +370,11 @@ protected function load_schema_from_file($directory, \phpbb\db\driver\driver_int
->get_classes();

$db = new \phpbb\db\driver\sqlite();
$schema_generator = new \phpbb\db\migration\schema_generator($classes, new \phpbb\config\config(array()), $db, new \phpbb\db\tools($db, true), $phpbb_root_path, $phpEx, $table_prefix);
$schema_generator = new \phpbb\db\migration\schema_generator($classes, new \phpbb\config\config(array()), $db, new \phpbb\db\tools\tools($db, true), $phpbb_root_path, $phpEx, $table_prefix);
$db_table_schema = $schema_generator->get_schema();
}

$db_tools = new \phpbb\db\tools($db, true);
$db_tools = new \phpbb\db\tools\tools($db, true);
foreach ($db_table_schema as $table_name => $table_data)
{
$queries = $db_tools->sql_create_table(
Expand Down
2 changes: 1 addition & 1 deletion tests/test_framework/phpbb_functional_test_case.php
View file
Expand Up @@ -230,7 +230,7 @@ protected function get_extension_manager()

$config = new \phpbb\config\config(array());
$db = $this->get_db();
$db_tools = new \phpbb\db\tools($db);
$db_tools = new \phpbb\db\tools\tools($db);

$migrator = new \phpbb\db\migrator(
$config,
Expand Down

0 comments on commit d968801

Please sign in to comment.