silverstripe / cwp-core

src/PasswordEncryptor/PBKDF2.php

Indentation +31 added lines, -31 removed lines

@@ -11,39 +11,39 @@
  */
 class PBKDF2 extends PasswordEncryptor_PHPHash
 {
-    /**
-     * The number of internal iterations for hash_pbkdf2() to perform for the derivation. Please note that if you
-     * change this from the default value you will break existing hashes stored in the database, so these would
-     * need to be regenerated.
-     *
-     * @var int
-     */
-    protected $iterations = 10000;
+	/**
+	 * The number of internal iterations for hash_pbkdf2() to perform for the derivation. Please note that if you
+	 * change this from the default value you will break existing hashes stored in the database, so these would
+	 * need to be regenerated.
+	 *
+	 * @var int
+	 */
+	protected $iterations = 10000;
 
-    /**
-     * @param string $algorithm
-     * @param int|null $iterations
-     * @throws Exception If the provided algorithm is not available in the current environment
-     */
-    public function __construct(string $algorithm, int $iterations = null)
-    {
-        parent::__construct($algorithm);
+	/**
+	 * @param string $algorithm
+	 * @param int|null $iterations
+	 * @throws Exception If the provided algorithm is not available in the current environment
+	 */
+	public function __construct(string $algorithm, int $iterations = null)
+	{
+		parent::__construct($algorithm);
 
-        if ($iterations !== null) {
-            $this->iterations = $iterations;
-        }
-    }
+		if ($iterations !== null) {
+			$this->iterations = $iterations;
+		}
+	}
 
-    /**
-     * @return int
-     */
-    public function getIterations(): int
-    {
-        return $this->iterations;
-    }
+	/**
+	 * @return int
+	 */
+	public function getIterations(): int
+	{
+		return $this->iterations;
+	}
 
-    public function encrypt($password, $salt = null, $member = null)
-    {
-        return hash_pbkdf2($this->getAlgorithm(), (string) $password, (string) $salt, $this->getIterations());
-    }
+	public function encrypt($password, $salt = null, $member = null)
+	{
+		return hash_pbkdf2($this->getAlgorithm(), (string) $password, (string) $salt, $this->getIterations());
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -29,7 +29,7 @@ 
     {
         parent::__construct($algorithm);
 
-        if ($iterations !== null) {
+        if ($iterations!==null) {
             $this->iterations = $iterations;
         }
     }
@@ -44,6 +44,6 @@ 
 
     public function encrypt($password, $salt = null, $member = null)
     {
-        return hash_pbkdf2($this->getAlgorithm(), (string) $password, (string) $salt, $this->getIterations());
+        return hash_pbkdf2($this->getAlgorithm(), (string)$password, (string)$salt, $this->getIterations());
     }
 }

tests/PasswordEncryptor/PBKDF2Test.php

Indentation +24 added lines, -24 removed lines

@@ -8,30 +8,30 @@
 
 class PBKDF2Test extends SapphireTest
 {
-    public function testGetIterations()
-    {
-        $encryptor = new PBKDF2('sha512', 12345);
-        $this->assertSame(12345, $encryptor->getIterations());
-    }
+	public function testGetIterations()
+	{
+		$encryptor = new PBKDF2('sha512', 12345);
+		$this->assertSame(12345, $encryptor->getIterations());
+	}
 
-    public function testEncrypt()
-    {
-        $encryptor = new PBKDF2('sha512', 10000);
-        $salt = 'predictablesaltforunittesting';
-        $result = $encryptor->encrypt('opensesame', $salt);
-        $this->assertSame(
-            '6bafcacb90',
-            substr($result, 0, 10),
-            'Hashed password with predictable salt did not match fixtured expectation'
-        );
-    }
+	public function testEncrypt()
+	{
+		$encryptor = new PBKDF2('sha512', 10000);
+		$salt = 'predictablesaltforunittesting';
+		$result = $encryptor->encrypt('opensesame', $salt);
+		$this->assertSame(
+			'6bafcacb90',
+			substr($result, 0, 10),
+			'Hashed password with predictable salt did not match fixtured expectation'
+		);
+	}
 
-    /**
-     * @expectedException Exception
-     * @expectedExceptionMessage Hash algorithm "foobar" not found
-     */
-    public function testThrowsExceptionWhenInvalidAlgorithmIsProvided()
-    {
-        new PBKDF2('foobar');
-    }
+	/**
+	 * @expectedException Exception
+	 * @expectedExceptionMessage Hash algorithm "foobar" not found
+	 */
+	public function testThrowsExceptionWhenInvalidAlgorithmIsProvided()
+	{
+		new PBKDF2('foobar');
+	}
 }