From: James D. Forrester <jforrester@wikimedia.org>
Date: Tue, 8 Oct 2019 18:28:15 +0000 (-0700)
Subject: Services: Convert DefaultPreferencesFactory's static to a const now HHVM is gone
X-Git-Tag: 1.34.0-rc.0~22^2
X-Git-Url: http://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=commitdiff_plain;h=d912ae39113edf613ad47e30272d2eea68ef204d

Services: Convert DefaultPreferencesFactory's static to a const now HHVM is gone

Change-Id: If24c5f120cb96311b50750c5b3022664dc6b20e5
(cherry picked from commit 17f3f9cee31cd3aab4370808871309d9de5a87f9)
---

diff --git a/includes/ServiceWiring.php b/includes/ServiceWiring.php
index 6d3fe6c4bd..152c417364 100644
--- a/includes/ServiceWiring.php
+++ b/includes/ServiceWiring.php
@@ -556,7 +556,7 @@ return [
 	'PreferencesFactory' => function ( MediaWikiServices $services ) : PreferencesFactory {
 		$factory = new DefaultPreferencesFactory(
 			new ServiceOptions(
-				DefaultPreferencesFactory::$constructorOptions, $services->getMainConfig() ),
+				DefaultPreferencesFactory::CONSTRUCTOR_OPTIONS, $services->getMainConfig() ),
 			$services->getContentLanguage(),
 			AuthManager::singleton(),
 			$services->getLinkRendererFactory()->create(),
diff --git a/includes/preferences/DefaultPreferencesFactory.php b/includes/preferences/DefaultPreferencesFactory.php
index 68236e5f2e..6cee7323f4 100644
--- a/includes/preferences/DefaultPreferencesFactory.php
+++ b/includes/preferences/DefaultPreferencesFactory.php
@@ -81,12 +81,10 @@ class DefaultPreferencesFactory implements PreferencesFactory {
 	protected $permissionManager;
 
 	/**
-	 * TODO Make this a const when we drop HHVM support (T192166)
-	 *
 	 * @var array
 	 * @since 1.34
 	 */
-	public static $constructorOptions = [
+	public const CONSTRUCTOR_OPTIONS = [
 		'AllowRequiringEmailForResets',
 		'AllowUserCss',
 		'AllowUserCssPrefs',
@@ -132,7 +130,7 @@ class DefaultPreferencesFactory implements PreferencesFactory {
 		NamespaceInfo $nsInfo,
 		PermissionManager $permissionManager
 	) {
-		$options->assertRequiredOptions( self::$constructorOptions );
+		$options->assertRequiredOptions( self::CONSTRUCTOR_OPTIONS );
 
 		$this->options = $options;
 		$this->contLang = $contLang;
diff --git a/tests/phpunit/includes/preferences/DefaultPreferencesFactoryTest.php b/tests/phpunit/includes/preferences/DefaultPreferencesFactoryTest.php
index c7a3fe6045..1e063dd9ef 100644
--- a/tests/phpunit/includes/preferences/DefaultPreferencesFactoryTest.php
+++ b/tests/phpunit/includes/preferences/DefaultPreferencesFactoryTest.php
@@ -63,7 +63,7 @@ class DefaultPreferencesFactoryTest extends \MediaWikiTestCase {
 
 		return new DefaultPreferencesFactory(
 			new LoggedServiceOptions( self::$serviceOptionsAccessLog,
-				DefaultPreferencesFactory::$constructorOptions, $this->config ),
+				DefaultPreferencesFactory::CONSTRUCTOR_OPTIONS, $this->config ),
 			new Language(),
 			AuthManager::singleton(),
 			MediaWikiServices::getInstance()->getLinkRenderer(),