X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Fapi%2FApiQueryRevisionsBase.php;h=3d0a0fba625c9553acff581cf856fbd8a5747ec3;hb=2fb8d2e382f1c4fb714d5b9093d03f4ad6663845;hp=600c89e2cfaa675f03795ebdf00f11aec6d27b90;hpb=d9327f9a57213488ed35b6a5dd532feb4f70125f;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/api/ApiQueryRevisionsBase.php b/includes/api/ApiQueryRevisionsBase.php
index 600c89e2cf..3d0a0fba62 100644
--- a/includes/api/ApiQueryRevisionsBase.php
+++ b/includes/api/ApiQueryRevisionsBase.php
@@ -20,9 +20,9 @@
  * @file
  */
 
-use MediaWiki\Storage\RevisionAccessException;
-use MediaWiki\Storage\RevisionRecord;
-use MediaWiki\Storage\SlotRecord;
+use MediaWiki\Revision\RevisionAccessException;
+use MediaWiki\Revision\RevisionRecord;
+use MediaWiki\Revision\SlotRecord;
 use MediaWiki\MediaWikiServices;
 
 /**
@@ -169,11 +169,7 @@ abstract class ApiQueryRevisionsBase extends ApiQueryGeneratorBase {
 					$this->limit = 1;
 				}
 			}
-			if ( isset( $params['section'] ) ) {
-				$this->section = $params['section'];
-			} else {
-				$this->section = false;
-			}
+			$this->section = $params['section'] ?? false;
 		}
 
 		$userMax = $this->parseContent ? 1 : ( $smallLimit ? ApiBase::LIMIT_SML1 : ApiBase::LIMIT_BIG1 );
@@ -307,7 +303,7 @@ abstract class ApiQueryRevisionsBase extends ApiQueryGeneratorBase {
 			}
 			if ( $this->slotRoles === null ) {
 				try {
-					$slot = $revision->getSlot( 'main', RevisionRecord::RAW );
+					$slot = $revision->getSlot( SlotRecord::MAIN, RevisionRecord::RAW );
 				} catch ( RevisionAccessException $e ) {
 					// Back compat: If there's no slot, there's no content, so set 'textmissing'
 					// @todo: Gergő says to mention T198099 as a "todo" here.
@@ -620,10 +616,7 @@ abstract class ApiQueryRevisionsBase extends ApiQueryGeneratorBase {
 	}
 
 	public function getAllowedParams() {
-		$slotRoles = MediaWikiServices::getInstance()->getSlotRoleStore()->getMap();
-		if ( !in_array( 'main', $slotRoles, true ) ) {
-			$slotRoles[] = 'main';
-		}
+		$slotRoles = MediaWikiServices::getInstance()->getSlotRoleRegistry()->getKnownRoles();
 		sort( $slotRoles, SORT_STRING );
 
 		return [