From db31c6dfeabdf0a8ad8a645910121151687523e4 Mon Sep 17 00:00:00 2001
From: Daimona Eaytoy <daimona.wiki@gmail.com>
Date: Mon, 10 Dec 2018 17:56:02 +0100
Subject: [PATCH] Rewrite the method for getting a global emergency value

Currently it barely has any reason to exist, as it's a single-line
method. This patch moves there the global state, and also changes the
signature to allow shorter calls.

Change-Id: I7851fa41cbd96912b3859319ba97a501b1cbaa57
---
 includes/AbuseFilter.php | 32 +++++++++++++++++++++++---------
 1 file changed, 23 insertions(+), 9 deletions(-)

diff --git a/includes/AbuseFilter.php b/includes/AbuseFilter.php
index 69f5fabba..f793aaee6 100644
--- a/includes/AbuseFilter.php
+++ b/includes/AbuseFilter.php
@@ -2017,18 +2017,15 @@ class AbuseFilter {
 	 * @param string[] $filters The filters to check
 	 */
 	private static function checkEmergencyDisable( $group, $filters ) {
-		global $wgAbuseFilterEmergencyDisableThreshold, $wgAbuseFilterEmergencyDisableCount,
-			$wgAbuseFilterEmergencyDisableAge;
-
 		$stash = ObjectCache::getMainStashInstance();
 		// @ToDo this is an amount between 1 and AbuseFilterProfileActionsCap, which means that the
 		// reliability of this number may strongly vary. We should instead use a fixed one.
 		$totalActions = $stash->get( self::filterUsedKey( $group ) );
 
 		foreach ( $filters as $filter ) {
-			$threshold = self::getEmergencyValue( $wgAbuseFilterEmergencyDisableThreshold, $group );
-			$hitCountLimit = self::getEmergencyValue( $wgAbuseFilterEmergencyDisableCount, $group );
-			$maxAge = self::getEmergencyValue( $wgAbuseFilterEmergencyDisableAge, $group );
+			$threshold = self::getEmergencyValue( 'threshold', $group );
+			$hitCountLimit = self::getEmergencyValue( 'count', $group );
+			$maxAge = self::getEmergencyValue( 'age', $group );
 
 			$matchCount = $stash->get( self::filterMatchesKey( $filter ) );
 
@@ -2068,12 +2065,29 @@ class AbuseFilter {
 	}
 
 	/**
-	 * @param array $emergencyValue
+	 * @param string $type The value to get, either "threshold", "count" or "age"
 	 * @param string $group The filter's group (as defined in $wgAbuseFilterValidGroups)
 	 * @return mixed
 	 */
-	public static function getEmergencyValue( array $emergencyValue, $group ) {
-		return $emergencyValue[$group] ?? $emergencyValue['default'];
+	public static function getEmergencyValue( $type, $group ) {
+		switch ( $type ) {
+			case 'threshold':
+				global $wgAbuseFilterEmergencyDisableThreshold;
+				$value = $wgAbuseFilterEmergencyDisableThreshold;
+				break;
+			case 'count':
+				global $wgAbuseFilterEmergencyDisableCount;
+				$value = $wgAbuseFilterEmergencyDisableCount;
+				break;
+			case 'age':
+				global $wgAbuseFilterEmergencyDisableAge;
+				$value = $wgAbuseFilterEmergencyDisableAge;
+				break;
+			default:
+				throw new InvalidArgumentException( '$type must be either "threshold", "count" or "age"' );
+		}
+
+		return $value[$group] ?? $value['default'];
 	}
 
 	/**