diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2013-09-27 11:16:47 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2013-09-27 11:16:47 +0200 |
| commit | 3f63b9b470b2848abdd6288a45ca56331a3bb77c (patch) | |
| tree | 9eaee894e0813426c80e64c03eddde7ca18fbab4 /phpBB/phpbb/passwords/driver | |
| parent | e41c9ef6cdab65921f1bc283504e7c5fb552d659 (diff) | |
| download | forums-3f63b9b470b2848abdd6288a45ca56331a3bb77c.tar forums-3f63b9b470b2848abdd6288a45ca56331a3bb77c.tar.gz forums-3f63b9b470b2848abdd6288a45ca56331a3bb77c.tar.bz2 forums-3f63b9b470b2848abdd6288a45ca56331a3bb77c.tar.xz forums-3f63b9b470b2848abdd6288a45ca56331a3bb77c.zip | |
[feature/passwords] Modify passwords files for namespacing changes
PHPBB3-11610
Diffstat (limited to 'phpBB/phpbb/passwords/driver')
| -rw-r--r-- | phpBB/phpbb/passwords/driver/base.php | 10 | ||||
| -rw-r--r-- | phpBB/phpbb/passwords/driver/bcrypt.php | 4 | ||||
| -rw-r--r-- | phpBB/phpbb/passwords/driver/bcrypt_2y.php | 4 | ||||
| -rw-r--r-- | phpBB/phpbb/passwords/driver/driver_interface.php (renamed from phpBB/phpbb/passwords/driver/interface.php) | 4 | ||||
| -rw-r--r-- | phpBB/phpbb/passwords/driver/helper.php | 4 | ||||
| -rw-r--r-- | phpBB/phpbb/passwords/driver/phpass.php | 4 | ||||
| -rw-r--r-- | phpBB/phpbb/passwords/driver/salted_md5.php | 4 |
7 files changed, 24 insertions, 10 deletions
diff --git a/phpBB/phpbb/passwords/driver/base.php b/phpBB/phpbb/passwords/driver/base.php index 2984dafef7..298b7367ad 100644 --- a/phpBB/phpbb/passwords/driver/base.php +++ b/phpBB/phpbb/passwords/driver/base.php @@ -7,6 +7,8 @@ * */ +namespace phpbb\passwords\driver; + /** * @ignore */ @@ -18,12 +20,12 @@ if (!defined('IN_PHPBB')) /** * @package passwords */ -abstract class phpbb_passwords_driver_base implements phpbb_passwords_driver_interface +abstract class base implements \phpbb\passwords\driver\driver_interface { - /** @var phpbb_config */ + /** @var phpbb\config\config */ protected $config; - /** @var phpbb_passwords_driver_helper */ + /** @var phpbb\passwords\driver\helper */ protected $helper; /** @var driver name */ @@ -34,7 +36,7 @@ abstract class phpbb_passwords_driver_base implements phpbb_passwords_driver_int * * @return string Hash prefix */ - public function __construct(phpbb_config $config, phpbb_passwords_driver_helper $helper) + public function __construct(\phpbb\config\config $config, \phpbb\passwords\driver\helper $helper) { $this->config = $config; $this->helper = $helper; diff --git a/phpBB/phpbb/passwords/driver/bcrypt.php b/phpBB/phpbb/passwords/driver/bcrypt.php index db41fe6b38..2f6cc1b381 100644 --- a/phpBB/phpbb/passwords/driver/bcrypt.php +++ b/phpBB/phpbb/passwords/driver/bcrypt.php @@ -7,6 +7,8 @@ * */ +namespace phpbb\passwords\driver; + /** * @ignore */ @@ -18,7 +20,7 @@ if (!defined('IN_PHPBB')) /** * @package passwords */ -class phpbb_passwords_driver_bcrypt extends phpbb_passwords_driver_base +class bcrypt extends \phpbb\passwords\driver\base { const PREFIX = '$2a$'; diff --git a/phpBB/phpbb/passwords/driver/bcrypt_2y.php b/phpBB/phpbb/passwords/driver/bcrypt_2y.php index 5b0dbdd311..8da8c8dbc8 100644 --- a/phpBB/phpbb/passwords/driver/bcrypt_2y.php +++ b/phpBB/phpbb/passwords/driver/bcrypt_2y.php @@ -7,6 +7,8 @@ * */ +namespace phpbb\passwords\driver; + /** * @ignore */ @@ -18,7 +20,7 @@ if (!defined('IN_PHPBB')) /** * @package passwords */ -class phpbb_passwords_driver_bcrypt_2y extends phpbb_passwords_driver_bcrypt +class bcrypt_2y extends \phpbb\passwords\driver\bcrypt { const PREFIX = '$2y$'; diff --git a/phpBB/phpbb/passwords/driver/interface.php b/phpBB/phpbb/passwords/driver/driver_interface.php index a2088db81c..8c12834641 100644 --- a/phpBB/phpbb/passwords/driver/interface.php +++ b/phpBB/phpbb/passwords/driver/driver_interface.php @@ -7,6 +7,8 @@ * */ +namespace phpbb\passwords\driver; + /** * @ignore */ @@ -18,7 +20,7 @@ if (!defined('IN_PHPBB')) /** * @package passwords */ -interface phpbb_passwords_driver_interface +interface driver_interface { /** * Check if hash type is supported diff --git a/phpBB/phpbb/passwords/driver/helper.php b/phpBB/phpbb/passwords/driver/helper.php index a50ac8819e..fbb6f9bb2b 100644 --- a/phpBB/phpbb/passwords/driver/helper.php +++ b/phpBB/phpbb/passwords/driver/helper.php @@ -7,6 +7,8 @@ * */ +namespace phpbb\passwords\driver; + /** * @ignore */ @@ -18,7 +20,7 @@ if (!defined('IN_PHPBB')) /** * @package passwords */ -class phpbb_passwords_driver_helper +class helper { /** * base64 alphabet diff --git a/phpBB/phpbb/passwords/driver/phpass.php b/phpBB/phpbb/passwords/driver/phpass.php index d52ce96d11..32ccc399ba 100644 --- a/phpBB/phpbb/passwords/driver/phpass.php +++ b/phpBB/phpbb/passwords/driver/phpass.php @@ -7,6 +7,8 @@ * */ +namespace phpbb\passwords\driver; + /** * @ignore */ @@ -18,7 +20,7 @@ if (!defined('IN_PHPBB')) /** * @package passwords */ -class phpbb_passwords_driver_phpass extends phpbb_passwords_driver_salted_md5 +class phpass extends \phpbb\passwords\driver\salted_md5 { const PREFIX = '$P$'; diff --git a/phpBB/phpbb/passwords/driver/salted_md5.php b/phpBB/phpbb/passwords/driver/salted_md5.php index 6fa12948be..13d25560fe 100644 --- a/phpBB/phpbb/passwords/driver/salted_md5.php +++ b/phpBB/phpbb/passwords/driver/salted_md5.php @@ -7,6 +7,8 @@ * */ +namespace phpbb\passwords\driver; + /** * @ignore */ @@ -18,7 +20,7 @@ if (!defined('IN_PHPBB')) /** * @package passwords */ -class phpbb_passwords_driver_salted_md5 extends phpbb_passwords_driver_base +class salted_md5 extends \phpbb\passwords\driver\base { const PREFIX = '$H$'; |