jenkins-bot has submitted this change and it was merged.
Change subject: Fix all kinds of incomplete/out of sync PHPDoc blocks
......................................................................
Fix all kinds of incomplete/out of sync PHPDoc blocks
This patch also removes a few unused imports. Not enough for a
separate patch in my opinion.
Change-Id: Ic6417816c1c4dabac7c620c78ced1d149d9bc240
---
M client/tests/phpunit/includes/Usage/UsageTrackerContractTester.php
M repo/includes/ParserOutput/EntityParserOutputGenerator.php
M repo/includes/Parsers/MwTimeIsoParser.php
M repo/includes/Rdf/RdfBuilder.php
M repo/tests/phpunit/includes/Hooks/OutputPageBeforeHTMLHookHandlerTest.php
M repo/tests/phpunit/includes/MediaWikiLocalizedTextProviderTest.php
M repo/tests/phpunit/includes/Parsers/EntityIdValueParserTest.php
M repo/tests/phpunit/includes/Parsers/MwTimeIsoParserTest.php
M repo/tests/phpunit/includes/Parsers/YearMonthTimeParserTest.php
M repo/tests/phpunit/includes/Parsers/YearTimeParserTest.php
M view/src/EntityView.php
M view/src/SiteLinksView.php
M view/src/ViewFactory.php
M view/tests/phpunit/DummyLocalizedTextProviderTest.php
14 files changed, 15 insertions(+), 18 deletions(-)
Approvals:
Addshore: Looks good to me, approved
jenkins-bot: Verified
diff --git a/client/tests/phpunit/includes/Usage/UsageTrackerContractTester.php
b/client/tests/phpunit/includes/Usage/UsageTrackerContractTester.php
index 8a8e502..edae89a 100644
--- a/client/tests/phpunit/includes/Usage/UsageTrackerContractTester.php
+++ b/client/tests/phpunit/includes/Usage/UsageTrackerContractTester.php
@@ -45,7 +45,6 @@
/**
* @param int $pageId
- * @param string $timestamp
*
* @return EntityUsage[]
*/
diff --git a/repo/includes/ParserOutput/EntityParserOutputGenerator.php
b/repo/includes/ParserOutput/EntityParserOutputGenerator.php
index a3aece4..0297b2b 100644
--- a/repo/includes/ParserOutput/EntityParserOutputGenerator.php
+++ b/repo/includes/ParserOutput/EntityParserOutputGenerator.php
@@ -97,6 +97,7 @@
* @param EntityInfoBuilderFactory $entityInfoBuilderFactory
* @param LanguageFallbackChain $languageFallbackChain
* @param TemplateFactory $templateFactory
+ * @param LocalizedTextProvider $textProvider
* @param EntityDataFormatProvider $entityDataFormatProvider
* @param ParserOutputDataUpdater[] $dataUpdaters
* @param string $languageCode
diff --git a/repo/includes/Parsers/MwTimeIsoParser.php
b/repo/includes/Parsers/MwTimeIsoParser.php
index 8336f93..973ab85 100644
--- a/repo/includes/Parsers/MwTimeIsoParser.php
+++ b/repo/includes/Parsers/MwTimeIsoParser.php
@@ -115,6 +115,7 @@
* string to an object that can be used to instantiate a time.Time
object.
*
* @param string $value
+ * @param Language $lang
*
* @throws RuntimeException
* @return TimeValue|bool
diff --git a/repo/includes/Rdf/RdfBuilder.php b/repo/includes/Rdf/RdfBuilder.php
index bf26946..850a9b1 100644
--- a/repo/includes/Rdf/RdfBuilder.php
+++ b/repo/includes/Rdf/RdfBuilder.php
@@ -2,7 +2,6 @@
namespace Wikibase\Rdf;
-use HashBagOStuff;
use SiteList;
use Wikibase\DataModel\Entity\EntityDocument;
use Wikibase\DataModel\Entity\EntityId;
@@ -62,7 +61,7 @@
private $termsBuilder;
/**
- * Rdf builders to appyl when building rdf for an entity.
+ * RDF builders to apply when building RDF for an entity.
* @var EntityRdfBuilder[]
*/
private $builders = array();
diff --git
a/repo/tests/phpunit/includes/Hooks/OutputPageBeforeHTMLHookHandlerTest.php
b/repo/tests/phpunit/includes/Hooks/OutputPageBeforeHTMLHookHandlerTest.php
index f0ffcef..32088b0 100644
--- a/repo/tests/phpunit/includes/Hooks/OutputPageBeforeHTMLHookHandlerTest.php
+++ b/repo/tests/phpunit/includes/Hooks/OutputPageBeforeHTMLHookHandlerTest.php
@@ -32,6 +32,8 @@
class OutputPageBeforeHTMLHookHandlerTest extends PHPUnit_Framework_TestCase {
/**
+ * @param string $uiLanguageCode
+ *
* @return OutputPageBeforeHTMLHookHandler
*/
private function getHookHandler( $uiLanguageCode ) {
diff --git a/repo/tests/phpunit/includes/MediaWikiLocalizedTextProviderTest.php
b/repo/tests/phpunit/includes/MediaWikiLocalizedTextProviderTest.php
index 9d34e2d..9e80a63 100644
--- a/repo/tests/phpunit/includes/MediaWikiLocalizedTextProviderTest.php
+++ b/repo/tests/phpunit/includes/MediaWikiLocalizedTextProviderTest.php
@@ -29,8 +29,6 @@
/**
* @dataProvider mediaWikiLocalizedTextProviderProvider
- *
- * @param MediaWikiLocalizedTextProvider $localizedTextProvider
*/
public function testGet( MediaWikiLocalizedTextProvider
$localizedTextProvider, $has, $content, $languageCode ) {
$this->assertEquals( $localizedTextProvider->has( 'parentheses'
), $has );
diff --git a/repo/tests/phpunit/includes/Parsers/EntityIdValueParserTest.php
b/repo/tests/phpunit/includes/Parsers/EntityIdValueParserTest.php
index ba9341b..d70bbd9 100644
--- a/repo/tests/phpunit/includes/Parsers/EntityIdValueParserTest.php
+++ b/repo/tests/phpunit/includes/Parsers/EntityIdValueParserTest.php
@@ -25,7 +25,7 @@
class EntityIdValueParserTest extends StringValueParserTest {
/**
- * @deprecated since 0.3, just use getInstance.
+ * @deprecated since DataValues Common 0.3, just use getInstance.
*/
protected function getParserClass() {
throw new \LogicException( 'Should not be called, use
getInstance' );
diff --git a/repo/tests/phpunit/includes/Parsers/MwTimeIsoParserTest.php
b/repo/tests/phpunit/includes/Parsers/MwTimeIsoParserTest.php
index 1d585ba..999eb50 100644
--- a/repo/tests/phpunit/includes/Parsers/MwTimeIsoParserTest.php
+++ b/repo/tests/phpunit/includes/Parsers/MwTimeIsoParserTest.php
@@ -25,7 +25,7 @@
class MwTimeIsoParserTest extends StringValueParserTest {
/**
- * @deprecated since 0.3, just use getInstance.
+ * @deprecated since DataValues Common 0.3, just use getInstance.
*/
protected function getParserClass() {
throw new LogicException( 'Should not be called, use
getInstance' );
@@ -86,7 +86,7 @@
}
/**
- * @param string[]
+ * @return string[]
*/
private function getMessages() {
return [
diff --git a/repo/tests/phpunit/includes/Parsers/YearMonthTimeParserTest.php
b/repo/tests/phpunit/includes/Parsers/YearMonthTimeParserTest.php
index 0c4fdf6..384f299 100644
--- a/repo/tests/phpunit/includes/Parsers/YearMonthTimeParserTest.php
+++ b/repo/tests/phpunit/includes/Parsers/YearMonthTimeParserTest.php
@@ -22,7 +22,7 @@
class YearMonthTimeParserTest extends StringValueParserTest {
/**
- * @deprecated since 0.3, just use getInstance.
+ * @deprecated since DataValues Common 0.3, just use getInstance.
*/
protected function getParserClass() {
throw new \LogicException( 'Should not be called, use
getInstance' );
diff --git a/repo/tests/phpunit/includes/Parsers/YearTimeParserTest.php
b/repo/tests/phpunit/includes/Parsers/YearTimeParserTest.php
index 19af6d0..7162c96 100644
--- a/repo/tests/phpunit/includes/Parsers/YearTimeParserTest.php
+++ b/repo/tests/phpunit/includes/Parsers/YearTimeParserTest.php
@@ -23,7 +23,7 @@
class YearTimeParserTest extends StringValueParserTest {
/**
- * @deprecated since 0.3, just use getInstance.
+ * @deprecated since DataValues Common 0.3, just use getInstance.
*/
protected function getParserClass() {
throw new \LogicException( 'Should not be called, use
getInstance' );
diff --git a/view/src/EntityView.php b/view/src/EntityView.php
index 05343ad..5349daf 100644
--- a/view/src/EntityView.php
+++ b/view/src/EntityView.php
@@ -3,7 +3,6 @@
namespace Wikibase\View;
use Wikibase\DataModel\Entity\EntityDocument;
-use Wikibase\DataModel\Entity\EntityId;
use Wikibase\DataModel\Term\FingerprintProvider;
use Wikibase\View\Template\TemplateFactory;
diff --git a/view/src/SiteLinksView.php b/view/src/SiteLinksView.php
index 710d9dd..26b0e73 100644
--- a/view/src/SiteLinksView.php
+++ b/view/src/SiteLinksView.php
@@ -74,6 +74,7 @@
* @param EditSectionGenerator $sectionEditLinkGenerator
* @param EntityIdFormatter $entityIdFormatter A plaintext producing
EntityIdFormatter
* @param LanguageNameLookup $languageNameLookup
+ * @param NumberLocalizer $numberLocalizer
* @param string[] $badgeItems
* @param string[] $specialSiteLinkGroups
* @param LocalizedTextProvider $textProvider
@@ -89,14 +90,14 @@
array $specialSiteLinkGroups,
LocalizedTextProvider $textProvider
) {
+ $this->templateFactory = $templateFactory;
$this->sites = $sites;
$this->sectionEditLinkGenerator = $sectionEditLinkGenerator;
- $this->badgeItems = $badgeItems;
- $this->specialSiteLinkGroups = $specialSiteLinkGroups;
- $this->templateFactory = $templateFactory;
+ $this->entityIdFormatter = $entityIdFormatter;
$this->languageNameLookup = $languageNameLookup;
$this->numberLocalizer = $numberLocalizer;
- $this->entityIdFormatter = $entityIdFormatter;
+ $this->badgeItems = $badgeItems;
+ $this->specialSiteLinkGroups = $specialSiteLinkGroups;
$this->textProvider = $textProvider;
}
diff --git a/view/src/ViewFactory.php b/view/src/ViewFactory.php
index 02944a4..08399ba 100644
--- a/view/src/ViewFactory.php
+++ b/view/src/ViewFactory.php
@@ -11,7 +11,6 @@
use Wikibase\LanguageFallbackChain;
use Wikibase\Lib\LanguageNameLookup;
use Wikibase\Lib\SnakFormatter;
-use Wikibase\View\LocalizedTextProvider;
use Wikibase\View\Template\TemplateFactory;
/**
diff --git a/view/tests/phpunit/DummyLocalizedTextProviderTest.php
b/view/tests/phpunit/DummyLocalizedTextProviderTest.php
index d958814..b6866c3 100644
--- a/view/tests/phpunit/DummyLocalizedTextProviderTest.php
+++ b/view/tests/phpunit/DummyLocalizedTextProviderTest.php
@@ -28,8 +28,6 @@
/**
* @dataProvider dummyLocalizedTextProviderProvider
- *
- * @param DummyLocalizedTextProvider $localizedTextProvider
*/
public function testGet( DummyLocalizedTextProvider
$localizedTextProvider, $has, $content, $languageCode ) {
$this->assertEquals( $localizedTextProvider->has( 'parentheses'
), $has );
--
To view, visit https://gerrit.wikimedia.org/r/285144
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic6417816c1c4dabac7c620c78ced1d149d9bc240
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Thiemo Mättig (WMDE) <[email protected]>
Gerrit-Reviewer: Addshore <[email protected]>
Gerrit-Reviewer: Bene <[email protected]>
Gerrit-Reviewer: Hoo man <[email protected]>
Gerrit-Reviewer: Jonas Kress (WMDE) <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
