diff options
| author | n-aleha <nick_aleha@myway.com> | 2014-05-12 02:31:52 +0300 |
|---|---|---|
| committer | n-aleha <nick_aleha@myway.com> | 2014-05-29 01:07:44 +0300 |
| commit | 7f00c38c50dbd6689f80afaf324c1ee81173d15a (patch) | |
| tree | 1c65fcc3af93f2922f129058133d6a6777a9f565 /phpBB/phpbb | |
| parent | 56959a2f831cdbebb541fb7f6e758cd076199ca5 (diff) | |
| download | forums-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')
| -rw-r--r-- | phpBB/phpbb/extension/manager.php | 12 | ||||
| -rw-r--r-- | phpBB/phpbb/extension/metadata_manager.php | 4 |
2 files changed, 8 insertions, 8 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; diff --git a/phpBB/phpbb/extension/metadata_manager.php b/phpBB/phpbb/extension/metadata_manager.php index 1c4019c22d..5c4e8fbf00 100644 --- a/phpBB/phpbb/extension/metadata_manager.php +++ b/phpBB/phpbb/extension/metadata_manager.php @@ -71,7 +71,7 @@ class metadata_manager * * @param string $ext_name Name (including vendor) of the extension * @param \phpbb\config\config $config phpBB Config instance - * @param \phpbb\extension\manager $extension_manager An instance of the phpBBb extension manager + * @param \phpbb\extension\manager $extension_manager An instance of the phpBB extension manager * @param \phpbb\template\template $template phpBB Template instance * @param \phpbb\user $user User instance * @param string $phpbb_root_path Path to the phpbb includes directory. @@ -262,7 +262,7 @@ class metadata_manager { if (!isset($author['name'])) { - throw new \phpbb\extension\exception($this->user->lang('META_FIELD_NOT_SET', 'author name')); + throw new \phpbb\extension\exception($this->user->lang('META_FIELD_NOT_SET', 'author name')); } } |