Merge "Revert "Add AvailableRightsTest for User::getAllRights completeness""

diff --git a/includes/User.php b/includes/User.php
index 961c510..c2db67a 100644 (file)
--- a/includes/User.php
+++ b/includes/User.php
@@ -4399,7 +4399,7 @@ class User implements IDBAccessObject {
 
        /**
         * Get a list of all available permissions.
-        * @return string[] Array of permission names
+        * @return array Array of permission names
         */
        public static function getAllRights() {
                if ( self::$mAllRights === false ) {

diff --git a/tests/phpunit/structure/AvailableRightsTest.php b/tests/phpunit/structure/AvailableRightsTest.php
deleted file mode 100644 (file)
index 9737e82..0000000
--- a/tests/phpunit/structure/AvailableRightsTest.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-
-/**
- * Try to make sure that extensions register all rights in $wgAvailableRights
- * or via the 'UserGetAllRights' hook.
- *
- * @author Marius Hoch < hoo@online.de >
- */
-class AvailableRightsTest extends PHPUnit_Framework_TestCase {
-
-       /**
-        * Returns all rights that should be in $wgAvailableRights + all rights
-        * registered via the 'UserGetAllRights' hook + all "core" rights.
-        *
-        * @return string[]
-        */
-       private function getAllVisibleRights() {
-               global $wgGroupPermissions, $wgRevokePermissions;
-
-               $rights = User::getAllRights();
-
-               foreach( $wgGroupPermissions as $permissions ) {
-                       $rights = array_merge( $rights, array_keys( $permissions ) );
-               }
-
-               foreach( $wgRevokePermissions as $permissions ) {
-                       $rights = array_merge( $rights, array_keys( $permissions ) );
-               }
-
-               $rights = array_unique( $rights );
-               sort( $rights );
-
-               return $rights;
-       }
-
-       public function testAvailableRights() {
-               $missingRights = array_diff( $this->getAllVisibleRights(), User::getAllRights() );
-
-               $this->assertEquals(
-                       array(),
-                       array_values( $missingRights ), // Re-Index to produce nicer output, keys are meaningless
-                       'Additional user rights need to be added to $wgAvailableRights or via the "UserGetAllRights" hook'
-               );
-       }
-}