From df7f71017510eaeaf4d1c42df9de30995fdd072d Mon Sep 17 00:00:00 2001
From: Derick Alangi <alangiderick@gmail.com>
Date: Tue, 14 May 2019 12:14:07 +0100
Subject: [PATCH] SpecialEmailUser: Remove validate/get target without sender
 specified

This was deprecated in 1.30 and per usage below, these has been cleaned
up. Passing "null" is deprecated and no longer used anywhere. All usage
now pass a user object that is the sender.

Usage
=====

* validateTarget():
https://codesearch.wmflabs.org/search/?q=%5CbvalidateTarget%5Cb&i=nope&files=&repos=

* getTarget():
https://codesearch.wmflabs.org/search/?q=%5Cb(-%3E%7C%3A%3A)getTarget%5Cb&i=nope&files=&repos=

Change-Id: I22ed2bc42216712602f8b4685035c3396d3d1e5c
---
 RELEASE-NOTES-1.34                     |  2 ++
 includes/specials/SpecialEmailUser.php | 38 +++++++++-----------------
 2 files changed, 15 insertions(+), 25 deletions(-)

diff --git a/RELEASE-NOTES-1.34 b/RELEASE-NOTES-1.34
index 5391c98fba..6f00109dc1 100644
--- a/RELEASE-NOTES-1.34
+++ b/RELEASE-NOTES-1.34
@@ -205,6 +205,8 @@ because of Phabricator reports.
 * jquery.ui.effect-bounce, jquery.ui.effect-explode, jquery.ui.effect-fold
   jquery.ui.effect-pulsate, jquery.ui.effect-slide, jquery.ui.effect-transfer,
   which are no longer used, have now been removed.
+* SpecialEmailUser::validateTarget(), ::getTarget() without a sender/user
+  specified, deprecated in 1.30, have been removed.
 * …
 
 === Deprecations in 1.34 ===
diff --git a/includes/specials/SpecialEmailUser.php b/includes/specials/SpecialEmailUser.php
index 5f80215632..e1606b2561 100644
--- a/includes/specials/SpecialEmailUser.php
+++ b/includes/specials/SpecialEmailUser.php
@@ -166,14 +166,10 @@ class SpecialEmailUser extends UnlistedSpecialPage {
 	 * Validate target User
 	 *
 	 * @param string $target Target user name
-	 * @param User|null $sender User sending the email
+	 * @param User $sender User sending the email
 	 * @return User|string User object on success or a string on error
 	 */
-	public static function getTarget( $target, User $sender = null ) {
-		if ( $sender === null ) {
-			wfDeprecated( __METHOD__ . ' without specifying the sending user', '1.30' );
-		}
-
+	public static function getTarget( $target, User $sender ) {
 		if ( $target == '' ) {
 			wfDebug( "Target is empty.\n" );
 
@@ -190,15 +186,11 @@ class SpecialEmailUser extends UnlistedSpecialPage {
 	 * Validate target User
 	 *
 	 * @param User $target Target user
-	 * @param User|null $sender User sending the email
+	 * @param User $sender User sending the email
 	 * @return string Error message or empty string if valid.
 	 * @since 1.30
 	 */
-	public static function validateTarget( $target, User $sender = null ) {
-		if ( $sender === null ) {
-			wfDeprecated( __METHOD__ . ' without specifying the sending user', '1.30' );
-		}
-
+	public static function validateTarget( $target, User $sender ) {
 		if ( !$target instanceof User || !$target->getId() ) {
 			wfDebug( "Target is invalid user.\n" );
 
@@ -217,25 +209,21 @@ class SpecialEmailUser extends UnlistedSpecialPage {
 			return 'nowikiemail';
 		}
 
-		if ( $sender !== null && !$target->getOption( 'email-allow-new-users' ) &&
-			$sender->isNewbie()
-		) {
+		if ( !$target->getOption( 'email-allow-new-users' ) && $sender->isNewbie() ) {
 			wfDebug( "User does not allow user emails from new users.\n" );
 
 			return 'nowikiemail';
 		}
 
-		if ( $sender !== null ) {
-			$blacklist = $target->getOption( 'email-blacklist', '' );
-			if ( $blacklist ) {
-				$blacklist = MultiUsernameFilter::splitIds( $blacklist );
-				$lookup = CentralIdLookup::factory();
-				$senderId = $lookup->centralIdFromLocalUser( $sender );
-				if ( $senderId !== 0 && in_array( $senderId, $blacklist ) ) {
-					wfDebug( "User does not allow user emails from this user.\n" );
+		$blacklist = $target->getOption( 'email-blacklist', '' );
+		if ( $blacklist ) {
+			$blacklist = MultiUsernameFilter::splitIds( $blacklist );
+			$lookup = CentralIdLookup::factory();
+			$senderId = $lookup->centralIdFromLocalUser( $sender );
+			if ( $senderId !== 0 && in_array( $senderId, $blacklist ) ) {
+				wfDebug( "User does not allow user emails from this user.\n" );
 
-					return 'nowikiemail';
-				}
+				return 'nowikiemail';
 			}
 		}
 
-- 
2.20.1