Merge "Services: Convert DefaultPreferencesFactory's static to a const now HHVM is...

[lhc/web/wiklou.git] / includes / preferences / DefaultPreferencesFactory.php

diff --git a/includes/preferences/DefaultPreferencesFactory.php b/includes/preferences/DefaultPreferencesFactory.php
index a7c7a49..6cee732 100644 (file)
--- 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',
@@ -122,7 +120,7 @@ class DefaultPreferencesFactory implements PreferencesFactory {
         * @param AuthManager $authManager
         * @param LinkRenderer $linkRenderer
         * @param NamespaceInfo $nsInfo
-        * @param PermissionManager|null $permissionManager
+        * @param PermissionManager $permissionManager
         */
        public function __construct(
                ServiceOptions $options,
@@ -130,15 +128,10 @@ class DefaultPreferencesFactory implements PreferencesFactory {
                AuthManager $authManager,
                LinkRenderer $linkRenderer,
                NamespaceInfo $nsInfo,
-               PermissionManager $permissionManager = null
+               PermissionManager $permissionManager
        ) {
-               $options->assertRequiredOptions( self::$constructorOptions );
+               $options->assertRequiredOptions( self::CONSTRUCTOR_OPTIONS );
 
-               if ( !$permissionManager ) {
-                       // TODO: this is actually hard-deprecated, left for jenkins to pass
-                       // together with GlobalPreferences extension. Will be removed in a followup.
-                       $permissionManager = MediaWikiServices::getInstance()->getPermissionManager();
-               }
                $this->options = $options;
                $this->contLang = $contLang;
                $this->authManager = $authManager;