From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Tue, 8 Oct 2019 21:03:04 +0000 (+0000)
Subject: Merge "Services: Convert DefaultPreferencesFactory's static to a const now HHVM is... 
X-Git-Tag: 1.34.0-rc.0~22
X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=commitdiff_plain;h=3bf40e4021fbe1087ab275767d5cf367b4a32f02;hp=-c

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

3bf40e4021fbe1087ab275767d5cf367b4a32f02
diff --combined includes/ServiceWiring.php
index 6c0748c8ce,152c417364..dcb4aaf5f5
--- a/includes/ServiceWiring.php
+++ b/includes/ServiceWiring.php
@@@ -522,7 -522,7 +522,7 @@@ return 
  	},
  
  	'PasswordReset' => function ( MediaWikiServices $services ) : PasswordReset {
 -		$options = new ServiceOptions( PasswordReset::$constructorOptions, $services->getMainConfig() );
 +		$options = new ServiceOptions( PasswordReset::CONSTRUCTOR_OPTIONS, $services->getMainConfig() );
  		return new PasswordReset(
  			$options,
  			AuthManager::singleton(),
@@@ -556,7 -556,7 +556,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(),