X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=blobdiff_plain;f=includes%2Fspecialpage%2FChangesListSpecialPage.php;h=a9debb3b89b83a9e6dddc90f0c321e1d77bec37a;hp=9e7e21d06d9d64373361a1e4efe8b19a8cd78c61;hb=d029197c7c5b083edef20fa79cc3e6d58e161f72;hpb=8b9143e121236281b9850435131234f2d4dc3e34

diff --git a/includes/specialpage/ChangesListSpecialPage.php b/includes/specialpage/ChangesListSpecialPage.php
index 9e7e21d06d..a9debb3b89 100644
--- a/includes/specialpage/ChangesListSpecialPage.php
+++ b/includes/specialpage/ChangesListSpecialPage.php
@@ -20,12 +20,13 @@
  * @file
  * @ingroup SpecialPage
  */
+
 use MediaWiki\Logger\LoggerFactory;
+use MediaWiki\MediaWikiServices;
 use Wikimedia\Rdbms\DBQueryTimeoutError;
 use Wikimedia\Rdbms\IResultWrapper;
 use Wikimedia\Rdbms\FakeResultWrapper;
 use Wikimedia\Rdbms\IDatabase;
-use MediaWiki\MediaWikiServices;
 
 /**
  * Special page which uses a ChangesList to show query results.
@@ -158,7 +159,7 @@ abstract class ChangesListSpecialPage extends SpecialPage {
 
 			[
 				'name' => 'userExpLevel',
-				'title' => 'rcfilters-filtergroup-userExpLevel',
+				'title' => 'rcfilters-filtergroup-user-experience-level',
 				'class' => ChangesListStringOptionsFilterGroup::class,
 				'isFullCoverage' => true,
 				'filters' => [
@@ -353,7 +354,7 @@ abstract class ChangesListSpecialPage extends SpecialPage {
 
 			[
 				'name' => 'lastRevision',
-				'title' => 'rcfilters-filtergroup-lastRevision',
+				'title' => 'rcfilters-filtergroup-lastrevision',
 				'class' => ChangesListBooleanFilterGroup::class,
 				'priority' => -7,
 				'filters' => [
@@ -1052,6 +1053,7 @@ abstract class ChangesListSpecialPage extends SpecialPage {
 	 *
 	 * There is light processing to simplify core maintenance.
 	 * @param array $definition
+	 * @phan-param array<int,array{class:string}> $definition
 	 */
 	protected function registerFiltersFromDefinitions( array $definition ) {
 		$autoFillPriority = -1;
@@ -1072,7 +1074,6 @@ abstract class ChangesListSpecialPage extends SpecialPage {
 				$filterDefinition = $this->transformFilterDefinition( $filterDefinition );
 			}
 
-			// @phan-suppress-next-line PhanNonClassMethodCall
 			$this->registerFilterGroup( new $className( $groupDefinition ) );
 		}
 	}
@@ -1189,6 +1190,7 @@ abstract class ChangesListSpecialPage extends SpecialPage {
 	// to include data on filters that use the unstructured UI.  messageKeys is a
 	// special top-level value, with the value being an array of the message keys to
 	// send to the client.
+
 	/**
 	 * Gets structured filter information needed by JS
 	 *
@@ -1451,7 +1453,8 @@ abstract class ChangesListSpecialPage extends SpecialPage {
 			if ( $opts[ 'associated' ] ) {
 				$associatedNamespaces = array_map(
 					function ( $ns ) {
-						return MWNamespace::getAssociated( $ns );
+						return MediaWikiServices::getInstance()->getNamespaceInfo()->
+							getAssociated( $ns );
 					},
 					$namespaces
 				);
@@ -1847,21 +1850,21 @@ abstract class ChangesListSpecialPage extends SpecialPage {
 			return true;
 		}
 
-		return static::checkStructuredFilterUiEnabled(
-			$this->getConfig(),
-			$this->getUser()
-		);
+		return static::checkStructuredFilterUiEnabled( $this->getUser() );
 	}
 
 	/**
 	 * Static method to check whether StructuredFilter UI is enabled for the given user
 	 *
 	 * @since 1.31
-	 * @param Config $config
 	 * @param User $user
 	 * @return bool
 	 */
-	public static function checkStructuredFilterUiEnabled( Config $config, User $user ) {
+	public static function checkStructuredFilterUiEnabled( $user ) {
+		if ( $user instanceof Config ) {
+			wfDeprecated( __METHOD__ . ' with Config argument', '1.34' );
+			$user = func_get_arg( 1 );
+		}
 		return !$user->getOption( 'rcenhancedfilters-disable' );
 	}