jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/403953 )
Change subject: Improve type hints in CrossCheckerTest and remove redundant
PHPDoc
......................................................................
Improve type hints in CrossCheckerTest and remove redundant PHPDoc
The majority of this patch removes PHPDoc blocks that repeat 100%
exactly what the method header already states. But this is only minor
cleanup and not the meat of this patch.
Change-Id: Ie1579418191098f48cca32de941da9bdf6d4c05a
---
M includes/CrossCheck/Comparer/DataValueComparerFactory.php
M includes/CrossCheck/Comparer/EntityIdValueComparer.php
M includes/CrossCheck/Comparer/MonolingualTextValueComparer.php
M includes/CrossCheck/Comparer/MultilingualTextValueComparer.php
M includes/CrossCheck/Comparer/StringComparer.php
M includes/CrossCheck/Comparer/StringValueComparer.php
M includes/CrossCheck/CrossCheckInteractor.php
M includes/CrossCheck/CrossChecker.php
M includes/CrossCheck/ValueParser/MultilingualTextValueParser.php
M includes/CrossCheck/ValueParser/StringValueParser.php
M includes/DumpMetaInformation/SqlDumpMetaInformationRepo.php
M includes/Serializer/ComparisonResultSerializer.php
M includes/Serializer/CrossCheckResultListSerializer.php
M includes/Serializer/CrossCheckResultSerializer.php
M includes/Serializer/ReferenceResultSerializer.php
M includes/Serializer/SerializerFactory.php
M includes/UpdateExternalData/ExternalDataImporter.php
M specials/SpecialCrossCheck.php
M specials/SpecialExternalDatabases.php
M tests/phpunit/CrossCheck/CrossCheckerTest.php
20 files changed, 17 insertions(+), 97 deletions(-)
Approvals:
Lucas Werkmeister (WMDE): Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/CrossCheck/Comparer/DataValueComparerFactory.php
b/includes/CrossCheck/Comparer/DataValueComparerFactory.php
index d510a18..7d98ec5 100644
--- a/includes/CrossCheck/Comparer/DataValueComparerFactory.php
+++ b/includes/CrossCheck/Comparer/DataValueComparerFactory.php
@@ -22,10 +22,6 @@
*/
private $stringNormalizer;
- /**
- * @param TermIndex $termIndex
- * @param StringNormalizer $stringNormalizer
- */
public function __construct( TermIndex $termIndex, StringNormalizer
$stringNormalizer ) {
$this->termIndex = $termIndex;
$this->stringNormalizer = $stringNormalizer;
diff --git a/includes/CrossCheck/Comparer/EntityIdValueComparer.php
b/includes/CrossCheck/Comparer/EntityIdValueComparer.php
index 9eb07a1..3a2fc72 100644
--- a/includes/CrossCheck/Comparer/EntityIdValueComparer.php
+++ b/includes/CrossCheck/Comparer/EntityIdValueComparer.php
@@ -28,10 +28,6 @@
*/
private $stringComparer;
- /**
- * @param TermIndex $termIndex
- * @param StringComparer $stringComparer
- */
public function __construct( TermIndex $termIndex, StringComparer
$stringComparer ) {
$this->termIndex = $termIndex;
$this->stringComparer = $stringComparer;
diff --git a/includes/CrossCheck/Comparer/MonolingualTextValueComparer.php
b/includes/CrossCheck/Comparer/MonolingualTextValueComparer.php
index 29451d4..c64c0cc 100644
--- a/includes/CrossCheck/Comparer/MonolingualTextValueComparer.php
+++ b/includes/CrossCheck/Comparer/MonolingualTextValueComparer.php
@@ -18,9 +18,6 @@
*/
private $stringComparer;
- /**
- * @param StringComparer $stringComparer
- */
public function __construct( StringComparer $stringComparer ) {
$this->stringComparer = $stringComparer;
}
diff --git a/includes/CrossCheck/Comparer/MultilingualTextValueComparer.php
b/includes/CrossCheck/Comparer/MultilingualTextValueComparer.php
index bdec056..ae95de4 100644
--- a/includes/CrossCheck/Comparer/MultilingualTextValueComparer.php
+++ b/includes/CrossCheck/Comparer/MultilingualTextValueComparer.php
@@ -19,9 +19,6 @@
*/
private $stringComparer;
- /**
- * @param StringComparer $stringComparer
- */
public function __construct( StringComparer $stringComparer ) {
$this->stringComparer = $stringComparer;
}
diff --git a/includes/CrossCheck/Comparer/StringComparer.php
b/includes/CrossCheck/Comparer/StringComparer.php
index cf8464f..4530a03 100644
--- a/includes/CrossCheck/Comparer/StringComparer.php
+++ b/includes/CrossCheck/Comparer/StringComparer.php
@@ -23,9 +23,6 @@
*/
private $stringNormalizer;
- /**
- * @param StringNormalizer $stringNormalizer
- */
public function __construct( StringNormalizer $stringNormalizer ) {
$this->stringNormalizer = $stringNormalizer;
}
diff --git a/includes/CrossCheck/Comparer/StringValueComparer.php
b/includes/CrossCheck/Comparer/StringValueComparer.php
index 90cbf1f..eef62df 100644
--- a/includes/CrossCheck/Comparer/StringValueComparer.php
+++ b/includes/CrossCheck/Comparer/StringValueComparer.php
@@ -18,9 +18,6 @@
*/
private $stringComparer;
- /**
- * @param StringComparer $stringComparer
- */
public function __construct( StringComparer $stringComparer ) {
$this->stringComparer = $stringComparer;
}
diff --git a/includes/CrossCheck/CrossCheckInteractor.php
b/includes/CrossCheck/CrossCheckInteractor.php
index 3a6edf2..b02de79 100644
--- a/includes/CrossCheck/CrossCheckInteractor.php
+++ b/includes/CrossCheck/CrossCheckInteractor.php
@@ -38,11 +38,6 @@
*/
private $crossChecker;
- /**
- * @param EntityLookup $entityLookup
- * @param StatementGuidParser $statementGuidParser
- * @param CrossChecker $crossChecker
- */
public function __construct( EntityLookup $entityLookup,
StatementGuidParser $statementGuidParser, CrossChecker $crossChecker ) {
$this->entityLookup = $entityLookup;
$this->statementGuidParser = $statementGuidParser;
diff --git a/includes/CrossCheck/CrossChecker.php
b/includes/CrossCheck/CrossChecker.php
index 0e30f53..894a258 100644
--- a/includes/CrossCheck/CrossChecker.php
+++ b/includes/CrossCheck/CrossChecker.php
@@ -62,14 +62,6 @@
*/
private $externalDataRepo;
- /**
- * @param EntityLookup $entityLookup
- * @param ComparativeValueParserFactory $comparativeValueParserFactory
- * @param DataValueComparer $dataValueComparer
- * @param ReferenceChecker $referenceHandler
- * @param DumpMetaInformationLookup $dumpMetaInformationLookup
- * @param ExternalDataRepo $externalDataRepo
- */
public function __construct(
EntityLookup $entityLookup,
ComparativeValueParserFactory $comparativeValueParserFactory,
diff --git a/includes/CrossCheck/ValueParser/MultilingualTextValueParser.php
b/includes/CrossCheck/ValueParser/MultilingualTextValueParser.php
index 238e79d..bfad6ff 100644
--- a/includes/CrossCheck/ValueParser/MultilingualTextValueParser.php
+++ b/includes/CrossCheck/ValueParser/MultilingualTextValueParser.php
@@ -18,9 +18,6 @@
*/
private $monolingualTextValueParser;
- /**
- * @param ValueParser $monolingualTextValueParser
- */
public function __construct( ValueParser $monolingualTextValueParser ) {
$this->monolingualTextValueParser = $monolingualTextValueParser;
}
diff --git a/includes/CrossCheck/ValueParser/StringValueParser.php
b/includes/CrossCheck/ValueParser/StringValueParser.php
index 62eaf3b..8d935c6 100644
--- a/includes/CrossCheck/ValueParser/StringValueParser.php
+++ b/includes/CrossCheck/ValueParser/StringValueParser.php
@@ -18,9 +18,6 @@
*/
private $stringNormalizer;
- /**
- * @param StringNormalizer $stringNormalizer
- */
public function __construct( StringNormalizer $stringNormalizer ) {
$this->stringNormalizer = $stringNormalizer;
}
diff --git a/includes/DumpMetaInformation/SqlDumpMetaInformationRepo.php
b/includes/DumpMetaInformation/SqlDumpMetaInformationRepo.php
index 8eb90ad..efb4826 100644
--- a/includes/DumpMetaInformation/SqlDumpMetaInformationRepo.php
+++ b/includes/DumpMetaInformation/SqlDumpMetaInformationRepo.php
@@ -233,7 +233,7 @@
* @param DumpMetaInformation $dumpMetaInformation
* @return array
*/
- private function getDumpInformationFields( IDatabase $db,
DumpMetaInformation $dumpMetaInformation ) {
+ private function getDumpInformationFields( IDatabase $db,
DumpMetaInformation $dumpMetaInformation ) {
return [
'id' => $dumpMetaInformation->getDumpId(),
'source_qid' =>
$dumpMetaInformation->getSourceItemId()->getSerialization(),
diff --git a/includes/Serializer/ComparisonResultSerializer.php
b/includes/Serializer/ComparisonResultSerializer.php
index a17bc7e..26f37aa 100644
--- a/includes/Serializer/ComparisonResultSerializer.php
+++ b/includes/Serializer/ComparisonResultSerializer.php
@@ -19,9 +19,6 @@
*/
private $dataValueSerializer;
- /**
- * @param Serializer $dataValueSerializer
- */
public function __construct( Serializer $dataValueSerializer ) {
$this->dataValueSerializer = $dataValueSerializer;
}
diff --git a/includes/Serializer/CrossCheckResultListSerializer.php
b/includes/Serializer/CrossCheckResultListSerializer.php
index aa144a0..9e98ec1 100644
--- a/includes/Serializer/CrossCheckResultListSerializer.php
+++ b/includes/Serializer/CrossCheckResultListSerializer.php
@@ -19,9 +19,6 @@
*/
private $crossCheckResultSerializer;
- /**
- * @param Serializer $crossCheckResultSerializer
- */
public function __construct( Serializer $crossCheckResultSerializer ) {
$this->crossCheckResultSerializer = $crossCheckResultSerializer;
}
diff --git a/includes/Serializer/CrossCheckResultSerializer.php
b/includes/Serializer/CrossCheckResultSerializer.php
index 88f6708..8279c15 100644
--- a/includes/Serializer/CrossCheckResultSerializer.php
+++ b/includes/Serializer/CrossCheckResultSerializer.php
@@ -29,11 +29,6 @@
*/
private $referenceResultSerializer;
- /**
- * @param Serializer $dumpMetaInformationSerializer
- * @param Serializer $comparisonResultSerializer
- * @param Serializer $referenceResultSerializer
- */
public function __construct(
Serializer $dumpMetaInformationSerializer,
Serializer $comparisonResultSerializer,
diff --git a/includes/Serializer/ReferenceResultSerializer.php
b/includes/Serializer/ReferenceResultSerializer.php
index da3e0d9..abe8325 100644
--- a/includes/Serializer/ReferenceResultSerializer.php
+++ b/includes/Serializer/ReferenceResultSerializer.php
@@ -19,9 +19,6 @@
*/
private $referenceSerializer;
- /**
- * @param Serializer $referenceSerializer
- */
public function __construct( Serializer $referenceSerializer ) {
$this->referenceSerializer = $referenceSerializer;
}
diff --git a/includes/Serializer/SerializerFactory.php
b/includes/Serializer/SerializerFactory.php
index c09466b..ca9101e 100644
--- a/includes/Serializer/SerializerFactory.php
+++ b/includes/Serializer/SerializerFactory.php
@@ -21,10 +21,6 @@
*/
private $referenceSerializer;
- /**
- * @param Serializer $dataValueSerializer
- * @param Serializer $referenceSerializer
- */
public function __construct( Serializer $dataValueSerializer,
Serializer $referenceSerializer ) {
$this->dataValueSerializer = $dataValueSerializer;
$this->referenceSerializer = $referenceSerializer;
diff --git a/includes/UpdateExternalData/ExternalDataImporter.php
b/includes/UpdateExternalData/ExternalDataImporter.php
index d094288..df634cb 100644
--- a/includes/UpdateExternalData/ExternalDataImporter.php
+++ b/includes/UpdateExternalData/ExternalDataImporter.php
@@ -31,11 +31,6 @@
*/
private $importSettings;
- /**
- * @param CsvImportSettings $importSettings
- * @param DumpMetaInformationStore $dumpMetaInformationStore
- * @param ExternalDataRepo $externalDataRepo
- */
public function __construct(
CsvImportSettings $importSettings,
DumpMetaInformationStore $dumpMetaInformationStore,
diff --git a/specials/SpecialCrossCheck.php b/specials/SpecialCrossCheck.php
index 9209d04..53a9983 100644
--- a/specials/SpecialCrossCheck.php
+++ b/specials/SpecialCrossCheck.php
@@ -89,15 +89,6 @@
);
}
- /**
- * @param EntityLookup $entityLookup
- * @param TermLookup $termLookup
- * @param EntityIdLabelFormatterFactory $entityIdLabelFormatterFactory
- * @param EntityIdHtmlLinkFormatterFactory
$entityIdHtmlLinkFormatterFactory
- * @param EntityIdParser $entityIdParser
- * @param OutputFormatValueFormatterFactory $valueFormatterFactory
- * @param CrossCheckInteractor $crossCheckInteractor
- */
public function __construct(
EntityLookup $entityLookup,
TermLookup $termLookup,
diff --git a/specials/SpecialExternalDatabases.php
b/specials/SpecialExternalDatabases.php
index d187ada..696bb76 100644
--- a/specials/SpecialExternalDatabases.php
+++ b/specials/SpecialExternalDatabases.php
@@ -48,15 +48,11 @@
);
}
- /**
- * @param TermLookup $termLookup
- * @param EntityIdHtmlLinkFormatterFactory
$entityIdHtmlLinkFormatterFactory
- * @param DumpMetaInformationLookup $dumpMetaInformationRepo
- */
public function __construct(
TermLookup $termLookup,
EntityIdHtmlLinkFormatterFactory
$entityIdHtmlLinkFormatterFactory,
- DumpMetaInformationLookup $dumpMetaInformationRepo ) {
+ DumpMetaInformationLookup $dumpMetaInformationRepo
+ ) {
parent::__construct( 'ExternalDatabases' );
$this->entityIdLinkFormatter =
$entityIdHtmlLinkFormatterFactory->getEntityIdFormatter(
diff --git a/tests/phpunit/CrossCheck/CrossCheckerTest.php
b/tests/phpunit/CrossCheck/CrossCheckerTest.php
index adbb6e7..e494bd3 100644
--- a/tests/phpunit/CrossCheck/CrossCheckerTest.php
+++ b/tests/phpunit/CrossCheck/CrossCheckerTest.php
@@ -155,7 +155,7 @@
public function testCrossCheckStatements(
StatementList $entityStatements,
StatementList $statements,
- array $expectedResults = null,
+ array $expectedResults,
$expectedException = null
) {
if ( $expectedException ) {
@@ -171,7 +171,6 @@
* Test cases for testCrossCheckStatements
*/
public function crossCheckStatementsDataProvider() {
-
return [
// Cross-check all statements of Q1
[
@@ -282,7 +281,7 @@
[
$this->items['Q2']->getStatements(),
$this->items['Q1']->getStatements()->getByPropertyId( new PropertyId( 'P2' ) ),
- null,
+ [],
InvalidArgumentException::class
]
];
@@ -294,22 +293,18 @@
* @param CrossCheckResultList $actualResults
* @param array $expectedResults
*/
- private function runResultAssertions( $actualResults, $expectedResults
) {
- if ( $actualResults ) {
- $actualResults = array_map(
- function ( CrossCheckResult $result ) {
- return [
- 'claimGuid' =>
$result->getClaimGuid(),
- 'dumpId' =>
$result->getDumpMetaInformation()->getDumpId(),
- 'externalId' =>
$result->getExternalId()
- ];
- },
- $actualResults->toArray()
- );
- $this->assertArrayEquals( $expectedResults,
$actualResults );
- } else {
- $this->assertEquals( $expectedResults, $actualResults );
- }
+ private function runResultAssertions( CrossCheckResultList
$actualResults, array $expectedResults ) {
+ $actualResults = array_map(
+ function ( CrossCheckResult $result ) {
+ return [
+ 'claimGuid' => $result->getClaimGuid(),
+ 'dumpId' =>
$result->getDumpMetaInformation()->getDumpId(),
+ 'externalId' => $result->getExternalId()
+ ];
+ },
+ $actualResults->toArray()
+ );
+ $this->assertArrayEquals( $expectedResults, $actualResults );
}
private function getCrossChecker() {
--
To view, visit https://gerrit.wikimedia.org/r/403953
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie1579418191098f48cca32de941da9bdf6d4c05a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikibaseQualityExternalValidation
Gerrit-Branch: master
Gerrit-Owner: Thiemo Kreuz (WMDE) <thiemo.kr...@wikimedia.de>
Gerrit-Reviewer: Lucas Werkmeister (WMDE) <lucas.werkmeis...@wikimedia.de>
Gerrit-Reviewer: Thiemo Kreuz (WMDE) <thiemo.kr...@wikimedia.de>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
