jenkins-bot has submitted this change and it was merged.
Change subject: Add "load_composer_autoloader": true to extension.json
......................................................................
Add "load_composer_autoloader": true to extension.json
This is a hack to make not using the composer merge plugin maybe work.
This won't make it supported and everyone should use the merge
plugin instead, because not using it creates hard to debug problems.
Change-Id: I57152009f34bac35a3f54d2064e22ae2ba792292
---
M extension.json
M src/Content/MediaInfoHandler.php
M tests/phpunit/mediawiki/View/MediaInfoViewTest.php
3 files changed, 2 insertions(+), 9 deletions(-)
Approvals:
Thiemo Mättig (WMDE): Looks good to me, but someone else must approve
JanZerebecki: Looks good to me, approved
jenkins-bot: Verified
diff --git a/extension.json b/extension.json
index ba39cc5..2397adf 100644
--- a/extension.json
+++ b/extension.json
@@ -8,8 +8,7 @@
"descriptionmsg": "wikibasemediainfo-desc",
"license-name": "GPL-2.0+",
"type": "wikibase",
- "AutoloadClasses": {
- },
+ "load_composer_autoloader": true,
"config": {
},
"ExtensionMessagesFiles": {
diff --git a/src/Content/MediaInfoHandler.php b/src/Content/MediaInfoHandler.php
index 7b70327..72e5dcd 100644
--- a/src/Content/MediaInfoHandler.php
+++ b/src/Content/MediaInfoHandler.php
@@ -19,7 +19,6 @@
use Wikibase\Store\EntityIdLookup;
use Wikibase\SubmitEntityAction;
use Wikibase\TermIndex;
-use Wikibase\ViewEntityAction;
/**
* @license GPL-2.0+
diff --git a/tests/phpunit/mediawiki/View/MediaInfoViewTest.php
b/tests/phpunit/mediawiki/View/MediaInfoViewTest.php
index 20ee8f1..7063b32 100644
--- a/tests/phpunit/mediawiki/View/MediaInfoViewTest.php
+++ b/tests/phpunit/mediawiki/View/MediaInfoViewTest.php
@@ -9,8 +9,6 @@
use Wikibase\DataModel\Snak\PropertyNoValueSnak;
use Wikibase\DataModel\Statement\Statement;
use Wikibase\DataModel\Statement\StatementList;
-use Wikibase\DataModel\Term\AliasesProvider;
-use Wikibase\DataModel\Term\LabelsProvider;
use Wikibase\DataModel\Term\Term;
use Wikibase\DataModel\Term\TermList;
use Wikibase\MediaInfo\DataModel\MediaInfo;
@@ -19,7 +17,6 @@
use Wikibase\View\EntityTermsView;
use Wikibase\View\EntityView;
use Wikibase\View\LanguageDirectionalityLookup;
-use Wikibase\View\LocalizedTextProvider;
use Wikibase\View\StatementSectionsView;
use Wikibase\View\Template\TemplateFactory;
@@ -219,9 +216,7 @@
$entityTermsView = $this->newEntityTermsViewMock();
$entityTermsView->expects( $this->once() )
->method( 'getTitleHtml' )
- ->with(
- $entityId
- )
+ ->with( $entityId )
->will( $this->returnValue(
'entityTermsView->getTitleHtml' ) );
$view = $this->newMediaInfoView( $contentLanguageCode,
$entityTermsView );
--
To view, visit https://gerrit.wikimedia.org/r/289642
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I57152009f34bac35a3f54d2064e22ae2ba792292
Gerrit-PatchSet: 5
Gerrit-Project: mediawiki/extensions/WikibaseMediaInfo
Gerrit-Branch: master
Gerrit-Owner: Thiemo Mättig (WMDE) <[email protected]>
Gerrit-Reviewer: Adrian Heine <[email protected]>
Gerrit-Reviewer: Aude <[email protected]>
Gerrit-Reviewer: JanZerebecki <[email protected]>
Gerrit-Reviewer: Jonas Kress (WMDE) <[email protected]>
Gerrit-Reviewer: Thiemo Mättig (WMDE) <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
