[feature/passwords] Modify passwords files for namespacing changes

PHPBB3-11610

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;

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$';
 

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$';
 

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

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

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$';
 

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$';
 

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)
 		{

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)
 	{