Use MainConfigNames instead of string literals, #4

Now largely automated:

VARS=$(grep -o "'[A-Za-z0-9_]*'" includes/MainConfigNames.php | \
  tr "\n" '|' | sed "s/|$/\n/;s/'//g")
sed -i -E "s/'($VARS)'/MainConfigNames::\1/g" \
  $(grep -ERIl "'($VARS)'" includes/)

Then git add -p with lots of error-prone manual checking. Then
semi-manually add all the necessary "use" lines:

vim $(grep -L 'use MediaWiki\\MainConfigNames;' \
  $(git diff --cached --name-only --diff-filter=M HEAD^))

I didn't bother fixing lines that were over 100 characters unless they
were over 120 and triggered phpcs.

Bug: T305805
Change-Id: I74e0ab511abecb276717ad4276a124760a268147

2 files changed, 12 insertions, 10 deletions

diff --git a/includes/rcfeed/IRCColourfulRCFeedFormatter.php b/includes/rcfeed/IRCColourfulRCFeedFormatter.php
index 367e8203ca93..8d99cb4d2986 100644
--- a/includes/rcfeed/IRCColourfulRCFeedFormatter.php
+++ b/includes/rcfeed/IRCColourfulRCFeedFormatter.php
@@ -19,6 +19,7 @@
  * @file
  */
 
+use MediaWiki\MainConfigNames;
 use MediaWiki\MediaWikiServices;
 
 /**
@@ -44,11 +45,11 @@ class IRCColourfulRCFeedFormatter implements RCFeedFormatter {
 	 */
 	public function getLine( array $feed, RecentChange $rc, $actionComment ) {
 		$mainConfig = MediaWikiServices::getInstance()->getMainConfig();
-		$useRCPatrol = $mainConfig->get( 'UseRCPatrol' );
-		$useNPPatrol = $mainConfig->get( 'UseNPPatrol' );
-		$localInterwikis = $mainConfig->get( 'LocalInterwikis' );
-		$canonicalServer = $mainConfig->get( 'CanonicalServer' );
-		$script = $mainConfig->get( 'Script' );
+		$useRCPatrol = $mainConfig->get( MainConfigNames::UseRCPatrol );
+		$useNPPatrol = $mainConfig->get( MainConfigNames::UseNPPatrol );
+		$localInterwikis = $mainConfig->get( MainConfigNames::LocalInterwikis );
+		$canonicalServer = $mainConfig->get( MainConfigNames::CanonicalServer );
+		$script = $mainConfig->get( MainConfigNames::Script );
 		$attribs = $rc->getAttributes();
 		if ( $attribs['rc_type'] == RC_CATEGORIZE ) {
 			// Don't send RC_CATEGORIZE events to IRC feed (T127360)
diff --git a/includes/rcfeed/MachineReadableRCFeedFormatter.php b/includes/rcfeed/MachineReadableRCFeedFormatter.php
index d57d7d72d90e..588149e0b34d 100644
--- a/includes/rcfeed/MachineReadableRCFeedFormatter.php
+++ b/includes/rcfeed/MachineReadableRCFeedFormatter.php
@@ -19,6 +19,7 @@
  * @file
  */
 
+use MediaWiki\MainConfigNames;
 use MediaWiki\MediaWikiServices;
 
 /**
@@ -45,9 +46,9 @@ abstract class MachineReadableRCFeedFormatter implements RCFeedFormatter {
 	 */
 	public function getLine( array $feed, RecentChange $rc, $actionComment ) {
 		$mainConfig = MediaWikiServices::getInstance()->getMainConfig();
-		$canonicalServer = $mainConfig->get( 'CanonicalServer' );
-		$serverName = $mainConfig->get( 'ServerName' );
-		$scriptPath = $mainConfig->get( 'ScriptPath' );
+		$canonicalServer = $mainConfig->get( MainConfigNames::CanonicalServer );
+		$serverName = $mainConfig->get( MainConfigNames::ServerName );
+		$scriptPath = $mainConfig->get( MainConfigNames::ScriptPath );
 		$packet = [
 			// Usually, RC ID is exposed only for patrolling purposes,
 			// but there is no real reason not to expose it in other cases,
@@ -68,8 +69,8 @@ abstract class MachineReadableRCFeedFormatter implements RCFeedFormatter {
 
 		$type = $rc->getAttribute( 'rc_type' );
 		if ( $type == RC_EDIT || $type == RC_NEW ) {
-			$useRCPatrol = MediaWikiServices::getInstance()->getMainConfig()->get( 'UseRCPatrol' );
-			$useNPPatrol = MediaWikiServices::getInstance()->getMainConfig()->get( 'UseNPPatrol' );
+			$useRCPatrol = MediaWikiServices::getInstance()->getMainConfig()->get( MainConfigNames::UseRCPatrol );
+			$useNPPatrol = MediaWikiServices::getInstance()->getMainConfig()->get( MainConfigNames::UseNPPatrol );
 			$packet['minor'] = (bool)$rc->getAttribute( 'rc_minor' );
 			if ( $useRCPatrol || ( $type == RC_NEW && $useNPPatrol ) ) {
 				$packet['patrolled'] = (bool)$rc->getAttribute( 'rc_patrolled' );