Use Authority and GroupPermissionLookup in Action API

Replaces calls directly to PermissionManager with calls to
the Authority object available from Context or the
GroupPermissionLookup service.

This patch does not address use of PermissionManager for
blocks.

Deprecations:
- ApiBase::checkUserRightsAny deprecated passing optional
User parameter
- ApiBase::checkTitleUserPermissions deprecated passing
LinkTarget as first parameter, takes PageIdentity instead

Bug: T271462
Bug: T271854
Change-Id: I5d7cac1c28a37e074750c46cda03283980a07fca

1 files changed, 1 insertions, 7 deletions

diff --git a/includes/api/ApiUnblock.php b/includes/api/ApiUnblock.php
index 2bec79456624..20fa0717fd44 100644
--- a/includes/api/ApiUnblock.php
+++ b/includes/api/ApiUnblock.php
@@ -24,7 +24,6 @@ use MediaWiki\Block\BlockPermissionCheckerFactory;
 use MediaWiki\Block\DatabaseBlock;
 use MediaWiki\Block\UnblockUserFactory;
 use MediaWiki\ParamValidator\TypeDef\UserDef;
-use MediaWiki\Permissions\PermissionManager;
 
 /**
  * API module that facilitates the unblocking of users. Requires API write mode
@@ -42,9 +41,6 @@ class ApiUnblock extends ApiBase {
 	/** @var UnblockUserFactory */
 	private $unblockUserFactory;
 
-	/** @var PermissionManager */
-	private $permissionManager;
-
 	/** @var UserCache */
 	private $userCache;
 
@@ -53,14 +49,12 @@ class ApiUnblock extends ApiBase {
 		$action,
 		BlockPermissionCheckerFactory $permissionCheckerFactory,
 		UnblockUserFactory $unblockUserFactory,
-		PermissionManager $permissionManager,
 		UserCache $userCache
 	) {
 		parent::__construct( $main, $action );
 
 		$this->permissionCheckerFactory = $permissionCheckerFactory;
 		$this->unblockUserFactory = $unblockUserFactory;
-		$this->permissionManager = $permissionManager;
 		$this->userCache = $userCache;
 	}
 
@@ -73,7 +67,7 @@ class ApiUnblock extends ApiBase {
 
 		$this->requireOnlyOneParameter( $params, 'id', 'user', 'userid' );
 
-		if ( !$this->permissionManager->userHasRight( $performer, 'block' ) ) {
+		if ( !$this->getAuthority()->isAllowed( 'block' ) ) {
 			$this->dieWithError( 'apierror-permissiondenied-unblock', 'permissiondenied' );
 		}