Merge "FauxRequest: don’t override getValues()"

[lhc/web/wiklou.git] / includes / actions / SpecialPageAction.php

diff --git a/includes/actions/SpecialPageAction.php b/includes/actions/SpecialPageAction.php
index 29a494b..56be456 100644 (file)
--- a/includes/actions/SpecialPageAction.php
+++ b/includes/actions/SpecialPageAction.php
@@ -18,6 +18,8 @@
  * @ingroup Actions
  */
 
+use MediaWiki\MediaWikiServices;
+
 /**
  * An action that just passes the request to the relevant special page
  *
@@ -28,11 +30,14 @@ class SpecialPageAction extends FormlessAction {
        /**
         * @var array A mapping of action names to special page names.
         */
-       public static $actionToSpecialPageMapping = array(
+       public static $actionToSpecialPageMapping = [
                'revisiondelete' => 'Revisiondelete',
                'editchangetags' => 'EditTags',
-       );
+       ];
 
+       /**
+        * @inheritDoc
+        */
        public function getName() {
                $request = $this->getRequest();
                $actionName = $request->getVal( 'action', 'view' );
@@ -92,6 +97,7 @@ class SpecialPageAction extends FormlessAction {
                }
 
                // map actions to (whitelisted) special pages
-               return SpecialPageFactory::getPage( self::$actionToSpecialPageMapping[$action] );
+               return MediaWikiServices::getInstance()->getSpecialPageFactory()->
+                       getPage( self::$actionToSpecialPageMapping[$action] );
        }
 }