[ticket/12352] Add get_settings_only method to passwords driver base

PHPBB3-12352
author: Marc Alexander <admin@m-a-styles.de> 2014-05-30 00:22:55 +0200
committer: Marc Alexander <admin@m-a-styles.de> 2014-06-01 21:31:05 +0200
commit: 4b3aacfd18a8a3334532f9fcc830affb5f12963b (patch)
tree: 6ce9269161c3e26c8229ea4cf127a3a2c61a98a0
parent: f3eba6275a6965f866b6e3bed7ce5330a14eb960 (diff)
download: forums-4b3aacfd18a8a3334532f9fcc830affb5f12963b.tar
forums-4b3aacfd18a8a3334532f9fcc830affb5f12963b.tar.gz
forums-4b3aacfd18a8a3334532f9fcc830affb5f12963b.tar.bz2
forums-4b3aacfd18a8a3334532f9fcc830affb5f12963b.tar.xz
forums-4b3aacfd18a8a3334532f9fcc830affb5f12963b.zip
11 files changed, 9 insertions, 89 deletions
diff --git a/phpBB/phpbb/passwords/driver/base.php b/phpBB/phpbb/passwords/driver/base.php
index b74c2d3d72..1d47180e55 100644
--- a/phpBB/phpbb/passwords/driver/base.php
+++ b/phpBB/phpbb/passwords/driver/base.php
@@ -51,4 +51,12 @@ abstract class base implements driver_interface
 	{
 		return false;
 	}
+
+	/**
+	* @inheritdoc
+	*/
+	public function get_settings_only($hash, $full = false)
+	{
+		return false;
+	}
 }
diff --git a/phpBB/phpbb/passwords/driver/bcrypt_wcf2.php b/phpBB/phpbb/passwords/driver/bcrypt_wcf2.php
index 636fe74789..ecfef9de18 100644
--- a/phpBB/phpbb/passwords/driver/bcrypt_wcf2.php
+++ b/phpBB/phpbb/passwords/driver/bcrypt_wcf2.php
@@ -80,12 +80,4 @@ class bcrypt_wcf2 extends base
 			return $hash === $this->bcrypt->hash($this->bcrypt->hash($password, $salt), $salt);
 		}
 	}
-
-	/**
-	* @inheritdoc
-	*/
-	public function get_settings_only($hash, $full = false)
-	{
-		return false;
-	}
 }
diff --git a/phpBB/phpbb/passwords/driver/convert_password.php b/phpBB/phpbb/passwords/driver/convert_password.php
index 354c6b9ff3..97c7bcb8ab 100644
--- a/phpBB/phpbb/passwords/driver/convert_password.php
+++ b/phpBB/phpbb/passwords/driver/convert_password.php
@@ -39,12 +39,4 @@ class convert_password extends base
 	{
 		return false;
 	}
-
-	/**
-	* @inheritdoc
-	*/
-	public function get_settings_only($hash, $full = false)
-	{
-		return false;
-	}
 }
diff --git a/phpBB/phpbb/passwords/driver/md5_mybb.php b/phpBB/phpbb/passwords/driver/md5_mybb.php
index 59a08039f2..d17f3ea035 100644
--- a/phpBB/phpbb/passwords/driver/md5_mybb.php
+++ b/phpBB/phpbb/passwords/driver/md5_mybb.php
@@ -56,12 +56,4 @@ class md5_mybb extends base
 			return $hash === md5(md5($user_row['user_passwd_salt']) . md5($password));
 		}
 	}
-
-	/**
-	* @inheritdoc
-	*/
-	public function get_settings_only($hash, $full = false)
-	{
-		return false;
-	}
 }
diff --git a/phpBB/phpbb/passwords/driver/md5_phpbb2.php b/phpBB/phpbb/passwords/driver/md5_phpbb2.php
index 41a589d3b8..093e3b4c65 100644
--- a/phpBB/phpbb/passwords/driver/md5_phpbb2.php
+++ b/phpBB/phpbb/passwords/driver/md5_phpbb2.php
@@ -114,12 +114,4 @@ class md5_phpbb2 extends base
 
 		return false;
 	}
-
-	/**
-	* @inheritdoc
-	*/
-	public function get_settings_only($hash, $full = false)
-	{
-		return false;
-	}
 }
