aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb/extension/manager.php
diff options
context:
space:
mode:
authorn-aleha <nick_aleha@myway.com>2014-05-12 02:31:52 +0300
committern-aleha <nick_aleha@myway.com>2014-05-29 01:07:44 +0300
commit7f00c38c50dbd6689f80afaf324c1ee81173d15a (patch)
tree1c65fcc3af93f2922f129058133d6a6777a9f565 /phpBB/phpbb/extension/manager.php
parent56959a2f831cdbebb541fb7f6e758cd076199ca5 (diff)
downloadforums-7f00c38c50dbd6689f80afaf324c1ee81173d15a.tar
forums-7f00c38c50dbd6689f80afaf324c1ee81173d15a.tar.gz
forums-7f00c38c50dbd6689f80afaf324c1ee81173d15a.tar.bz2
forums-7f00c38c50dbd6689f80afaf324c1ee81173d15a.tar.xz
forums-7f00c38c50dbd6689f80afaf324c1ee81173d15a.zip
[ticket/11467] Add user object to extension manager for tests
PHPBB3-11467
Diffstat (limited to 'phpBB/phpbb/extension/manager.php')
-rw-r--r--phpBB/phpbb/extension/manager.php12
1 files changed, 6 insertions, 6 deletions
diff --git a/phpBB/phpbb/extension/manager.php b/phpBB/phpbb/extension/manager.php
index 50877c9ca1..cd7289e085 100644
--- a/phpBB/phpbb/extension/manager.php
+++ b/phpBB/phpbb/extension/manager.php
@@ -40,25 +40,25 @@ class manager
* @param \phpbb\db\driver\driver_interface $db A database connection
* @param \phpbb\config\config $config Config object
* @param \phpbb\filesystem $filesystem
+ * @param \phpbb\user $user User object
* @param string $extension_table The name of the table holding extensions
* @param string $phpbb_root_path Path to the phpbb includes directory.
* @param string $php_ext php file extension, defaults to php
- * @param \phpbb\user $user User object
* @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_interface $db, \phpbb\config\config $config, \phpbb\filesystem $filesystem, $extension_table, $phpbb_root_path, $php_ext = 'php', \phpbb\user $user, \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, \phpbb\user $user, $extension_table, $phpbb_root_path, $php_ext = 'php', \phpbb\cache\driver\driver_interface $cache = null, $cache_name = '_ext')
{
+ $this->cache = $cache;
+ $this->cache_name = $cache_name;
+ $this->config = $config;
$this->container = $container;
$this->db = $db;
- $this->config = $config;
- $this->filesystem = $filesystem;
$this->extension_table = $extension_table;
+ $this->filesystem = $filesystem;
$this->phpbb_root_path = $phpbb_root_path;
$this->php_ext = $php_ext;
$this->user = $user;
- $this->cache = $cache;
- $this->cache_name = $cache_name;
$this->extensions = ($this->cache) ? $this->cache->get($this->cache_name) : false;