aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2013-09-27 11:16:47 +0200
committerMarc Alexander <admin@m-a-styles.de>2013-09-27 11:16:47 +0200
commit3f63b9b470b2848abdd6288a45ca56331a3bb77c (patch)
tree9eaee894e0813426c80e64c03eddde7ca18fbab4 /phpBB/phpbb
parente41c9ef6cdab65921f1bc283504e7c5fb552d659 (diff)
downloadforums-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')
-rw-r--r--phpBB/phpbb/passwords/driver/base.php10
-rw-r--r--phpBB/phpbb/passwords/driver/bcrypt.php4
-rw-r--r--phpBB/phpbb/passwords/driver/bcrypt_2y.php4
-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.php4
-rw-r--r--phpBB/phpbb/passwords/driver/phpass.php4
-rw-r--r--phpBB/phpbb/passwords/driver/salted_md5.php4
-rw-r--r--phpBB/phpbb/passwords/helper.php6
-rw-r--r--phpBB/phpbb/passwords/manager.php14
9 files changed, 36 insertions, 18 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$';
diff --git a/phpBB/phpbb/passwords/helper.php b/phpBB/phpbb/passwords/helper.php
index 0ce1d3be45..22d2ea4edb 100644
--- a/phpBB/phpbb/passwords/helper.php
+++ b/phpBB/phpbb/passwords/helper.php
@@ -7,6 +7,8 @@
*
*/
+namespace phpbb\passwords;
+
/**
* @ignore
*/
@@ -18,7 +20,7 @@ if (!defined('IN_PHPBB'))
/**
* @package passwords
*/
-class phpbb_passwords_helper
+class helper
{
/**
* @var phpbb_passwords_manager
@@ -30,7 +32,7 @@ class phpbb_passwords_helper
*
* @param phpbb_passwords_manager $manager Crypto manager object
*/
- public function set_manager(phpbb_passwords_manager $manager)
+ public function set_manager(\phpbb\passwords\manager $manager)
{
if ($this->manager === null)
{
diff --git a/phpBB/phpbb/passwords/manager.php b/phpBB/phpbb/passwords/manager.php
index 6cc3510f8e..3aaacbee35 100644
--- a/phpBB/phpbb/passwords/manager.php
+++ b/phpBB/phpbb/passwords/manager.php
@@ -7,6 +7,8 @@
*
*/
+namespace phpbb\passwords;
+
/**
* @ignore
*/
@@ -18,7 +20,7 @@ if (!defined('IN_PHPBB'))
/**
* @package passwords
*/
-class phpbb_passwords_manager
+class manager
{
/**
* Default hashing method
@@ -57,10 +59,10 @@ class phpbb_passwords_manager
/**
* Construct a passwords object
*
- * @param phpbb_config $config phpBB configuration
- * @param phpbb_di_service_collection $hashing_algorithms Hashing driver
+ * @param phpbb\config\config $config phpBB configuration
+ * @param phpbb\di\service_collection $hashing_algorithms Hashing driver
* service collection
- * @param phpbb_passwords_helper $helper Passwords helper object
+ * @param phpbb\passwords\helper $helper Passwords helper object
* @param string $default Default driver name
*/
public function __construct($config, $hashing_algorithms, $helper, $default)
@@ -75,7 +77,7 @@ class phpbb_passwords_manager
/**
* Fill algorithm type map
*
- * @param phpbb_di_service_collection $hashing_algorithms
+ * @param phpbb\di\service_collection $hashing_algorithms
*/
protected function fill_type_map($hashing_algorithms)
{
@@ -96,7 +98,7 @@ class phpbb_passwords_manager
/**
* Load passwords helper class
*
- * @param phpbb_passwords_helper $helper Passwords helper object
+ * @param phpbb\passwords\helper $helper Passwords helper object
*/
protected function load_passwords_helper($helper)
{
generated by cgit v1.2.1 (git 2.21.0) at 2024-11-29 08:29:49 +0000