aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb/extension
diff options
context:
space:
mode:
authorNils Adermann <naderman@naderman.de>2014-04-10 14:04:43 -0700
committerNils Adermann <naderman@naderman.de>2014-04-10 14:04:43 -0700
commit7a947b247d359055c48acb16aadfa7453b6197e8 (patch)
tree56908d44be07ff092c0fd803e438367c2415bca3 /phpBB/phpbb/extension
parent79fe7816293435baceaecafc5a84fbb09c33afaa (diff)
parent3656fa3026cad5ffaa8536a4054f75cfb52dfb10 (diff)
downloadforums-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/extension')
-rw-r--r--phpBB/phpbb/extension/manager.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/phpbb/extension/manager.php b/phpBB/phpbb/extension/manager.php
index 993bd1b925..b22fbf07a6 100644
--- a/phpBB/phpbb/extension/manager.php
+++ b/phpBB/phpbb/extension/manager.php
@@ -34,7 +34,7 @@ class manager
* Creates a manager and loads information from database
*
* @param ContainerInterface $container A container
- * @param \phpbb\db\driver\driver $db A database connection
+ * @param \phpbb\db\driver\driver_interface $db A database connection
* @param \phpbb\config\config $config \phpbb\config\config
* @param \phpbb\filesystem $filesystem
* @param string $extension_table The name of the table holding extensions
@@ -43,7 +43,7 @@ class manager
* @param \phpbb\cache\driver\driver_interface $cache A cache instance or null
* @param string $cache_name The name of the cache variable, defaults to _ext
*/
- public function __construct(ContainerInterface $container, \phpbb\db\driver\driver $db, \phpbb\config\config $config, \phpbb\filesystem $filesystem, $extension_table, $phpbb_root_path, $php_ext = 'php', \phpbb\cache\driver\driver_interface $cache = null, $cache_name = '_ext')
+ public function __construct(ContainerInterface $container, \phpbb\db\driver\driver_interface $db, \phpbb\config\config $config, \phpbb\filesystem $filesystem, $extension_table, $phpbb_root_path, $php_ext = 'php', \phpbb\cache\driver\driver_interface $cache = null, $cache_name = '_ext')
{
$this->container = $container;
$this->phpbb_root_path = $phpbb_root_path;