From: Derick Alangi Date: Sat, 20 Jul 2019 08:47:52 +0000 (+0100) Subject: maintenance: Avoid usage of deprecated Revision::* constants X-Git-Tag: 1.34.0-rc.0~931^2 X-Git-Url: https://git.cyclocoop.org/%27.WWW_URL.%27admin/?a=commitdiff_plain;ds=sidebyside;h=e16eec8cafd0586be01aa4f0c38c7fb23f96a331;p=lhc%2Fweb%2Fwiklou.git maintenance: Avoid usage of deprecated Revision::* constants Update deprecated Revision::* constants to use RevisionRecord::* equivalents. Change-Id: Icae1ebb088e4efadbc7c2806127a2073d337fa05 --- diff --git a/maintenance/cleanupSpam.php b/maintenance/cleanupSpam.php index e1ea247377..13f3cfad05 100644 --- a/maintenance/cleanupSpam.php +++ b/maintenance/cleanupSpam.php @@ -21,6 +21,8 @@ * @ingroup Maintenance */ +use MediaWiki\Storage\RevisionRecord; + require_once __DIR__ . '/Maintenance.php'; /** @@ -136,8 +138,8 @@ class CleanupSpam extends Maintenance { $rev = Revision::newFromTitle( $title ); $currentRevId = $rev->getId(); - while ( $rev && ( $rev->isDeleted( Revision::DELETED_TEXT ) - || LinkFilter::matchEntry( $rev->getContent( Revision::RAW ), $domain, $protocol ) ) + while ( $rev && ( $rev->isDeleted( RevisionRecord::DELETED_TEXT ) + || LinkFilter::matchEntry( $rev->getContent( RevisionRecord::RAW ), $domain, $protocol ) ) ) { $rev = $rev->getPrevious(); } @@ -152,7 +154,7 @@ class CleanupSpam extends Maintenance { $page = WikiPage::factory( $title ); if ( $rev ) { // Revert to this revision - $content = $rev->getContent( Revision::RAW ); + $content = $rev->getContent( RevisionRecord::RAW ); $this->output( "reverting\n" ); $page->doEditContent( diff --git a/maintenance/fixDefaultJsonContentPages.php b/maintenance/fixDefaultJsonContentPages.php index cb4eddf521..d3d76acf49 100644 --- a/maintenance/fixDefaultJsonContentPages.php +++ b/maintenance/fixDefaultJsonContentPages.php @@ -21,6 +21,8 @@ * @ingroup Maintenance */ +use MediaWiki\Revision\RevisionRecord; + require_once __DIR__ . '/Maintenance.php'; /** @@ -79,7 +81,7 @@ class FixDefaultJsonContentPages extends LoggedUpdateMaintenance { $title = Title::makeTitle( $row->page_namespace, $row->page_title ); $this->output( "Processing {$title} ({$row->page_id})...\n" ); $rev = Revision::newFromTitle( $title ); - $content = $rev->getContent( Revision::RAW ); + $content = $rev->getContent( RevisionRecord::RAW ); $dbw = $this->getDB( DB_MASTER ); if ( $content instanceof JsonContent ) { if ( $content->isValid() ) { diff --git a/maintenance/getText.php b/maintenance/getText.php index 2e8cf7705a..ca67c833df 100644 --- a/maintenance/getText.php +++ b/maintenance/getText.php @@ -23,6 +23,8 @@ * @ingroup Maintenance */ +use MediaWiki\Storage\RevisionRecord; + require_once __DIR__ . '/Maintenance.php'; /** @@ -51,8 +53,8 @@ class GetTextMaint extends Maintenance { $this->fatalError( "Page $titleText does not exist.\n" ); } $content = $rev->getContent( $this->hasOption( 'show-private' ) - ? Revision::RAW - : Revision::FOR_PUBLIC ); + ? RevisionRecord::RAW + : RevisionRecord::FOR_PUBLIC ); if ( $content === false ) { $titleText = $title->getPrefixedText(); diff --git a/maintenance/namespaceDupes.php b/maintenance/namespaceDupes.php index 333b8b95de..5024395f13 100644 --- a/maintenance/namespaceDupes.php +++ b/maintenance/namespaceDupes.php @@ -28,6 +28,7 @@ require_once __DIR__ . '/Maintenance.php'; use MediaWiki\Linker\LinkTarget; use MediaWiki\MediaWikiServices; +use MediaWiki\Storage\RevisionRecord; use Wikimedia\Rdbms\IResultWrapper; use Wikimedia\Rdbms\IMaintainableDatabase; @@ -558,8 +559,12 @@ class NamespaceDupes extends Maintenance { * @return bool */ private function canMerge( $id, LinkTarget $linkTarget, &$logStatus ) { - $latestDest = Revision::newFromTitle( $linkTarget, 0, Revision::READ_LATEST ); - $latestSource = Revision::newFromPageId( $id, 0, Revision::READ_LATEST ); + $latestDest = Revision::newFromTitle( + $linkTarget, 0, RevisionRecord::READ_LATEST + ); + $latestSource = Revision::newFromPageId( + $id, 0, RevisionRecord::READ_LATEST + ); if ( $latestSource->getTimestamp() > $latestDest->getTimestamp() ) { $logStatus = 'cannot merge since source is later'; return false; diff --git a/maintenance/populateRevisionLength.php b/maintenance/populateRevisionLength.php index dcb89d193f..e48b6ab0a7 100644 --- a/maintenance/populateRevisionLength.php +++ b/maintenance/populateRevisionLength.php @@ -21,6 +21,7 @@ * @ingroup Maintenance */ +use MediaWiki\Storage\RevisionRecord; use Wikimedia\Rdbms\IDatabase; require_once __DIR__ . '/Maintenance.php'; @@ -144,7 +145,7 @@ class PopulateRevisionLength extends LoggedUpdateMaintenance { ? Revision::newFromArchiveRow( $row ) : new Revision( $row ); - $content = $rev->getContent( Revision::RAW ); + $content = $rev->getContent( RevisionRecord::RAW ); if ( !$content ) { # This should not happen, but sometimes does (T22757) $id = $row->$idCol; diff --git a/maintenance/preprocessDump.php b/maintenance/preprocessDump.php index a62e0196a5..b9e084eab1 100644 --- a/maintenance/preprocessDump.php +++ b/maintenance/preprocessDump.php @@ -26,6 +26,7 @@ */ use MediaWiki\MediaWikiServices; +use MediaWiki\Storage\RevisionRecord; require_once __DIR__ . '/dumpIterator.php'; @@ -81,7 +82,7 @@ class PreprocessDump extends DumpIterator { * @param Revision $rev */ public function processRevision( $rev ) { - $content = $rev->getContent( Revision::RAW ); + $content = $rev->getContent( RevisionRecord::RAW ); if ( $content->getModel() !== CONTENT_MODEL_WIKITEXT ) { return; diff --git a/maintenance/refreshLinks.php b/maintenance/refreshLinks.php index 8306243c08..3f48abbb8e 100644 --- a/maintenance/refreshLinks.php +++ b/maintenance/refreshLinks.php @@ -22,6 +22,7 @@ */ use MediaWiki\MediaWikiServices; +use MediaWiki\Storage\RevisionRecord; use Wikimedia\Rdbms\IDatabase; require_once __DIR__ . '/Maintenance.php'; @@ -231,7 +232,7 @@ class RefreshLinks extends Maintenance { } $rt = null; - $content = $page->getContent( Revision::RAW ); + $content = $page->getContent( RevisionRecord::RAW ); if ( $content !== null ) { $rt = $content->getUltimateRedirectTarget(); } diff --git a/maintenance/storage/checkStorage.php b/maintenance/storage/checkStorage.php index c2fa687432..d8a8808cc3 100644 --- a/maintenance/storage/checkStorage.php +++ b/maintenance/storage/checkStorage.php @@ -22,6 +22,7 @@ */ use MediaWiki\MediaWikiServices; +use MediaWiki\Revision\RevisionRecord; use MediaWiki\Shell\Shell; if ( !defined( 'MEDIAWIKI' ) ) { @@ -523,7 +524,7 @@ class CheckStorage { function importRevision( &$revision, &$importer ) { $id = $revision->getID(); - $content = $revision->getContent( Revision::RAW ); + $content = $revision->getContent( RevisionRecord::RAW ); $id = $id ?: ''; if ( $content === null ) { diff --git a/maintenance/userDupes.inc b/maintenance/userDupes.inc index f759c13bac..5f7f9d5e43 100644 --- a/maintenance/userDupes.inc +++ b/maintenance/userDupes.inc @@ -45,7 +45,6 @@ class UserDupes { private $outputCallback; /** - * UserDupes constructor. * @param IMaintainableDatabase &$database * @param callback $outputCallback */ diff --git a/maintenance/view.php b/maintenance/view.php index 671369aff9..8683eed5c5 100644 --- a/maintenance/view.php +++ b/maintenance/view.php @@ -21,6 +21,8 @@ * @ingroup Maintenance */ +use MediaWiki\Revision\RevisionRecord; + require_once __DIR__ . '/Maintenance.php'; /** @@ -43,7 +45,7 @@ class ViewCLI extends Maintenance { $page = WikiPage::factory( $title ); - $content = $page->getContent( Revision::RAW ); + $content = $page->getContent( RevisionRecord::RAW ); if ( !$content ) { $this->fatalError( "Page has no content" ); }