Fix flaky test BlockListPagerTest::testFormatValue

[lhc/web/wiklou.git] / includes / specials / pagers / BlockListPager.php

diff --git a/includes/specials/pagers/BlockListPager.php b/includes/specials/pagers/BlockListPager.php
index 205ffbf..2b8d1d5 100644 (file)
--- a/includes/specials/pagers/BlockListPager.php
+++ b/includes/specials/pagers/BlockListPager.php
@@ -24,13 +24,14 @@
  */
 use MediaWiki\Block\BlockRestriction;
 use MediaWiki\Block\Restriction\Restriction;
+use MediaWiki\Block\Restriction\PageRestriction;
+use MediaWiki\Block\Restriction\NamespaceRestriction;
 use MediaWiki\MediaWikiServices;
 use Wikimedia\Rdbms\IResultWrapper;
 
 class BlockListPager extends TablePager {
 
        protected $conds;
-       protected $page;
 
        /**
         * Array of restrictions.
@@ -44,7 +45,6 @@ class BlockListPager extends TablePager {
         * @param array $conds
         */
        public function __construct( $page, $conds ) {
-               $this->page = $page;
                $this->conds = $conds;
                $this->mDefaultDirection = IndexPager::DIR_DESCENDING;
                parent::__construct( $page->getContext() );
@@ -161,7 +161,7 @@ class BlockListPager extends TablePager {
                                        $formatted .= '<br />' . $this->msg(
                                                'ipb-blocklist-duration-left',
                                                $language->formatDuration(
-                                                       $timestamp->getTimestamp() - time(),
+                                                       $timestamp->getTimestamp() - MWTimestamp::time(),
                                                        // reasonable output
                                                        [
                                                                'minutes',
@@ -198,7 +198,7 @@ class BlockListPager extends TablePager {
                                }
 
                                if ( !$row->ipb_sitewide && $this->restrictions ) {
-                                       $list = $this->getRestrictionListHTML( $this->restrictions, $row );
+                                       $list = $this->getRestrictionListHTML( $row );
                                        if ( $list ) {
                                                $properties[] = htmlspecialchars( $msg['blocklist-editing'] ) . $list;
                                        }
@@ -246,41 +246,71 @@ class BlockListPager extends TablePager {
        /**
         * Get Restriction List HTML
         *
-        * @param Restriction[] $restrictions
         * @param stdClass $row
         *
         * @return string
         */
-       private static function getRestrictionListHTML(
-               array $restrictions,
-               stdClass $row
-       ) {
+       private function getRestrictionListHTML( stdClass $row ) {
                $items = [];
 
-               foreach ( $restrictions as $restriction ) {
+               foreach ( $this->restrictions as $restriction ) {
                        if ( $restriction->getBlockId() !== (int)$row->ipb_id ) {
                                continue;
                        }
 
-                       if ( $restriction->getType() !== 'page' ) {
-                               continue;
+                       switch ( $restriction->getType() ) {
+                               case PageRestriction::TYPE:
+                                       if ( $restriction->getTitle() ) {
+                                               $items[$restriction->getType()][] = Html::rawElement(
+                                                       'li',
+                                                       [],
+                                                       Linker::link( $restriction->getTitle() )
+                                               );
+                                       }
+                                       break;
+                               case NamespaceRestriction::TYPE:
+                                       $text = $restriction->getValue() === NS_MAIN
+                                               ? $this->msg( 'blanknamespace' )
+                                               : $this->getLanguage()->getFormattedNsText(
+                                                       $restriction->getValue()
+                                               );
+                                       $items[$restriction->getType()][] = Html::rawElement(
+                                               'li',
+                                               [],
+                                               Linker::link(
+                                                       SpecialPage::getTitleValueFor( 'Allpages' ),
+                                                       $text,
+                                                       [],
+                                                       [
+                                                               'namespace' => $restriction->getValue()
+                                                       ]
+                                               )
+                                       );
+                                       break;
                        }
-
-                       $items[] = Html::rawElement(
-                               'li',
-                               [],
-                               Linker::link( $restriction->getTitle() )
-                       );
                }
 
                if ( empty( $items ) ) {
                        return '';
                }
 
+               $sets = [];
+               foreach ( $items as $key => $value ) {
+                       $sets[] = Html::rawElement(
+                               'li',
+                               [],
+                               $this->msg( 'blocklist-editing-' . $key ) . Html::rawElement(
+                                       'ul',
+                                       [],
+                                       implode( '', $value )
+                               )
+                       );
+               }
+
                return Html::rawElement(
                        'ul',
                        [],
-                       implode( '', $items )
+                       implode( '', $sets )
                );
        }