From: Petr Pchelko <ppchelko@wikimedia.org>
Date: Wed, 28 Aug 2019 17:31:34 +0000 (-0700)
Subject: Move User::getAllRights to PermissionManager.
X-Git-Tag: 1.34.0-rc.0~490^2
X-Git-Url: http://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=commitdiff_plain;h=49e2aec53ac9d0015dbfc6d14f0787c4e72a3605

Move User::getAllRights to PermissionManager.

Bug: T220191
Change-Id: I7f4bf7f6a85b01ffd7f9ea3991597f1bd40ab1f6
---

diff --git a/includes/api/ApiQueryAllUsers.php b/includes/api/ApiQueryAllUsers.php
index 023b88fea9..e0513e22d6 100644
--- a/includes/api/ApiQueryAllUsers.php
+++ b/includes/api/ApiQueryAllUsers.php
@@ -356,7 +356,7 @@ class ApiQueryAllUsers extends ApiQueryBase {
 				ApiBase::PARAM_ISMULTI => true,
 			],
 			'rights' => [
-				ApiBase::PARAM_TYPE => User::getAllRights(),
+				ApiBase::PARAM_TYPE => $this->getPermissionManager()->getAllPermissions(),
 				ApiBase::PARAM_ISMULTI => true,
 			],
 			'prop' => [
diff --git a/includes/api/ApiQueryContributors.php b/includes/api/ApiQueryContributors.php
index fd2d199b80..a1945c4a81 100644
--- a/includes/api/ApiQueryContributors.php
+++ b/includes/api/ApiQueryContributors.php
@@ -231,7 +231,7 @@ class ApiQueryContributors extends ApiQueryBase {
 
 	public function getAllowedParams() {
 		$userGroups = User::getAllGroups();
-		$userRights = User::getAllRights();
+		$userRights = $this->getPermissionManager()->getAllPermissions();
 
 		return [
 			'group' => [
diff --git a/includes/user/User.php b/includes/user/User.php
index 0553c923b8..b0ee5cbb44 100644
--- a/includes/user/User.php
+++ b/includes/user/User.php
@@ -4864,8 +4864,7 @@ class User implements IDBAccessObject, UserIdentity {
 	/**
 	 * Get a list of all available permissions.
 	 *
-	 * @deprecated since 1.34, use MediaWikiServices::getInstance()->getPermissionManager()
-	 *             ->getAllPermissions() instead
+	 * @deprecated since 1.34, use PermissionManager::getAllPermissions() instead
 	 *
 	 * @return string[] Array of permission names
 	 */
diff --git a/tests/phpunit/includes/Permissions/PermissionManagerTest.php b/tests/phpunit/includes/Permissions/PermissionManagerTest.php
index 44b7f67a31..3c22a23ce2 100644
--- a/tests/phpunit/includes/Permissions/PermissionManagerTest.php
+++ b/tests/phpunit/includes/Permissions/PermissionManagerTest.php
@@ -1866,6 +1866,22 @@ class PermissionManagerTest extends MediaWikiLangTestCase {
 			->getNamespaceRestrictionLevels( $ns, $user ) );
 	}
 
+	/**
+	 * @covers \MediaWiki\Permissions\PermissionManager::getAllPermissions
+	 */
+	public function testGetAllPermissions() {
+		$this->setMwGlobals( [
+			'wgAvailableRights' => [ 'test_right' ]
+		] );
+		$this->resetServices();
+		$this->assertContains(
+			'test_right',
+			MediaWikiServices::getInstance()
+				->getPermissionManager()
+				->getAllPermissions()
+		);
+	}
+
 	/**
 	 * @covers \MediaWiki\Permissions\PermissionManager::getRightsCacheKey
 	 * @throws \Exception
diff --git a/tests/phpunit/structure/AvailableRightsTest.php b/tests/phpunit/structure/AvailableRightsTest.php
index 2a6575a9ec..2037036600 100644
--- a/tests/phpunit/structure/AvailableRightsTest.php
+++ b/tests/phpunit/structure/AvailableRightsTest.php
@@ -1,5 +1,7 @@
 <?php
 
+use MediaWiki\MediaWikiServices;
+
 /**
  * Try to make sure that extensions register all rights in $wgAvailableRights
  * or via the 'UserGetAllRights' hook.
@@ -19,7 +21,7 @@ class AvailableRightsTest extends PHPUnit\Framework\TestCase {
 	private function getAllVisibleRights() {
 		global $wgGroupPermissions, $wgRevokePermissions;
 
-		$rights = User::getAllRights();
+		$rights = MediaWikiServices::getInstance()->getPermissionManager()->getAllPermissions();
 
 		foreach ( $wgGroupPermissions as $permissions ) {
 			$rights = array_merge( $rights, array_keys( $permissions ) );
@@ -38,7 +40,7 @@ class AvailableRightsTest extends PHPUnit\Framework\TestCase {
 	public function testAvailableRights() {
 		$missingRights = array_diff(
 			$this->getAllVisibleRights(),
-			User::getAllRights()
+			MediaWikiServices::getInstance()->getPermissionManager()->getAllPermissions()
 		);
 
 		$this->assertEquals(
@@ -76,7 +78,7 @@ class AvailableRightsTest extends PHPUnit\Framework\TestCase {
 	 */
 	private function checkMessagesExist( $prefix ) {
 		// Getting all user rights, for core: User::$mCoreRights, for extensions: $wgAvailableRights
-		$allRights = User::getAllRights();
+		$allRights = MediaWikiServices::getInstance()->getPermissionManager()->getAllPermissions();
 		$allMessageKeys = Language::getMessageKeysFor( 'en' );
 
 		$messagesToCheck = [];