jenkins-bot has submitted this change and it was merged.
Change subject: Fix confusing variable names and other minor clean-ups
......................................................................
Fix confusing variable names and other minor clean-ups
Change-Id: Icd8836c8f24198dbbae305403ad13b241f1765fc
---
M src/Content/MediaInfoContent.php
M src/Content/MediaInfoHandler.php
M src/View/MediaInfoView.php
M src/WikibaseMediaInfoHooks.php
M tests/phpunit/mediawiki/Content/MediaInfoContentTest.php
M tests/phpunit/mediawiki/EntityTypesTest.php
M tests/phpunit/mediawiki/View/MediaInfoViewTest.php
M tests/phpunit/mediawiki/WikibaseMediaInfoHooksTest.php
8 files changed, 15 insertions(+), 17 deletions(-)
Approvals:
Adrian Heine: Looks good to me, approved
jenkins-bot: Verified
diff --git a/src/Content/MediaInfoContent.php b/src/Content/MediaInfoContent.php
index dbf848d..2bd52ba 100644
--- a/src/Content/MediaInfoContent.php
+++ b/src/Content/MediaInfoContent.php
@@ -5,7 +5,6 @@
use Hooks;
use InvalidArgumentException;
use Wikibase\Content\EntityHolder;
-use Wikibase\DataModel\Entity\Entity;
use Wikibase\DataModel\Term\Fingerprint;
use Wikibase\EntityContent;
use Wikibase\MediaInfo\DataModel\MediaInfo;
diff --git a/src/Content/MediaInfoHandler.php b/src/Content/MediaInfoHandler.php
index 9137be6..db6af11 100644
--- a/src/Content/MediaInfoHandler.php
+++ b/src/Content/MediaInfoHandler.php
@@ -2,8 +2,6 @@
namespace Wikibase\MediaInfo\Content;
-use Wikibase\DataModel\Entity\Entity;
-use Wikibase\DataModel\Entity\EntityId;
use Wikibase\DataModel\Entity\EntityIdParser;
use Wikibase\EditEntityAction;
use Wikibase\HistoryEntityAction;
@@ -81,6 +79,8 @@
}
/**
+ * @param string $id
+ *
* @return MediaInfoId
*/
public function makeEntityId( $id ) {
diff --git a/src/View/MediaInfoView.php b/src/View/MediaInfoView.php
index 5f88666..72d9de8 100644
--- a/src/View/MediaInfoView.php
+++ b/src/View/MediaInfoView.php
@@ -3,11 +3,9 @@
namespace Wikibase\MediaInfo\View;
use InvalidArgumentException;
-use Language;
use Wikibase\DataModel\Entity\EntityDocument;
use Wikibase\DataModel\Term\Fingerprint;
use Wikibase\MediaInfo\DataModel\MediaInfo;
-use Wikibase\MediaInfo\DataModel\MediaInfoId;
use Wikibase\View\EntityTermsView;
use Wikibase\View\EntityView;
use Wikibase\View\LanguageDirectionalityLookup;
@@ -130,6 +128,7 @@
*
* @param EntityDocument $entity
*
+ * @throws InvalidArgumentException
* @return string HTML
*/
public function getTitleHtml( EntityDocument $entity ) {
diff --git a/src/WikibaseMediaInfoHooks.php b/src/WikibaseMediaInfoHooks.php
index 2f2e457..4c4e204 100644
--- a/src/WikibaseMediaInfoHooks.php
+++ b/src/WikibaseMediaInfoHooks.php
@@ -2,10 +2,6 @@
namespace Wikibase\MediaInfo;
-use Wikibase\DataModel\DeserializerFactory;
-use Wikibase\DataModel\SerializerFactory;
-use Wikibase\MediaInfo\Content\MediaInfoContent;
-
/**
* MediaWiki hook handlers for the Wikibase MediaInfo extension.
*
diff --git a/tests/phpunit/mediawiki/Content/MediaInfoContentTest.php
b/tests/phpunit/mediawiki/Content/MediaInfoContentTest.php
index 3a0189b..6f57d34 100644
--- a/tests/phpunit/mediawiki/Content/MediaInfoContentTest.php
+++ b/tests/phpunit/mediawiki/Content/MediaInfoContentTest.php
@@ -5,10 +5,8 @@
use InvalidArgumentException;
use PHPUnit_Framework_TestCase;
use Wikibase\Content\EntityInstanceHolder;
-use Wikibase\DataModel\Entity\EntityId;
use Wikibase\DataModel\Entity\Item;
use Wikibase\DataModel\Snak\PropertyNoValueSnak;
-use Wikibase\DataModel\Statement\StatementList;
use Wikibase\MediaInfo\Content\MediaInfoContent;
use Wikibase\MediaInfo\DataModel\MediaInfo;
use Wikibase\MediaInfo\DataModel\MediaInfoId;
diff --git a/tests/phpunit/mediawiki/EntityTypesTest.php
b/tests/phpunit/mediawiki/EntityTypesTest.php
index fe77543..6d02844 100644
--- a/tests/phpunit/mediawiki/EntityTypesTest.php
+++ b/tests/phpunit/mediawiki/EntityTypesTest.php
@@ -37,6 +37,9 @@
);
}
+ /**
+ * @return SerializerFactory
+ */
private function getSerializerFactory() {
$serializerFactory = $this->getMockBuilder(
SerializerFactory::class )
->disableOriginalConstructor()
diff --git a/tests/phpunit/mediawiki/View/MediaInfoViewTest.php
b/tests/phpunit/mediawiki/View/MediaInfoViewTest.php
index 4d8928d..9e29391 100644
--- a/tests/phpunit/mediawiki/View/MediaInfoViewTest.php
+++ b/tests/phpunit/mediawiki/View/MediaInfoViewTest.php
@@ -37,18 +37,27 @@
*/
class MediaInfoViewTest extends PHPUnit_Framework_TestCase {
+ /**
+ * @return StatementSectionsView
+ */
private function newStatementSectionsViewMock() {
return $this->getMockBuilder( StatementSectionsView::class )
->disableOriginalConstructor()
->getMock();
}
+ /**
+ * @return EntityTermsView
+ */
private function newEntityTermsViewMock() {
return $this->getMockBuilder( EntityTermsView::class )
->disableOriginalConstructor()
->getMock();
}
+ /**
+ * @return LanguageDirectionalityLookup
+ */
private function newLanguageDirectionalityLookupMock() {
$languageDirectionalityLookup = $this->getMock(
LanguageDirectionalityLookup::class );
$languageDirectionalityLookup->method( 'getDirectionality' )
diff --git a/tests/phpunit/mediawiki/WikibaseMediaInfoHooksTest.php
b/tests/phpunit/mediawiki/WikibaseMediaInfoHooksTest.php
index 80cd1ee..7b365d6 100644
--- a/tests/phpunit/mediawiki/WikibaseMediaInfoHooksTest.php
+++ b/tests/phpunit/mediawiki/WikibaseMediaInfoHooksTest.php
@@ -2,14 +2,8 @@
namespace Wikibase\MediaInfo\Tests\MediaWiki;
-use Deserializers\Deserializer;
use Hooks;
use PHPUnit_Framework_TestCase;
-use Serializers\Serializer;
-use Wikibase\DataModel\DeserializerFactory;
-use Wikibase\DataModel\SerializerFactory;
-use Wikibase\MediaInfo\DataModel\Serialization\MediaInfoDeserializer;
-use Wikibase\MediaInfo\DataModel\Serialization\MediaInfoSerializer;
/**
* @covers Wikibase\MediaInfo\WikibaseMediaInfoHooks
--
To view, visit https://gerrit.wikimedia.org/r/281656
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Icd8836c8f24198dbbae305403ad13b241f1765fc
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/WikibaseMediaInfo
Gerrit-Branch: master
Gerrit-Owner: Thiemo Mättig (WMDE) <[email protected]>
Gerrit-Reviewer: Adrian Heine <[email protected]>
Gerrit-Reviewer: Bene <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
