X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Fpassword%2FUserPasswordPolicy.php;h=bf1f8acfb7d3aa48757cb39e47864d4b2f91486d;hb=89539f2aa1b158fdcc703ad053e2580cb97a6385;hp=d57adb8e152b01ab598144fbcc2054455c49ee35;hpb=c3b35bb187d99d77d9363ce9d0ccde1e1e063ffa;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/password/UserPasswordPolicy.php b/includes/password/UserPasswordPolicy.php
index d57adb8e15..bf1f8acfb7 100644
--- a/includes/password/UserPasswordPolicy.php
+++ b/includes/password/UserPasswordPolicy.php
@@ -67,12 +67,11 @@ class UserPasswordPolicy {
 	 * Check if a passwords meets the effective password policy for a User.
 	 * @param User $user who's policy we are checking
 	 * @param string $password the password to check
-	 * @param string $purpose one of 'login', 'create', 'reset'
 	 * @return Status error to indicate the password didn't meet the policy, or fatal to
 	 *	indicate the user shouldn't be allowed to login.
 	 */
-	public function checkUserPassword( User $user, $password, $purpose = 'login' ) {
-		$effectivePolicy = $this->getPoliciesForUser( $user, $purpose );
+	public function checkUserPassword( User $user, $password ) {
+		$effectivePolicy = $this->getPoliciesForUser( $user );
 		return $this->checkPolicies(
 			$user,
 			$password,
@@ -134,20 +133,16 @@ class UserPasswordPolicy {
 	 * Get the policy for a user, based on their group membership. Public so
 	 * UI elements can access and inform the user.
 	 * @param User $user
-	 * @param string $purpose one of 'login', 'create', 'reset'
 	 * @return array the effective policy for $user
 	 */
-	public function getPoliciesForUser( User $user, $purpose = 'login' ) {
-		$effectivePolicy = $this->policies['default'];
-		if ( $purpose !== 'create' ) {
-			$effectivePolicy = self::getPoliciesForGroups(
-				$this->policies,
-				$user->getEffectiveGroups(),
-				$this->policies['default']
-			);
-		}
+	public function getPoliciesForUser( User $user ) {
+		$effectivePolicy = self::getPoliciesForGroups(
+			$this->policies,
+			$user->getEffectiveGroups(),
+			$this->policies['default']
+		);
 
-		Hooks::run( 'PasswordPoliciesForUser', array( $user, &$effectivePolicy, $purpose ) );
+		Hooks::run( 'PasswordPoliciesForUser', [ $user, &$effectivePolicy ] );
 
 		return $effectivePolicy;
 	}
@@ -184,7 +179,7 @@ class UserPasswordPolicy {
 	 * @return array containing the more restrictive values of $p1 and $p2
 	 */
 	public static function maxOfPolicies( array $p1, array $p2 ) {
-		$ret = array();
+		$ret = [];
 		$keys = array_merge( array_keys( $p1 ), array_keys( $p2 ) );
 		foreach ( $keys as $key ) {
 			if ( !isset( $p1[$key] ) ) {