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',
* @param AuthManager $authManager
* @param LinkRenderer $linkRenderer
* @param NamespaceInfo $nsInfo
- * @param PermissionManager|null $permissionManager
+ * @param PermissionManager $permissionManager
*/
public function __construct(
ServiceOptions $options,
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;