Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

WikiPage::updateRevisionOn - replace uses, hard deprecate Revision use

Browse source 
See codesearch - only deployed call outside of core is in flaggedrevs,
and already passes a RevisionRecord:
https://codesearch.wmflabs.org/deployed/?q=-%3EupdateRevisionOn%5C(&i=nope&files=&repos=

Also fixed a use of Revision::newFromId in orphans.php

Bug: T249561
Bug: T249021
Change-Id: I5933a278de8645b7005c11026c87ae27c0373770
This commit is contained in:
DannyS712 2020-04-24 00:55:09 +00:00
parent bb15823bbb
commit 8a88d51536
9 changed files with 35 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
includes/MovePage.php
View file

@ -862,9 +862,10 @@ class MovePage {
$this->oldTitle->resetArticleID( 0 ); // 0 == non existing
$newpage->loadPageData( WikiPage::READ_LOCKING ); // T48397
$nullRevisionObj = new Revision( $nullRevision );
$newpage->updateRevisionOn( $dbw, $nullRevisionObj );
$newpage->updateRevisionOn( $dbw, $nullRevision );
// TODO cleanup hooks and use of $nullRevisionObj
$nullRevisionObj = new Revision( $nullRevision );
$fakeTags = [];
Hooks::run( 'NewRevisionFromEditComplete',
[ $newpage, $nullRevisionObj, $nullRevision->getParentId(), $user, &$fakeTags ] );
@ -889,7 +890,11 @@ class MovePage {
'comment' => $comment,
'content' => $redirectContent ] );
$redirectRevId = $redirectRevision->insertOn( $dbw );
$redirectArticle->updateRevisionOn( $dbw, $redirectRevision, 0 );
$redirectArticle->updateRevisionOn(
$dbw,
$redirectRevision->getRevisionRecord(),
0
);
$fakeTags = [];
Hooks::run( 'NewRevisionFromEditComplete',

8
includes/Storage/PageUpdater.php
View file

@ -1025,16 +1025,16 @@ class PageUpdater {
// Save revision content and meta-data
$newRevisionRecord = $this->revisionStore->insertRevisionOn( $newRevisionRecord, $dbw );
$newLegacyRevision = new Revision( $newRevisionRecord );
// Update page_latest and friends to reflect the new revision
// TODO: move to storage service
$wasRedirect = $this->derivedDataUpdater->wasRedirect();
if ( !$wikiPage->updateRevisionOn( $dbw, $newLegacyRevision, null, $wasRedirect ) ) {
if ( !$wikiPage->updateRevisionOn( $dbw, $newRevisionRecord, null, $wasRedirect ) ) {
throw new PageUpdateException( "Failed to update page row to use new revision." );
}
// TODO: replace legacy hook!
$newLegacyRevision = new Revision( $newRevisionRecord );
$tags = $this->computeEffectiveTags( $flags );
Hooks::run(
'NewRevisionFromEditComplete',
@ -1160,15 +1160,15 @@ class PageUpdater {
// Save the revision text...
$newRevisionRecord = $this->revisionStore->insertRevisionOn( $newRevisionRecord, $dbw );
$newLegacyRevision = new Revision( $newRevisionRecord );
// Update the page record with revision data
// TODO: move to storage service
if ( !$wikiPage->updateRevisionOn( $dbw, $newLegacyRevision, 0 ) ) {
if ( !$wikiPage->updateRevisionOn( $dbw, $newRevisionRecord, 0 ) ) {
throw new PageUpdateException( "Failed to update page row to use new revision." );
}
// TODO: replace legacy hook!
$newLegacyRevision = new Revision( $newRevisionRecord );
$tags = $this->computeEffectiveTags( $flags );
Hooks::run(
'NewRevisionFromEditComplete',

3
includes/filerepo/file/LocalFile.php
View file

@ -1646,7 +1646,6 @@ class LocalFile extends File {
if ( $nullRevRecord ) {
$inserted = $revStore->insertRevisionOn( $nullRevRecord, $dbw );
// TODO WikiPage::updateRevisionOn should accept a RevisionRecord
// TODO replace hook
$nullRevision = new Revision( $inserted );
Hooks::run(
@ -1659,7 +1658,7 @@ class LocalFile extends File {
&$tags
]
);
$wikiPage->updateRevisionOn( $dbw, $nullRevision );
$wikiPage->updateRevisionOn( $dbw, $inserted );
// Associate null revision id
$logEntry->setAssociatedRevId( $inserted->getId() );
}

10
includes/page/WikiPage.php
View file

@ -1379,7 +1379,7 @@ class WikiPage implements Page, IDBAccessObject {
*
* @param IDatabase $dbw
* @param Revision|RevisionRecord $revision For ID number, and text used to set
* length and redirect status fields
* length and redirect status fields. Passing a Revision is deprecated since 1.35
* @param int|null $lastRevision If given, will not overwrite the page field
* when different from the currently set value.
* Giving 0 indicates the new page flag should be set on.
@ -1402,6 +1402,7 @@ class WikiPage implements Page, IDBAccessObject {
}
if ( $revision instanceof Revision ) {
wfDeprecated( __METHOD__ . ' with a Revision object', '1.35' );
$revision = $revision->getRevisionRecord();
}
@ -1525,7 +1526,12 @@ class WikiPage implements Page, IDBAccessObject {
$lastRevIsRedirect = null;
}
$ret = $this->updateRevisionOn( $dbw, $revision, $prev, $lastRevIsRedirect );
$ret = $this->updateRevisionOn(
$dbw,
$revision->getRevisionRecord(),
$prev,
$lastRevIsRedirect
);
return $ret;
}

8
includes/specials/helpers/ImportReporter.php
View file

@ -148,13 +148,13 @@ class ImportReporter extends ContextSource {
$inserted = $revStore->insertRevisionOn( $nullRevRecord, $dbw );
$nullRevId = $inserted->getId();
$page = WikiPage::factory( $title );
// Update page record
// TODO WikiPage::updateRevisionOn should accept RevisionRecord
$nullRevision = new Revision( $inserted );
$page->updateRevisionOn( $dbw, $nullRevision );
$fakeTags = [];
$page->updateRevisionOn( $dbw, $inserted );
// TODO replace hook
$fakeTags = [];
$nullRevision = new Revision( $inserted );
Hooks::run(
'NewRevisionFromEditComplete',
[ $page, $nullRevision, $latest, $this->getUser(), &$fakeTags ]

7
maintenance/attachLatest.php
View file

@ -81,14 +81,13 @@ class AttachLatest extends Maintenance {
"$dbDomain $pageId [[$name]] latest time $latestTime, can't find revision id\n"
);
continue;
} else {
$revision = new Revision( $revRecord );
}
$id = $revision->getId();
$id = $revRecord->getId();
$this->output( "$dbDomain $pageId [[$name]] latest time $latestTime, rev id $id\n" );
if ( $this->hasOption( 'fix' ) ) {
$page = WikiPage::factory( $title );
$page->updateRevisionOn( $dbw, $revision );
$page->updateRevisionOn( $dbw, $revRecord );
$lbFactory->waitForReplication();
}
$n++;

3
maintenance/orphans.php
View file

@ -157,6 +157,7 @@ class Orphans extends Maintenance {
FROM $page LEFT JOIN $revision ON page_latest=rev_id
" );
$found = 0;
$revLookup = MediaWikiServices::getInstance()->getRevisionLookup();
foreach ( $result as $row ) {
$result2 = $dbw->query( "
SELECT MAX(rev_timestamp) as max_timestamp
@ -185,7 +186,7 @@ class Orphans extends Maintenance {
'rev_page' => $row->page_id,
'rev_timestamp' => $row2->max_timestamp ] );
$this->output( "... updating to revision $maxId\n" );
$maxRev = Revision::newFromId( $maxId );
$maxRev = $revLookup->getRevisionById( $maxId );
$title = Title::makeTitle( $row->page_namespace, $row->page_title );
$article = WikiPage::factory( $title );
$article->updateRevisionOn( $dbw, $maxRev );

2
tests/phpunit/includes/Revision/RevisionStoreDbTestBase.php
View file

@ -616,7 +616,7 @@ abstract class RevisionStoreDbTestBase extends MediaWikiTestCase {
$dbw = wfGetDB( DB_MASTER );
$baseRev = $store->insertRevisionOn( $baseRev, $dbw );
$page->updateRevisionOn( $dbw, new Revision( $baseRev ), $page->getLatest() );
$page->updateRevisionOn( $dbw, $baseRev, $page->getLatest() );
$record = $store->newNullRevision(
wfGetDB( DB_MASTER ),

4
tests/phpunit/includes/page/WikiPageDbTest.php
View file

@ -1896,6 +1896,8 @@ more stuff
*/
public function testUpdateRevisionOn_existingPage() {
$this->hideDeprecated( 'WikiPage::getRevision' );
$this->hideDeprecated( 'WikiPage::updateRevisionOn with a Revision object' );
$user = $this->getTestSysop()->getUser();
$page = $this->createPage( __METHOD__, 'StartText' );
@ -1926,6 +1928,8 @@ more stuff
* @covers WikiPage::updateRevisionOn
*/
public function testUpdateRevisionOn_NonExistingPage() {
$this->hideDeprecated( 'WikiPage::updateRevisionOn with a Revision object' );
$user = $this->getTestSysop()->getUser();
$page = $this->createPage( __METHOD__, 'StartText' );
$page->doDeleteArticleReal( 'reason', $user );