diff options
| author | Nils Adermann <naderman@naderman.de> | 2014-04-10 14:04:43 -0700 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2014-04-10 14:04:43 -0700 |
| commit | 7a947b247d359055c48acb16aadfa7453b6197e8 (patch) | |
| tree | 56908d44be07ff092c0fd803e438367c2415bca3 /phpBB/phpbb/tree | |
| parent | 79fe7816293435baceaecafc5a84fbb09c33afaa (diff) | |
| parent | 3656fa3026cad5ffaa8536a4054f75cfb52dfb10 (diff) | |
| download | forums-7a947b247d359055c48acb16aadfa7453b6197e8.tar forums-7a947b247d359055c48acb16aadfa7453b6197e8.tar.gz forums-7a947b247d359055c48acb16aadfa7453b6197e8.tar.bz2 forums-7a947b247d359055c48acb16aadfa7453b6197e8.tar.xz forums-7a947b247d359055c48acb16aadfa7453b6197e8.zip | |
Merge remote-tracking branch 'github-nickvergessen/ticket/12282' into develop-ascraeus
* github-nickvergessen/ticket/12282:
[ticket/12282] Update new references
[ticket/12282] Update container db mock
[ticket/12282] Add new line at EOF of the interface
[ticket/12282] Use interface for type hinting
[ticket/12282] Use {@inheritDoc} for inherited methods
[ticket/12282] Add Interface for DBAL drivers
Diffstat (limited to 'phpBB/phpbb/tree')
| -rw-r--r-- | phpBB/phpbb/tree/nestedset.php | 6 | ||||
| -rw-r--r-- | phpBB/phpbb/tree/nestedset_forum.php | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/phpBB/phpbb/tree/nestedset.php b/phpBB/phpbb/tree/nestedset.php index 2bfb65732d..9aaee9e468 100644 --- a/phpBB/phpbb/tree/nestedset.php +++ b/phpBB/phpbb/tree/nestedset.php @@ -11,7 +11,7 @@ namespace phpbb\tree; abstract class nestedset implements \phpbb\tree\tree_interface { - /** @var \phpbb\db\driver\driver */ + /** @var \phpbb\db\driver\driver_interface */ protected $db; /** @var \phpbb\lock\db */ @@ -52,7 +52,7 @@ abstract class nestedset implements \phpbb\tree\tree_interface /** * Construct * - * @param \phpbb\db\driver\driver $db Database connection + * @param \phpbb\db\driver\driver_interface $db Database connection * @param \phpbb\lock\db $lock Lock class used to lock the table when moving forums around * @param string $table_name Table name * @param string $message_prefix Prefix for the messages thrown by exceptions @@ -60,7 +60,7 @@ abstract class nestedset implements \phpbb\tree\tree_interface * @param array $item_basic_data Array with basic item data that is stored in item_parents * @param array $columns Array with column names to overwrite */ - public function __construct(\phpbb\db\driver\driver $db, \phpbb\lock\db $lock, $table_name, $message_prefix = '', $sql_where = '', $item_basic_data = array(), $columns = array()) + public function __construct(\phpbb\db\driver\driver_interface $db, \phpbb\lock\db $lock, $table_name, $message_prefix = '', $sql_where = '', $item_basic_data = array(), $columns = array()) { $this->db = $db; $this->lock = $lock; diff --git a/phpBB/phpbb/tree/nestedset_forum.php b/phpBB/phpbb/tree/nestedset_forum.php index ef6023546b..5973b0b6d9 100644 --- a/phpBB/phpbb/tree/nestedset_forum.php +++ b/phpBB/phpbb/tree/nestedset_forum.php @@ -14,11 +14,11 @@ class nestedset_forum extends \phpbb\tree\nestedset /** * Construct * - * @param \phpbb\db\driver\driver $db Database connection + * @param \phpbb\db\driver\driver_interface $db Database connection * @param \phpbb\lock\db $lock Lock class used to lock the table when moving forums around * @param string $table_name Table name */ - public function __construct(\phpbb\db\driver\driver $db, \phpbb\lock\db $lock, $table_name) + public function __construct(\phpbb\db\driver\driver_interface $db, \phpbb\lock\db $lock, $table_name) { parent::__construct( $db, |