From 974d575826731c601ba3101825c6432a48d178b8 Mon Sep 17 00:00:00 2001
From: Daniel Hensby <dhensby@users.noreply.github.com>
Date: Mon, 21 Oct 2013 18:10:37 +0100
Subject: [PATCH] Allowing chaining on `PasswordValidator`

Allowing chaining on `PasswordValidator`.

Also using injector pattern for `ValidationResult` instanciation
---
 security/PasswordValidator.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/security/PasswordValidator.php b/security/PasswordValidator.php
index 4722cbd33..4cbd9da98 100644
--- a/security/PasswordValidator.php
+++ b/security/PasswordValidator.php
@@ -16,7 +16,7 @@
  * @subpackage security
  */
 class PasswordValidator extends Object {
-	
+
 	private static $character_strength_tests = array(
 		'lowercase' => '/[a-z]/',
 		'uppercase' => '/[A-Z]/',
@@ -31,6 +31,7 @@ class PasswordValidator extends Object {
 	 */
 	public function minLength($minLength) {
 		$this->minLength = $minLength;
+		return $this;
 	}
 	
 	/**
@@ -44,6 +45,7 @@ class PasswordValidator extends Object {
 	public function characterStrength($minScore, $testNames) {
 		$this->minScore = $minScore;
 		$this->testNames = $testNames;
+		return $this;
 	}
 	
 	/**
@@ -51,6 +53,7 @@ class PasswordValidator extends Object {
 	 */
 	public function checkHistoricalPasswords($count) {
 		$this->historicalPasswordCount = $count;
+		return $this;
 	}
 	
 	/**
@@ -59,7 +62,7 @@ class PasswordValidator extends Object {
 	 * @return ValidationResult
 	 */
 	public function validate($password, $member) {
-		$valid = new ValidationResult();
+		$valid = ValidationResult::create();
 
 		if($this->minLength) {
 			if(strlen($password) < $this->minLength) {