From: Reedy <reedy@wikimedia.org>
Date: Tue, 27 Aug 2019 16:53:27 +0000 (+0100)
Subject: Remove hard deprecation of PasswordPolicyChecks::checkPopularPasswordBlacklist
X-Git-Tag: 1.34.0-rc.0~552^2
X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=commitdiff_plain;h=4260b0f8a9bb89d92c39a61d8c48a31007b7240f

Remove hard deprecation of PasswordPolicyChecks::checkPopularPasswordBlacklist

It's causing quite a bit of WMF log spam because it's still used in wmf-config

Partial revert of I4c90e361b7538efeb0c5efa7ca61aed2e468591c

Change-Id: I7d1282e4260e7a42bee35b81d77470eb40dea818
---

diff --git a/includes/password/PasswordPolicyChecks.php b/includes/password/PasswordPolicyChecks.php
index c3af88f07d..8eecbcc2e2 100644
--- a/includes/password/PasswordPolicyChecks.php
+++ b/includes/password/PasswordPolicyChecks.php
@@ -151,8 +151,6 @@ class PasswordPolicyChecks {
 		global $wgPopularPasswordFile, $wgSitename;
 		$status = Status::newGood();
 		if ( $policyVal > 0 ) {
-			wfDeprecated( __METHOD__, '1.33' );
-
 			$langEn = Language::factory( 'en' );
 			$passwordKey = $langEn->lc( trim( $password ) );
 
diff --git a/tests/phpunit/includes/password/PasswordPolicyChecksTest.php b/tests/phpunit/includes/password/PasswordPolicyChecksTest.php
index 457030fe5c..7ee1ec95e4 100644
--- a/tests/phpunit/includes/password/PasswordPolicyChecksTest.php
+++ b/tests/phpunit/includes/password/PasswordPolicyChecksTest.php
@@ -148,7 +148,6 @@ class PasswordPolicyChecksTest extends MediaWikiTestCase {
 	 */
 	public function testCheckPopularPasswordBlacklist( $expected, $password ) {
 		global $IP;
-		$this->hideDeprecated( 'PasswordPolicyChecks::checkPopularPasswordBlacklist' );
 		$this->setMwGlobals( [
 			'wgSitename' => 'sitename',
 			'wgPopularPasswordFile' => "$IP/includes/password/commonpasswords.cdb"