[feature/passwords] Get rid of set_name/get_name methods for passwords drivers

PHPBB3-11610

phpBB/config/passwords.yml

@@ -11,8 +11,6 @@ services:
         arguments:
             - @config
             - @passwords.driver_helper
-        calls:
-            - [set_name, [passwords.driver.bcrypt]]
         tags:
             - { name: passwords.driver }
 
@@ -21,8 +19,6 @@ services:
         arguments:
             - @config
             - @passwords.driver_helper
-        calls:
-            - [set_name, [passwords.driver.bcrypt_2y]]
         tags:
             - { name: passwords.driver }
 
@@ -31,8 +27,6 @@ services:
         arguments:
             - @config
             - @passwords.driver_helper
-        calls:
-            - [set_name, [passwords.driver.salted_md5]]
         tags:
             - { name: passwords.driver }
 
@@ -41,8 +35,6 @@ services:
         arguments:
             - @config
             - @passwords.driver_helper
-        calls:
-            - [set_name, [passwords.driver.phpass]]
         tags:
             - { name: passwords.driver }
 

phpBB/phpbb/passwords/driver/base.php

@@ -42,22 +42,4 @@ abstract class base implements driver_interface
 	{
 		return true;
 	}
-
-	/**
-	* @inheritdoc
-	*/
-	public function get_name()
-	{
-		return $this->name;
-	}
-
-	/**
-	* Set driver name
-	*
-	* @param string $name Driver name
-	*/
-	public function set_name($name)
-	{
-		$this->name = $name;
-	}
 }

phpBB/phpbb/passwords/driver/driver_interface.php

@@ -57,11 +57,4 @@ interface driver_interface
 	* @return string	String containing the hash settings
 	*/
 	public function get_settings_only($hash, $full = false);
-
-	/**
-	* Get the driver name
-	*
-	* @return string	Driver name
-	*/
-	public function get_name();
 }

phpBB/phpbb/passwords/manager.php

@@ -79,7 +79,7 @@ class manager
 		{
 			if ($this->algorithms[$type]->is_supported())
 			{
-				$this->type = $type;
+				$this->type = $this->algorithms[$type]->get_prefix();
 				break;
 			}
 		}
@@ -94,16 +94,12 @@ class manager
 	{
 		foreach ($hashing_algorithms as $algorithm)
 		{
-			if (!isset($this->algorithms[$algorithm->get_name()]))
-			{
-				$this->algorithms[$algorithm->get_name()] = $algorithm;
-			}
-
 			if (!isset($this->type_map[$algorithm->get_prefix()]))
 			{
-				$this->type_map[$algorithm->get_prefix()] = $algorithm->get_name();
+				$this->type_map[$algorithm->get_prefix()] = $algorithm;
 			}
 		}
+		$this->algorithms = $hashing_algorithms;
 	}
 
 	/**
@@ -130,9 +126,9 @@ class manager
 	*/
 	protected function get_algorithm($prefix)
 	{
-		if (isset($this->type_map[$prefix]) && isset($this->algorithms[$this->type_map[$prefix]]))
+		if (isset($this->type_map[$prefix]))
 		{
-			return $this->algorithms[$this->type_map[$prefix]];
+			return $this->type_map[$prefix];
 		}
 		else
 		{
@@ -216,9 +212,9 @@ class manager
 			return $this->helper->combined_hash_password($password, $type);
 		}
 
-		if (isset($this->algorithms[$type]))
+		if (isset($this->type_map[$type]))
 		{
-			$hashing_algorithm = $this->algorithms[$type];
+			$hashing_algorithm = $this->type_map[$type];
 		}
 		else
 		{
@@ -260,7 +256,7 @@ class manager
 			return $correct;
 		}
 
-		if ($stored_hash_type->get_name() !== $this->type)
+		if ($stored_hash_type->get_prefix() !== $this->type)
 		{
 			$this->convert_flag = true;
 		}

tests/auth/provider_apache_test.php

@@ -34,11 +34,6 @@ class phpbb_auth_provider_apache_test extends phpbb_database_test_case
 			'passwords.driver.phpass'		=> new \phpbb\passwords\driver\phpass($config, $driver_helper),
 		);
 
-		foreach ($passwords_drivers as $key => $driver)
-		{
-			$driver->set_name($key);
-		}
-
 		$passwords_helper = new \phpbb\passwords\helper;
 		// Set up passwords manager
 		$passwords_manager = new \phpbb\passwords\manager($config, $passwords_drivers, $passwords_helper, array_keys($passwords_drivers));

tests/auth/provider_db_test.php

@@ -44,11 +44,6 @@ class phpbb_auth_provider_db_test extends phpbb_database_test_case
 			'passwords.driver.phpass'		=> new \phpbb\passwords\driver\phpass($config, $driver_helper),
 		);
 
-		foreach ($passwords_drivers as $key => $driver)
-		{
-			$driver->set_name($key);
-		}
-
 		$passwords_helper = new \phpbb\passwords\helper;
 		// Set up passwords manager
 		$passwords_manager = new \phpbb\passwords\manager($config, $passwords_drivers, $passwords_helper, array_keys($passwords_drivers));

tests/passwords/drivers_test.php

@@ -21,11 +21,6 @@ class phpbb_passwords_helper_test extends PHPUnit_Framework_TestCase
 			'passwords.driver.salted_md5'	=> new \phpbb\passwords\driver\salted_md5($config, $this->driver_helper),
 			'passwords.driver.phpass'		=> new \phpbb\passwords\driver\phpass($config, $this->driver_helper),
 		);
-
-		foreach ($this->passwords_drivers as $key => $driver)
-		{
-			$driver->set_name($key);
-		}
 	}
 
 	public function data_helper_encode64()

tests/passwords/manager_test.php

@@ -28,11 +28,6 @@ class phpbb_passwords_manager_test extends PHPUnit_Framework_TestCase
 			'passwords.driver.phpass'		=> new \phpbb\passwords\driver\phpass($config, $this->driver_helper),
 		);
 
-		foreach ($this->passwords_drivers as $key => $driver)
-		{
-			$driver->set_name($key);
-		}
-
 		$this->helper = new \phpbb\passwords\helper;
 		// Set up passwords manager
 		$this->manager = new \phpbb\passwords\manager($config, $this->passwords_drivers, $this->helper, array_keys($this->passwords_drivers));

tests/security/hash_test.php

@@ -25,11 +25,6 @@ class phpbb_security_hash_test extends phpbb_test_case
 			'passwords.driver.phpass'		=> new \phpbb\passwords\driver\phpass($config, $driver_helper),
 		);
 
-		foreach ($passwords_drivers as $key => $driver)
-		{
-			$driver->set_name($key);
-		}
-
 		$passwords_helper = new \phpbb\passwords\helper;
 		// Set up passwords manager
 		$passwords_manager = new \phpbb\passwords\manager($config, $passwords_drivers, $passwords_helper, array_keys($passwords_drivers));

tests/test_framework/phpbb_functional_test_case.php

@@ -1017,11 +1017,6 @@ class phpbb_functional_test_case extends phpbb_test_case
 			'passwords.driver.phpass'		=> new \phpbb\passwords\driver\phpass($config, $driver_helper),
 		);
 
-		foreach ($passwords_drivers as $key => $driver)
-		{
-			$driver->set_name($key);
-		}
-
 		$passwords_helper = new \phpbb\passwords\helper;
 		// Set up passwords manager
 		$manager = new \phpbb\passwords\manager($config, $passwords_drivers, $passwords_helper, array_keys($passwords_drivers));