From: James D. Forrester <jforrester@wikimedia.org>
Date: Sat, 9 Feb 2019 01:43:08 +0000 (-0800)
Subject: Drop User::getGroup{Name|Member}(), deprecated in 1.29 and unused
X-Git-Tag: 1.34.0-rc.0~2879
X-Git-Url: http://git.cyclocoop.org/%22%20.%20generer_url_ecrire%28%22calendrier%22%2C%22type=semaine%22%29%20.%20%22?a=commitdiff_plain;h=9973617ae71f430bd62b82e67aab86c3b05d21fa;p=lhc%2Fweb%2Fwiklou.git

Drop User::getGroup{Name|Member}(), deprecated in 1.29 and unused

Except in the Configure extension.

Change-Id: Id6e2511cc2c5f86afcf0af2faa69d4a712efbe26
---

diff --git a/RELEASE-NOTES-1.33 b/RELEASE-NOTES-1.33
index 4253e27103..da87d1e67b 100644
--- a/RELEASE-NOTES-1.33
+++ b/RELEASE-NOTES-1.33
@@ -225,6 +225,9 @@ because of Phabricator reports.
   You can use SearchEngine::getNearMatcher() instead.
 * EmailNotification::updateWatchlistTimestamp, deprecated in 1.27, has been
   removed. Instead, use WatchedItemStore::updateNotificationTimestamp directly.
+* User::getGroupName() and ::getGroupMember(), both deprecated in 1.29, have
+  been removed. Instead, please use UserGroupMembership::getGroupName() and
+  UserGroupMembership::getGroupMemberName().
 
 === Deprecations in 1.33 ===
 * The configuration option $wgUseESI has been deprecated, and is expected
diff --git a/includes/user/User.php b/includes/user/User.php
index f5eee34aaa..f4e2e48a79 100644
--- a/includes/user/User.php
+++ b/includes/user/User.php
@@ -5124,31 +5124,6 @@ class User implements IDBAccessObject, UserIdentity {
 		return true;
 	}
 
-	/**
-	 * Get the localized descriptive name for a group, if it exists
-	 * @deprecated since 1.29 Use UserGroupMembership::getGroupName instead
-	 *
-	 * @param string $group Internal group name
-	 * @return string Localized descriptive group name
-	 */
-	public static function getGroupName( $group ) {
-		wfDeprecated( __METHOD__, '1.29' );
-		return UserGroupMembership::getGroupName( $group );
-	}
-
-	/**
-	 * Get the localized descriptive name for a member of a group, if it exists
-	 * @deprecated since 1.29 Use UserGroupMembership::getGroupMemberName instead
-	 *
-	 * @param string $group Internal group name
-	 * @param string $username Username for gender (since 1.19)
-	 * @return string Localized name for group member
-	 */
-	public static function getGroupMember( $group, $username = '#' ) {
-		wfDeprecated( __METHOD__, '1.29' );
-		return UserGroupMembership::getGroupMemberName( $group, $username );
-	}
-
 	/**
 	 * Return the set of defined explicit groups.
 	 * The implicit groups (by default *, 'user' and 'autoconfirmed')