diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-11-22 02:15:06 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-12-06 16:17:04 +0100 |
| commit | d78bb2865b27aa753b165fdc8aaa73ed82eaeac8 (patch) | |
| tree | 371764fe3fb258d1cba3fde6832c1673aebd8b62 | |
| parent | 536bdf036b6fc2a715f5dc3eec759fe360c2b1cf (diff) | |
| download | forums-d78bb2865b27aa753b165fdc8aaa73ed82eaeac8.tar forums-d78bb2865b27aa753b165fdc8aaa73ed82eaeac8.tar.gz forums-d78bb2865b27aa753b165fdc8aaa73ed82eaeac8.tar.bz2 forums-d78bb2865b27aa753b165fdc8aaa73ed82eaeac8.tar.xz forums-d78bb2865b27aa753b165fdc8aaa73ed82eaeac8.zip | |
[ticket/13421] Always require the interface when possible
PHPBB3-13421
| -rw-r--r-- | phpBB/phpbb/db/migration/migration.php | 6 | ||||
| -rw-r--r-- | phpBB/phpbb/db/migrator.php | 4 | ||||
| -rw-r--r-- | phpBB/phpbb/search/fulltext_sphinx.php | 2 | ||||
| -rw-r--r-- | tests/dbal/db_tools_test.php | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/phpBB/phpbb/db/migration/migration.php b/phpBB/phpbb/db/migration/migration.php index 5f120333e1..6cf7685350 100644 --- a/phpBB/phpbb/db/migration/migration.php +++ b/phpBB/phpbb/db/migration/migration.php @@ -28,7 +28,7 @@ abstract class migration /** @var \phpbb\db\driver\driver_interface */ protected $db; - /** @var \phpbb\db\tools */ + /** @var \phpbb\db\tools_interface */ protected $db_tools; /** @var string */ @@ -51,12 +51,12 @@ abstract class migration * * @param \phpbb\config\config $config * @param \phpbb\db\driver\driver_interface $db - * @param \phpbb\db\tools $db_tools + * @param \phpbb\db\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 $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_interface $db_tools, $phpbb_root_path, $php_ext, $table_prefix) { $this->config = $config; $this->db = $db; diff --git a/phpBB/phpbb/db/migrator.php b/phpBB/phpbb/db/migrator.php index d03496eae3..c0d42ab6ac 100644 --- a/phpBB/phpbb/db/migrator.php +++ b/phpBB/phpbb/db/migrator.php @@ -24,7 +24,7 @@ class migrator /** @var \phpbb\db\driver\driver_interface */ protected $db; - /** @var \phpbb\db\tools */ + /** @var \phpbb\db\tools_interface */ protected $db_tools; /** @var \phpbb\db\migration\helper */ @@ -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 $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_interface $db_tools, $migrations_table, $phpbb_root_path, $php_ext, $table_prefix, $tools, \phpbb\db\migration\helper $helper) { $this->config = $config; $this->db = $db; diff --git a/phpBB/phpbb/search/fulltext_sphinx.php b/phpBB/phpbb/search/fulltext_sphinx.php index eb53ca6d40..7be1b487ab 100644 --- a/phpBB/phpbb/search/fulltext_sphinx.php +++ b/phpBB/phpbb/search/fulltext_sphinx.php @@ -85,7 +85,7 @@ class fulltext_sphinx /** * Database Tools object - * @var \phpbb\db\tools + * @var \phpbb\db\tools_interface */ protected $db_tools; diff --git a/tests/dbal/db_tools_test.php b/tests/dbal/db_tools_test.php index 51f9daacfb..d34a2249ef 100644 --- a/tests/dbal/db_tools_test.php +++ b/tests/dbal/db_tools_test.php @@ -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 */ + /** @var \phpbb\db\tools_interface */ protected $tools; protected $table_exists; protected $table_data; |