[feature/passwords] Use dependency injection for passwords driver helper

The passwords driver helper is now injected into the driver base instead
of being manually loaded.

PHPBB3-11610

2 files changed, 2 insertions, 13 deletions

diff --git a/phpBB/phpbb/passwords/driver/base.php b/phpBB/phpbb/passwords/driver/base.php
index 67cbe4decf..2984dafef7 100644
--- a/phpBB/phpbb/passwords/driver/base.php
+++ b/phpBB/phpbb/passwords/driver/base.php
@@ -34,10 +34,10 @@ abstract class phpbb_passwords_driver_base implements phpbb_passwords_driver_int
 	*
 	* @return string	Hash prefix
 	*/
-	public function __construct(phpbb_config $config)
+	public function __construct(phpbb_config $config, phpbb_passwords_driver_helper $helper)
 	{
 		$this->config = $config;
-		$this->helper = new phpbb_passwords_driver_helper($this);
+		$this->helper = $helper;
 	}
 
 	/**
diff --git a/phpBB/phpbb/passwords/driver/helper.php b/phpBB/phpbb/passwords/driver/helper.php
index dcd07263d5..a50ac8819e 100644
--- a/phpBB/phpbb/passwords/driver/helper.php
+++ b/phpBB/phpbb/passwords/driver/helper.php
@@ -20,9 +20,6 @@ if (!defined('IN_PHPBB'))
 */
 class phpbb_passwords_driver_helper
 {
-	/** @var phpbb_config */
-	protected $driver;
-
 	/**
 	* base64 alphabet
 	* @var string
@@ -30,14 +27,6 @@ class phpbb_passwords_driver_helper
 	public $itoa64 = './0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz';
 
 	/**
-	* Constructor of passwords driver helper object
-	*/
-	public function __construct($driver)
-	{
-		$this->driver = $driver;
-	}
-
-	/**
 	* Base64 encode hash
 	*
 	* @param string $input Input string