From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Tue, 8 Oct 2019 21:10:44 +0000 (+0000)
Subject: Merge "Services: Convert LocalisationCache's static to a const now HHVM is gone"... 
X-Git-Tag: 1.34.0-rc.0~20
X-Git-Url: http://git.cyclocoop.org/?a=commitdiff_plain;h=5444a9689f08bdd5708c3d09062d02cbcd68ce2b;hp=-c;p=lhc%2Fweb%2Fwiklou.git

Merge "Services: Convert LocalisationCache's static to a const now HHVM is gone" into REL1_34
---

5444a9689f08bdd5708c3d09062d02cbcd68ce2b
diff --combined includes/ServiceWiring.php
index 60a53563cc,4f3f5d9241..f6d0ec06c9
--- a/includes/ServiceWiring.php
+++ b/includes/ServiceWiring.php
@@@ -298,7 -298,7 +298,7 @@@ return 
  
  		return new $conf['class'](
  			new ServiceOptions(
- 				LocalisationCache::$constructorOptions,
+ 				LocalisationCache::CONSTRUCTOR_OPTIONS,
  				// Two of the options are stored in $wgLocalisationCacheConf
  				$conf,
  				// In case someone set that config variable and didn't reset all keys, set defaults.
@@@ -586,7 -586,7 +586,7 @@@
  	'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(),