diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2013-09-28 12:41:02 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2013-09-28 12:41:02 +0200 |
| commit | de087d537e781741a0137e8ba9162d5baf3f37bb (patch) | |
| tree | 2a4dd924ab4c449e7f5cc277b9d7f2f2ab827c1d /phpBB | |
| parent | 5bc5e4716cc7437941e9cdb6a2b15ed1f4f19b95 (diff) | |
| download | forums-de087d537e781741a0137e8ba9162d5baf3f37bb.tar forums-de087d537e781741a0137e8ba9162d5baf3f37bb.tar.gz forums-de087d537e781741a0137e8ba9162d5baf3f37bb.tar.bz2 forums-de087d537e781741a0137e8ba9162d5baf3f37bb.tar.xz forums-de087d537e781741a0137e8ba9162d5baf3f37bb.zip | |
[feature/passwords] A few more corrections in methods due to namespacing
PHPBB3-11610
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/phpbb/passwords/helper.php | 4 | ||||
| -rw-r--r-- | phpBB/phpbb/passwords/manager.php | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/phpBB/phpbb/passwords/helper.php b/phpBB/phpbb/passwords/helper.php index 22d2ea4edb..28a13d2224 100644 --- a/phpBB/phpbb/passwords/helper.php +++ b/phpBB/phpbb/passwords/helper.php @@ -23,14 +23,14 @@ if (!defined('IN_PHPBB')) class helper { /** - * @var phpbb_passwords_manager + * @var phpbb\passwords\manager */ protected $manager; /** * Set the passwords manager instance * - * @param phpbb_passwords_manager $manager Crypto manager object + * @param phpbb\passwords\manager $manager Crypto manager object */ public function set_manager(\phpbb\passwords\manager $manager) { diff --git a/phpBB/phpbb/passwords/manager.php b/phpBB/phpbb/passwords/manager.php index 3aaacbee35..52644b05ac 100644 --- a/phpBB/phpbb/passwords/manager.php +++ b/phpBB/phpbb/passwords/manager.php @@ -46,13 +46,13 @@ class manager /** * Crypto helper - * @var phpbb_passwords_helper + * @var phpbb\passwords\helper */ protected $helper; /** * phpBB configuration - * @var phpbb_config + * @var phpbb\config\config */ protected $config; @@ -60,12 +60,12 @@ class manager * Construct a passwords object * * @param phpbb\config\config $config phpBB configuration - * @param phpbb\di\service_collection $hashing_algorithms Hashing driver + * @param array $hashing_algorithms Hashing driver * service collection * @param phpbb\passwords\helper $helper Passwords helper object * @param string $default Default driver name */ - public function __construct($config, $hashing_algorithms, $helper, $default) + public function __construct(\phpbb\config\config $config, $hashing_algorithms, \phpbb\passwords\helper $helper, $default) { $this->config = $config; $this->type = $default; @@ -100,7 +100,7 @@ class manager * * @param phpbb\passwords\helper $helper Passwords helper object */ - protected function load_passwords_helper($helper) + protected function load_passwords_helper(\phpbb\passwords\helper $helper) { if ($this->helper === null) { |