Aude has uploaded a new change for review. https://gerrit.wikimedia.org/r/278606
Change subject: Remove EntityRevision from MediaInfoView ...................................................................... Remove EntityRevision from MediaInfoView per changes (I97677b9) in EntityView Bug: T130511 Change-Id: Ic36fc86e97fe6211f7f7566d02a4ed3051267999 --- M src/View/MediaInfoView.php M tests/phpunit/mediawiki/View/MediaInfoViewTest.php 2 files changed, 14 insertions(+), 31 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikibaseMediaInfo refs/changes/06/278606/1 diff --git a/src/View/MediaInfoView.php b/src/View/MediaInfoView.php index 4ca6ae7..1d19d1b 100644 --- a/src/View/MediaInfoView.php +++ b/src/View/MediaInfoView.php @@ -6,7 +6,6 @@ use Language; use Wikibase\DataModel\Entity\EntityDocument; use Wikibase\DataModel\Term\Fingerprint; -use Wikibase\EntityRevision; use Wikibase\MediaInfo\DataModel\MediaInfo; use Wikibase\View\EntityTermsView; use Wikibase\View\EntityView; @@ -75,28 +74,26 @@ /** * @see EntityView::getMainHtml * - * @param EntityRevision $entityRevision + * @param EntityDocument $entity * * @throws InvalidArgumentException * @return string HTML */ - protected function getMainHtml( EntityRevision $entityRevision ) { - $entity = $entityRevision->getEntity(); - + protected function getMainHtml( EntityDocument $entity ) { if ( !( $entity instanceof MediaInfo ) ) { throw new InvalidArgumentException( '$entityRevision must contain a MediaInfo entity.' ); } - $fingerprint = $this->getFingerprint( $entity ); - // FIXME should be $this->getHtmlForTermBox( $id, $entityRevision->getRevisionId() ) $entityTermsView = $this->entityTermsView->getEntityTermsForLanguageListView( - $fingerprint, + $entity, + $entity, + null, [ $this->languageCode ] ); return $this->entityTermsView->getHtml( - $fingerprint, + $this->getFingerprint( $entity ), $entity->getId(), $entityTermsView, $this->textInjector @@ -130,12 +127,11 @@ /** * @see EntityView::getTitleHtml * - * @param EntityRevision $entityRevision + * @param EntityDocument $entity * * @return string HTML */ - public function getTitleHtml( EntityRevision $entityRevision ) { - $entity = $entityRevision->getEntity(); + public function getTitleHtml( EntityDocument $entity ) { if ( !( $entity instanceof MediaInfo ) ) { throw new InvalidArgumentException( '$entityRevision must contain a MediaInfo entity.' ); } diff --git a/tests/phpunit/mediawiki/View/MediaInfoViewTest.php b/tests/phpunit/mediawiki/View/MediaInfoViewTest.php index 33cc163..fa09e46 100644 --- a/tests/phpunit/mediawiki/View/MediaInfoViewTest.php +++ b/tests/phpunit/mediawiki/View/MediaInfoViewTest.php @@ -13,7 +13,6 @@ use Wikibase\DataModel\Term\Fingerprint; use Wikibase\DataModel\Term\Term; use Wikibase\DataModel\Term\TermList; -use Wikibase\EntityRevision; use Wikibase\MediaInfo\DataModel\MediaInfo; use Wikibase\MediaInfo\DataModel\MediaInfoId; use Wikibase\MediaInfo\View\MediaInfoView; @@ -76,12 +75,6 @@ ); } - private function newEntityRevision( EntityDocument $entity ) { - $revId = 0; - $timestamp = wfTimestamp( TS_MW ); - return new EntityRevision( $entity, $revId, $timestamp ); - } - public function testInstantiate() { $view = $this->newMediaInfoView(); $this->assertInstanceOf( MediaInfoView::class, $view ); @@ -92,10 +85,9 @@ $view = $this->newMediaInfoView(); $entity = $this->getMock( EntityDocument::class ); - $revision = $this->newEntityRevision( $entity ); $this->setExpectedException( InvalidArgumentException::class ); - $view->getHtml( $revision ); + $view->getHtml( $entity ); } /** @@ -146,9 +138,7 @@ $statementSectionsView ); - $revision = $this->newEntityRevision( $entity ); - - $result = $view->getHtml( $revision ); + $result = $view->getHtml( $entity ); $this->assertInternalType( 'string', $result ); $this->assertContains( 'wb-mediainfo', $result ); $this->assertContains( 'entityTermsView->getHtml', $result ); @@ -215,9 +205,7 @@ $view = $this->newMediaInfoView(); $entity = $this->getMock( EntityDocument::class ); - $revision = $this->newEntityRevision( $entity ); - - $view->getTitleHtml( $revision ); + $view->getTitleHtml( $entity ); } /** @@ -241,9 +229,8 @@ ->will( $this->returnValue( 'entityTermsView->getTitleHtml' ) ); $view = $this->newMediaInfoView( $contentLanguageCode, $entityTermsView ); - $revision = $this->newEntityRevision( $entity ); - $result = $view->getTitleHtml( $revision ); + $result = $view->getTitleHtml( $entity ); $this->assertInternalType( 'string', $result ); $this->assertEquals( 'entityTermsView->getTitleHtml', $result ); } @@ -284,7 +271,7 @@ } public function testPlaceholderIntegration() { - $entityRevision = $this->newEntityRevision( new MediaInfo( new MediaInfoId( 'M1' ) ) ); + $entity = new MediaInfo( new MediaInfoId( 'M1' ) ); $entityTermsView = $this->newEntityTermsViewMock(); $entityTermsView->expects( $this->once() ) @@ -303,7 +290,7 @@ ) ); $view = $this->newMediaInfoView( 'en', $entityTermsView ); - $view->getHtml( $entityRevision ); + $view->getHtml( $entity ); $placeholders = $view->getPlaceholders(); // FIXME: EntityViewPlaceholderExpander only supports entities with fingerprints -- To view, visit https://gerrit.wikimedia.org/r/278606 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic36fc86e97fe6211f7f7566d02a4ed3051267999 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/WikibaseMediaInfo Gerrit-Branch: master Gerrit-Owner: Aude <aude.w...@gmail.com> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits