From 7b153651c1ed6096f7a0fe24e496deb3e4049c22 Mon Sep 17 00:00:00 2001 From: Petr Pchelko Date: Thu, 12 Sep 2019 14:08:04 -0700 Subject: [PATCH] DefaultPreferencesFactory: Remove fallback for null PermissionManager Bug: T220191 Depends-On: Id0f0bdb39b9e0be4d7c38c229371be04bb5aec5c Change-Id: Iaf43aada39663e48f10dd7d662e85891e568f8d4 --- includes/preferences/DefaultPreferencesFactory.php | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/includes/preferences/DefaultPreferencesFactory.php b/includes/preferences/DefaultPreferencesFactory.php index 56db81222e..10c88ff348 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; -- 2.20.1