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

1 files changed, 17 insertions, 13 deletions

diff --git a/includes/session/CookieSessionProvider.php b/includes/session/CookieSessionProvider.php
index b80244e408ab..f497ceeeb7c3 100644
--- a/includes/session/CookieSessionProvider.php
+++ b/includes/session/CookieSessionProvider.php
@@ -23,6 +23,7 @@
 
 namespace MediaWiki\Session;
 
+use MediaWiki\MainConfigNames;
 use MediaWiki\User\UserRigorOptions;
 use User;
 use WebRequest;
@@ -93,20 +94,23 @@ class CookieSessionProvider extends SessionProvider {
 			// @codeCoverageIgnoreEnd
 			'callUserSetCookiesHook' => false,
 			'sessionName' =>
-				$this->getConfig()->get( 'SessionName' ) ?: $this->getConfig()->get( 'CookiePrefix' ) . '_session',
+				$this->getConfig()->get( MainConfigNames::SessionName )
+				?: $this->getConfig()->get( MainConfigNames::CookiePrefix ) . '_session',
 		];
 
-		$this->useCrossSiteCookies = strcasecmp( $this->getConfig()->get( 'CookieSameSite' ), 'none' ) === 0;
+		$this->useCrossSiteCookies =
+			strcasecmp( $this->getConfig()->get( MainConfigNames::CookieSameSite ), 'none' ) === 0;
 
 		// @codeCoverageIgnoreStart
 		$this->cookieOptions += [
 			// @codeCoverageIgnoreEnd
-			'prefix' => $this->getConfig()->get( 'CookiePrefix' ),
-			'path' => $this->getConfig()->get( 'CookiePath' ),
-			'domain' => $this->getConfig()->get( 'CookieDomain' ),
-			'secure' => $this->getConfig()->get( 'CookieSecure' ) || $this->getConfig()->get( 'ForceHTTPS' ),
-			'httpOnly' => $this->getConfig()->get( 'CookieHttpOnly' ),
-			'sameSite' => $this->getConfig()->get( 'CookieSameSite' ),
+			'prefix' => $this->getConfig()->get( MainConfigNames::CookiePrefix ),
+			'path' => $this->getConfig()->get( MainConfigNames::CookiePath ),
+			'domain' => $this->getConfig()->get( MainConfigNames::CookieDomain ),
+			'secure' => $this->getConfig()->get( MainConfigNames::CookieSecure )
+				|| $this->getConfig()->get( MainConfigNames::ForceHTTPS ),
+			'httpOnly' => $this->getConfig()->get( MainConfigNames::CookieHttpOnly ),
+			'sameSite' => $this->getConfig()->get( MainConfigNames::CookieSameSite ),
 		];
 	}
 
@@ -214,8 +218,8 @@ class CookieSessionProvider extends SessionProvider {
 
 		$forceHTTPS = $session->shouldForceHTTPS() || $user->requiresHTTPS();
 		if ( $forceHTTPS ) {
-			$options['secure'] = $this->getConfig()->get( 'CookieSecure' )
-				|| $this->getConfig()->get( 'ForceHTTPS' );
+			$options['secure'] = $this->getConfig()->get( MainConfigNames::CookieSecure )
+				|| $this->getConfig()->get( MainConfigNames::ForceHTTPS );
 		}
 
 		$response->setCookie( $this->params['sessionName'], $session->getId(), null,
@@ -272,7 +276,7 @@ class CookieSessionProvider extends SessionProvider {
 	 * @param WebRequest $request
 	 */
 	protected function setForceHTTPSCookie( $set, ?SessionBackend $backend, WebRequest $request ) {
-		if ( $this->getConfig()->get( 'ForceHTTPS' ) ) {
+		if ( $this->getConfig()->get( MainConfigNames::ForceHTTPS ) ) {
 			// No need to send a cookie if the wiki is always HTTPS (T256095)
 			return;
 		}
@@ -441,10 +445,10 @@ class CookieSessionProvider extends SessionProvider {
 	 */
 	protected function getLoginCookieExpiration( $cookieName, $shouldRememberUser ) {
 		$extendedCookies = $this->getExtendedLoginCookies();
-		$normalExpiration = $this->getConfig()->get( 'CookieExpiration' );
+		$normalExpiration = $this->getConfig()->get( MainConfigNames::CookieExpiration );
 
 		if ( $shouldRememberUser && in_array( $cookieName, $extendedCookies, true ) ) {
-			$extendedExpiration = $this->getConfig()->get( 'ExtendedLoginCookieExpiration' );
+			$extendedExpiration = $this->getConfig()->get( MainConfigNames::ExtendedLoginCookieExpiration );
 
 			return ( $extendedExpiration !== null ) ? (int)$extendedExpiration : (int)$normalExpiration;
 		} else {