Merge "Selenium: replace UserLoginPage with BlankPage where possible"

[lhc/web/wiklou.git] / includes / specials / SpecialUncategorizedpages.php

diff --git a/includes/specials/SpecialUncategorizedpages.php b/includes/specials/SpecialUncategorizedpages.php
index 8251d5b..ab83af1 100644 (file)
--- a/includes/specials/SpecialUncategorizedpages.php
+++ b/includes/specials/SpecialUncategorizedpages.php
@@ -21,6 +21,8 @@
  * @ingroup SpecialPage
  */
 
+use MediaWiki\MediaWikiServices;
+
 /**
  * A special page looking for page without any category.
  *
@@ -28,6 +30,7 @@
  * @todo FIXME: Make $requestedNamespace selectable, unify all subclasses into one
  */
 class UncategorizedPagesPage extends PageQueryPage {
+       /** @var int|false */
        protected $requestedNamespace = false;
 
        function __construct( $name = 'Uncategorizedpages' ) {
@@ -47,36 +50,40 @@ class UncategorizedPagesPage extends PageQueryPage {
        }
 
        function getQueryInfo() {
-               return array(
-                       'tables' => array( 'page', 'categorylinks' ),
-                       'fields' => array(
+               return [
+                       'tables' => [ 'page', 'categorylinks' ],
+                       'fields' => [
                                'namespace' => 'page_namespace',
                                'title' => 'page_title',
                                'value' => 'page_title'
-                       ),
+                       ],
                        // default for page_namespace is all content namespaces (if requestedNamespace is false)
                        // otherwise, page_namespace is requestedNamespace
-                       'conds' => array(
+                       'conds' => [
                                'cl_from IS NULL',
                                'page_namespace' => $this->requestedNamespace !== false
                                                ? $this->requestedNamespace
-                                               : MWNamespace::getContentNamespaces(),
+                                               : MediaWikiServices::getInstance()->getNamespaceInfo()->
+                                                       getContentNamespaces(),
                                'page_is_redirect' => 0
-                       ),
-                       'join_conds' => array(
-                               'categorylinks' => array( 'LEFT JOIN', 'cl_from = page_id' )
-                       )
-               );
+                       ],
+                       'join_conds' => [
+                               'categorylinks' => [ 'LEFT JOIN', 'cl_from = page_id' ]
+                       ]
+               ];
        }
 
        function getOrderFields() {
                // For some crazy reason ordering by a constant
                // causes a filesort
-               if ( $this->requestedNamespace === false && count( MWNamespace::getContentNamespaces() ) > 1 ) {
-                       return array( 'page_namespace', 'page_title' );
+               if ( $this->requestedNamespace === false &&
+                       count( MediaWikiServices::getInstance()->getNamespaceInfo()->
+                               getContentNamespaces() ) > 1
+               ) {
+                       return [ 'page_namespace', 'page_title' ];
                }
 
-               return array( 'page_title' );
+               return [ 'page_title' ];
        }
 
        protected function getGroupName() {