From 204cdb2a74199a778d3030fe6ffb75f4f4d933af Mon Sep 17 00:00:00 2001
From: Piotr Miazga <piotr@polishdeveloper.pl>
Date: Fri, 24 May 2019 01:14:06 +0200
Subject: [PATCH] Hygiene: Use PermissionsManager instead of deprecated methods

Instead of using Title::quickUserCan() and User::isBlockedFrom()
we have to use the PermissionManager.

Bug: T221792
Change-Id: I5bffd859140f73a78fa2fc155b7b2343eefd3807
---
 includes/ServiceWiring.php                   |  3 ++-
 includes/menu/PageActions/ToolbarBuilder.php | 23 ++++++++++++++++----
 2 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/includes/ServiceWiring.php b/includes/ServiceWiring.php
index 72ea896..73a7465 100644
--- a/includes/ServiceWiring.php
+++ b/includes/ServiceWiring.php
@@ -57,7 +57,8 @@ return [
 			$skin,
 			$context->getTitle(),
 			$context->getUser(),
-			$context
+			$context,
+			$services->getPermissionManager()
 		);
 		if ( $skinOptions->get( SkinOptions::OPTION_OVERFLOW_SUBMENU ) ) {
 			 $overflowBuilder = $userPageHelper->isUserPage() ?
diff --git a/includes/menu/PageActions/ToolbarBuilder.php b/includes/menu/PageActions/ToolbarBuilder.php
index d55908f..5f50f55 100644
--- a/includes/menu/PageActions/ToolbarBuilder.php
+++ b/includes/menu/PageActions/ToolbarBuilder.php
@@ -23,6 +23,7 @@ namespace MediaWiki\Minerva\Menu\PageActions;
 use ExtensionRegistry;
 use Hooks;
 use MediaWiki\Minerva\Menu\Group;
+use MediaWiki\Permissions\PermissionManager;
 use MessageLocalizer;
 use MinervaUI;
 use MWException;
@@ -53,19 +54,25 @@ class ToolbarBuilder {
 	 */
 	private $messageLocalizer;
 
+	/**
+	 * @var PermissionManager
+	 */
+	private $permissionsManager;
 	/**
 	 * Build Group containing icons for toolbar
 	 * @param SkinMinerva $skin User Skin
 	 * @param Title $title Article title user is currently browsing
 	 * @param User $user Currently logged in user
 	 * @param MessageLocalizer $msgLocalizer Message localizer to generate localized texts
+	 * @param PermissionManager $permissionManager Mediawiki Permissions Manager
 	 */
 	public function __construct( SkinMinerva $skin, Title $title, User $user,
-								 MessageLocalizer $msgLocalizer ) {
+								 MessageLocalizer $msgLocalizer, PermissionManager $permissionManager ) {
 		$this->skin = $skin;
 		$this->title = $title;
 		$this->user = $user;
 		$this->messageLocalizer = $msgLocalizer;
+		$this->permissionsManager = $permissionManager;
 	}
 
 	/**
@@ -104,10 +111,12 @@ class ToolbarBuilder {
 	 *
 	 * @return PageActionMenuEntry An edit page actions menu entry
 	 * @throws MWException
+	 * @throws \Exception
 	 */
 	protected function createEditPageAction() {
 		$title = $this->title;
 		$user = $this->user;
+		$pm = $this->permissionsManager;
 
 		$editArgs = [ 'action' => 'edit' ];
 		if ( $title->isWikitextPage() ) {
@@ -115,9 +124,15 @@ class ToolbarBuilder {
 			// Full wikitext editing is hard on mobile devices.
 			$editArgs['section'] = SkinMinerva::LEAD_SECTION_NUMBER;
 		}
-		$userQuickEditCheck = $title->quickUserCan( 'edit', $user )
-							  && ( $title->exists() || $title->quickUserCan( 'create', $user ) );
-		$userBlockInfo = $user->getId() == 0 ? false : $user->isBlockedFrom( $title, true );
+
+		$userQuickEditCheck =
+			$pm->userCan( 'edit', $user, $title, PermissionManager::RIGOR_QUICK ) &&
+			(
+				$title->exists() ||
+				$pm->userCan( 'create', $user, $title, PermissionManager::RIGOR_QUICK )
+			);
+
+		$userBlockInfo = $user->isAnon() ? false : $pm->isBlockedFrom( $user, $title, true );
 		$userCanEdit = $userQuickEditCheck && !$userBlockInfo;
 
 		$entry = new PageActionMenuEntry(