Thiemo Kreuz (WMDE) has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/400588 )
Change subject: Start using RevisionRecord in favor of Revision in trivial cases
......................................................................
Start using RevisionRecord in favor of Revision in trivial cases
This patch picks a few very, very low hanging fruits to replace some of
the deprecation warnings related to the now deprecated Revision class.
Change-Id: I3c68ccd1117303cfac3d29f0f092284be457e12c
---
M lib/includes/Store/RedirectRevision.php
M repo/Wikibase.hooks.php
M repo/includes/Api/ResultBuilder.php
M repo/includes/Diff/EntityContentDiffView.php
M repo/tests/phpunit/includes/Api/SetClaimValueTest.php
5 files changed, 20 insertions(+), 13 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/88/400588/1
diff --git a/lib/includes/Store/RedirectRevision.php
b/lib/includes/Store/RedirectRevision.php
index 41dae74..63d8650 100644
--- a/lib/includes/Store/RedirectRevision.php
+++ b/lib/includes/Store/RedirectRevision.php
@@ -57,7 +57,7 @@
}
/**
- * @see Revision::getId
+ * @see RevisionRecord::getId
*
* @return int
*/
@@ -66,7 +66,7 @@
}
/**
- * @see Revision::getTimestamp
+ * @see RevisionRecord::getTimestamp
*
* @return string in MediaWiki format or an empty string
*/
diff --git a/repo/Wikibase.hooks.php b/repo/Wikibase.hooks.php
index ee2304b..79f7ddd 100644
--- a/repo/Wikibase.hooks.php
+++ b/repo/Wikibase.hooks.php
@@ -16,6 +16,7 @@
use IContextSource;
use LogEntry;
use MediaWiki\MediaWikiServices;
+use MediaWiki\Storage\RevisionRecord;
use MWException;
use MWExceptionHandler;
use OutputPage;
@@ -200,7 +201,10 @@
$entityContentFactory =
WikibaseRepo::getDefaultInstance()->getEntityContentFactory();
if ( $entityContentFactory->isEntityContentModel(
$wikiPage->getContent()->getModel() ) ) {
- self::notifyEntityStoreWatcherOnUpdate( $revision );
+ self::notifyEntityStoreWatcherOnUpdate(
+ $revision->getContent(),
+ $revision->getRevisionRecord()
+ );
$notifier =
WikibaseRepo::getDefaultInstance()->getChangeNotifier();
$parentId = $revision->getParentId();
@@ -222,9 +226,10 @@
}
}
- private static function notifyEntityStoreWatcherOnUpdate( Revision
$revision ) {
- /** @var EntityContent $content */
- $content = $revision->getContent();
+ private static function notifyEntityStoreWatcherOnUpdate(
+ EntityContent $content,
+ RevisionRecord $revision
+ ) {
$watcher =
WikibaseRepo::getDefaultInstance()->getEntityStoreWatcher();
// Notify storage/lookup services that the entity was updated.
Needed to track page-level changes.
@@ -410,7 +415,7 @@
if ( $entityContentFactory->isEntityContentModel(
$history->getTitle()->getContentModel() )
&& $wikiPage->getLatest() !== $rev->getId()
&& $rev->getTitle()->quickUserCan( 'edit',
$history->getUser() )
- && !$rev->isDeleted( Revision::DELETED_TEXT )
+ && !$rev->isDeleted( RevisionRecord::DELETED_TEXT )
) {
$linkRenderer =
MediaWikiServices::getInstance()->getLinkRenderer();
$link = $linkRenderer->makeKnownLink(
@@ -458,7 +463,7 @@
:
$skinTemplate->getRevisionId();
$rev = Revision::newFromId( $revid );
- if ( !$rev || $rev->isDeleted(
Revision::DELETED_TEXT ) ) {
+ if ( !$rev || $rev->isDeleted(
RevisionRecord::DELETED_TEXT ) ) {
return;
}
diff --git a/repo/includes/Api/ResultBuilder.php
b/repo/includes/Api/ResultBuilder.php
index 9f5e86e..cf01e2f 100644
--- a/repo/includes/Api/ResultBuilder.php
+++ b/repo/includes/Api/ResultBuilder.php
@@ -3,6 +3,7 @@
namespace Wikibase\Repo\Api;
use ApiResult;
+use MediaWiki\Storage\RevisionRecord;
use Revision;
use Serializers\Serializer;
use SiteLookup;
@@ -1078,7 +1079,7 @@
}
private function getRevisionId( $revision ) {
- if ( $revision instanceof Revision ) {
+ if ( $revision instanceof Revision || $revision instanceof
RevisionRecord ) {
$revisionId = $revision->getId();
} elseif ( $revision instanceof EntityRevision ) {
$revisionId = $revision->getRevisionId();
diff --git a/repo/includes/Diff/EntityContentDiffView.php
b/repo/includes/Diff/EntityContentDiffView.php
index 136f428..8928e24 100644
--- a/repo/includes/Diff/EntityContentDiffView.php
+++ b/repo/includes/Diff/EntityContentDiffView.php
@@ -8,6 +8,7 @@
use IContextSource;
use Language;
use MediaWiki\MediaWikiServices;
+use MediaWiki\Storage\RevisionRecord;
use MWException;
use ParserOutput;
use Revision;
@@ -98,7 +99,7 @@
$header = $linkRenderer->makeKnownLink( $title,
$headerMsg->text(), [],
[ 'oldid' => $rev->getId() ] );
- if ( $rev->userCan( Revision::DELETED_TEXT, $user ) ) {
+ if ( $rev->userCan( RevisionRecord::DELETED_TEXT, $user ) ) {
if ( $title->quickUserCan( 'edit', $user ) &&
!$rev->isCurrent() ) {
$editQuery = [
'action' => 'edit',
@@ -110,7 +111,7 @@
)->escaped();
}
- if ( $rev->isDeleted( Revision::DELETED_TEXT ) ) {
+ if ( $rev->isDeleted( RevisionRecord::DELETED_TEXT ) ) {
$header = Html::rawElement( 'span', [ 'class'
=> 'history-deleted' ], $header );
}
} else {
diff --git a/repo/tests/phpunit/includes/Api/SetClaimValueTest.php
b/repo/tests/phpunit/includes/Api/SetClaimValueTest.php
index 3242866..4c8908f 100644
--- a/repo/tests/phpunit/includes/Api/SetClaimValueTest.php
+++ b/repo/tests/phpunit/includes/Api/SetClaimValueTest.php
@@ -4,7 +4,7 @@
use DataValues\StringValue;
use FormatJson;
-use Revision;
+use MediaWiki\Storage\RevisionRecord;
use ApiUsageException;
use ValueFormatters\FormatterOptions;
use ValueFormatters\ValueFormatter;
@@ -146,7 +146,7 @@
$obtainedEntity = $entityLookup->getEntity( $itemId );
$page = new WikiPage(
$wikibaseRepo->getEntityTitleLookup()->getTitleForId( $itemId ) );
- $generatedSummary = $page->getRevision()->getComment(
Revision::RAW );
+ $generatedSummary = $page->getRevision()->getComment(
RevisionRecord::RAW );
$this->assertEquals( $expectedSummary, $generatedSummary,
'Summary mismatch' );
$statements = $obtainedEntity->getStatements();
--
To view, visit https://gerrit.wikimedia.org/r/400588
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3c68ccd1117303cfac3d29f0f092284be457e12c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Thiemo Kreuz (WMDE) <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