diff --git a/phpBB/phpbb/passwords/driver/md5_vb.php b/phpBB/phpbb/passwords/driver/md5_vb.php
index 719c6279aa..00b691dd63 100644
--- a/phpBB/phpbb/passwords/driver/md5_vb.php
+++ b/phpBB/phpbb/passwords/driver/md5_vb.php
@@ -56,12 +56,4 @@ class md5_vb extends base
 			return $hash === md5(md5($password) . $user_row['user_passwd_salt']);
 		}
 	}
-
-	/**
-	* @inheritdoc
-	*/
-	public function get_settings_only($hash, $full = false)
-	{
-		return false;
-	}
 }
diff --git a/phpBB/phpbb/passwords/driver/sha1.php b/phpBB/phpbb/passwords/driver/sha1.php
index a698392ec6..35cd64769b 100644
--- a/phpBB/phpbb/passwords/driver/sha1.php
+++ b/phpBB/phpbb/passwords/driver/sha1.php
@@ -48,12 +48,4 @@ class sha1 extends base
 	{
 		return $hash === sha1($password);
 	}
-
-	/**
-	* @inheritdoc
-	*/
-	public function get_settings_only($hash, $full = false)
-	{
-		return false;
-	}
 }
diff --git a/phpBB/phpbb/passwords/driver/sha1_smf.php b/phpBB/phpbb/passwords/driver/sha1_smf.php
index f7f5587485..92181ccef2 100644
--- a/phpBB/phpbb/passwords/driver/sha1_smf.php
+++ b/phpBB/phpbb/passwords/driver/sha1_smf.php
@@ -47,12 +47,4 @@ class sha1_smf extends base
 	{
 		return $hash === $this->hash($password, $user_row);
 	}
-
-	/**
-	* @inheritdoc
-	*/
-	public function get_settings_only($hash, $full = false)
-	{
-		return false;
-	}
 }
diff --git a/phpBB/phpbb/passwords/driver/sha1_wcf1.php b/phpBB/phpbb/passwords/driver/sha1_wcf1.php
index 4c1b449c0a..5241dc345f 100644
--- a/phpBB/phpbb/passwords/driver/sha1_wcf1.php
+++ b/phpBB/phpbb/passwords/driver/sha1_wcf1.php
@@ -56,12 +56,4 @@ class sha1_wcf1 extends base
 			return $hash === sha1($user_row['user_passwd_salt'] . sha1($user_row['user_passwd_salt'] . sha1($password)));
 		}
 	}
-
-	/**
-	* @inheritdoc
-	*/
-	public function get_settings_only($hash, $full = false)
-	{
-		return false;
-	}
 }
diff --git a/phpBB/phpbb/passwords/driver/sha_xf1.php b/phpBB/phpbb/passwords/driver/sha_xf1.php
index 0dd21b10fe..4b5e4a0b26 100644
--- a/phpBB/phpbb/passwords/driver/sha_xf1.php
+++ b/phpBB/phpbb/passwords/driver/sha_xf1.php
@@ -64,12 +64,4 @@ class sha_xf1 extends base
 			}
 		}
 	}
-
-	/**
-	* @inheritdoc
-	*/
-	public function get_settings_only($hash, $full = false)
-	{
-		return false;
-	}
 }
diff --git a/tests/passwords/drivers_test.php b/tests/passwords/drivers_test.php
index d562f50d25..ccfb05c40f 100644
--- a/tests/passwords/drivers_test.php
+++ b/tests/passwords/drivers_test.php
@@ -156,25 +156,19 @@ class phpbb_passwords_helper_test extends \phpbb_test_case
 		$this->assertSame($expected, $this->passwords_drivers['passwords.driver.md5_phpbb2']->check($password, $hash));
 	}
 
