diff options
| author | jenkins-bot <jenkins-bot@gerrit.wikimedia.org> | 2019-10-08 21:03:04 +0000 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@wikimedia.org> | 2019-10-08 21:03:04 +0000 |
| commit | 3bf40e4021fbe1087ab275767d5cf367b4a32f02 (patch) | |
| tree | a2ae6682efe315ea4e3d0dd513f8f8c92ad37bed | |
| parent | 8e0ef3e187b4b8ebe847dbc8ae1ec2b96ed58ae0 (diff) | |
| parent | d912ae39113edf613ad47e30272d2eea68ef204d (diff) | |
| download | mediawikicore-3bf40e4021fbe1087ab275767d5cf367b4a32f02.tar.gz mediawikicore-3bf40e4021fbe1087ab275767d5cf367b4a32f02.zip | |
Merge "Services: Convert DefaultPreferencesFactory's static to a const now HHVM is gone" into REL1_34
| -rw-r--r-- | includes/ServiceWiring.php | 2 | ||||
| -rw-r--r-- | includes/preferences/DefaultPreferencesFactory.php | 6 | ||||
| -rw-r--r-- | tests/phpunit/includes/preferences/DefaultPreferencesFactoryTest.php | 2 |
3 files changed, 4 insertions, 6 deletions
diff --git a/includes/ServiceWiring.php b/includes/ServiceWiring.php index 6c0748c8ce8d..dcb4aaf5f5b1 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 68236e5f2efb..6cee7323f429 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 c7a3fe60453e..1e063dd9eff9 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(), |