X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=blobdiff_plain;f=includes%2Fpreferences%2FDefaultPreferencesFactory.php;h=68236e5f2efb7e2249e37c77aa9cfee26de3c8a9;hp=a7c7a492be73780522e07b2b376f1745d91c87ed;hb=4e9eb2f8d75784c78715e7dc3a9c8084d5c54943;hpb=a1d6452fd28bc0c2b047ddb2e86e94326e5640fd diff --git a/includes/preferences/DefaultPreferencesFactory.php b/includes/preferences/DefaultPreferencesFactory.php index a7c7a492be..68236e5f2e 100644 --- a/includes/preferences/DefaultPreferencesFactory.php +++ b/includes/preferences/DefaultPreferencesFactory.php @@ -122,7 +122,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 +130,10 @@ class DefaultPreferencesFactory implements PreferencesFactory { AuthManager $authManager, LinkRenderer $linkRenderer, NamespaceInfo $nsInfo, - PermissionManager $permissionManager = null + PermissionManager $permissionManager ) { $options->assertRequiredOptions( self::$constructorOptions ); - 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;