-	public function test_md5_phpbb2_unneeded_functions()
+	public function test_md5_phpbb2_hash()
 	{
 		$this->assertSame(false, $this->passwords_drivers['passwords.driver.md5_phpbb2']->hash('foobar'));
-
-		$this->assertSame(false, $this->passwords_drivers['passwords.driver.md5_phpbb2']->get_settings_only('ae2fc75e20ee25d4520766788fbc96ae'));
 	}
 
 	public function test_convert_password_driver()
 	{
 		$this->assertSame(false, $this->passwords_drivers['passwords.driver.convert_password']->hash('foobar'));
-
-		$this->assertSame(false, $this->passwords_drivers['passwords.driver.convert_password']->get_settings_only('ae2fc75e20ee25d4520766788fbc96ae'));
 	}
 
 	public function test_sha1_driver()
 	{
 		$this->assertSame(false, $this->passwords_drivers['passwords.driver.sha1']->hash('foobar'));
-
-		$this->assertSame(false, $this->passwords_drivers['passwords.driver.sha1']->get_settings_only('ae2fc75e20ee25d4520766788fbc96ae'));
 	}
 
 	public function data_md5_mybb_check()
@@ -197,8 +191,6 @@ class phpbb_passwords_helper_test extends \phpbb_test_case
 	public function test_md5_mybb_driver()
 	{
 		$this->assertSame(false, $this->passwords_drivers['passwords.driver.md5_mybb']->hash('foobar'));
-
-		$this->assertSame(false, $this->passwords_drivers['passwords.driver.md5_mybb']->get_settings_only('6022de2cc0ecf59ff14b57c6205ee170'));
 	}
 
 	public function data_md5_vb_check()
@@ -223,8 +215,6 @@ class phpbb_passwords_helper_test extends \phpbb_test_case
 	public function test_md5_vb_driver()
 	{
 		$this->assertSame(false, $this->passwords_drivers['passwords.driver.md5_vb']->hash('foobar'));
-
-		$this->assertSame(false, $this->passwords_drivers['passwords.driver.md5_vb']->get_settings_only('6022de2cc0ecf59ff14b57c6205ee170'));
 	}
 
 	public function data_sha1_wcf1_check()
@@ -247,8 +237,6 @@ class phpbb_passwords_helper_test extends \phpbb_test_case
 	public function test_sha1_wcf1_driver()
 	{
 		$this->assertSame(false, $this->passwords_drivers['passwords.driver.sha1_wcf1']->hash('foobar'));
-
-		$this->assertSame(false, $this->passwords_drivers['passwords.driver.sha1_wcf1']->get_settings_only('6022de2cc0ecf59ff14b57c6205ee170'));
 	}
 
 	public function data_bcrypt_wcf2_check()
@@ -271,8 +259,6 @@ class phpbb_passwords_helper_test extends \phpbb_test_case
 	public function test_bcrypt_wcf2_driver()
 	{
 		$this->assertSame(false, $this->passwords_drivers['passwords.driver.bcrypt_wcf2']->hash('foobar'));
-
-		$this->assertSame(false, $this->passwords_drivers['passwords.driver.bcrypt_wcf2']->get_settings_only('6022de2cc0ecf59ff14b57c6205ee170'));
 	}
 
 	public function data_sha_xf1_check()
@@ -296,8 +282,6 @@ class phpbb_passwords_helper_test extends \phpbb_test_case
 	public function test_sha_xf1_driver()
 	{
 		$this->assertSame(false, $this->passwords_drivers['passwords.driver.sha_xf1']->hash('foobar'));
-
-		$this->assertSame(false, $this->passwords_drivers['passwords.driver.sha_xf1']->get_settings_only('6022de2cc0ecf59ff14b57c6205ee170'));
 	}
 
 	protected function utf8_to_cp1252($string)
author	Marc Alexander <admin@m-a-styles.de>	2014-05-30 00:22:55 +0200
committer	Marc Alexander <admin@m-a-styles.de>	2014-06-01 21:31:05 +0200
commit	4b3aacfd18a8a3334532f9fcc830affb5f12963b (patch)
tree	6ce9269161c3e26c8229ea4cf127a3a2c61a98a0
parent	f3eba6275a6965f866b6e3bed7ce5330a14eb960 (diff)
download	forums-4b3aacfd18a8a3334532f9fcc830affb5f12963b.tar forums-4b3aacfd18a8a3334532f9fcc830affb5f12963b.tar.gz forums-4b3aacfd18a8a3334532f9fcc830affb5f12963b.tar.bz2 forums-4b3aacfd18a8a3334532f9fcc830affb5f12963b.tar.xz forums-4b3aacfd18a8a3334532f9fcc830affb5f12963b.zip