makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 14:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[feature/passwords] A few more corrections in methods due to namespacing

Browse source 
PHPBB3-11610
This commit is contained in:
Marc Alexander 2013-09-28 12:41:02 +02:00
parent 5bc5e4716c
commit de087d537e
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
phpBB/phpbb/passwords/helper.php
View file

@ -23,14 +23,14 @@ if (!defined('IN_PHPBB'))
class helper class helper
{ {
/** /**
* @var phpbb_passwords_manager * @var phpbb\passwords\manager
*/ */
protected $manager; protected $manager;
/** /**
* Set the passwords manager instance * 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) public function set_manager(\phpbb\passwords\manager $manager)
{ {

10
phpBB/phpbb/passwords/manager.php
View file

@ -46,13 +46,13 @@ class manager
/** /**
* Crypto helper * Crypto helper
* @var phpbb_passwords_helper * @var phpbb\passwords\helper
*/ */
protected $helper; protected $helper;
/** /**
* phpBB configuration * phpBB configuration
* @var phpbb_config * @var phpbb\config\config
*/ */
protected $config; protected $config;
@ -60,12 +60,12 @@ class manager
* Construct a passwords object * Construct a passwords object
* *
* @param phpbb\config\config $config phpBB configuration * @param phpbb\config\config $config phpBB configuration
* @param phpbb\di\service_collection $hashing_algorithms Hashing driver * @param array $hashing_algorithms Hashing driver
* service collection * service collection
* @param phpbb\passwords\helper $helper Passwords helper object * @param phpbb\passwords\helper $helper Passwords helper object
* @param string $default Default driver name * @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->config = $config;
$this->type = $default; $this->type = $default;
@ -100,7 +100,7 @@ class manager
* *
* @param phpbb\passwords\helper $helper Passwords helper object * @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) if ($this->helper === null)
{ {