Tamslo has uploaded a new change for review. https://gerrit.wikimedia.org/r/217256
Change subject: Reformatted code ...................................................................... Reformatted code Change-Id: I6ade00d6fd78a66128315273cc7cad3a6850e485 --- M api/CrossCheck.php M includes/CrossCheck/Comparer/DataValueComparer.php M includes/CrossCheck/Comparer/DataValueComparerBase.php M includes/CrossCheck/Comparer/DataValueComparerFactory.php M includes/CrossCheck/Comparer/DispatchingDataValueComparer.php M includes/CrossCheck/Comparer/EntityIdValueComparer.php M includes/CrossCheck/Comparer/GlobeCoordinateValueComparer.php M includes/CrossCheck/Comparer/MonolingualTextValueComparer.php M includes/CrossCheck/Comparer/MultilingualTextValueComparer.php M includes/CrossCheck/Comparer/QuantityValueComparer.php M includes/CrossCheck/Comparer/StringComparer.php M includes/CrossCheck/Comparer/StringValueComparer.php M includes/CrossCheck/Comparer/TimeValueComparer.php M includes/CrossCheck/CrossCheckInteractor.php M includes/CrossCheck/CrossChecker.php M includes/CrossCheck/ReferenceHandler.php M includes/CrossCheck/Result/CrossCheckResult.php M includes/CrossCheck/Result/CrossCheckResultList.php M includes/CrossCheck/Result/ReferenceResult.php M includes/DumpMetaInformation/DumpMetaInformationRepo.php M includes/EvaluateCrossCheckJob.php M includes/EvaluateCrossCheckJobService.php M includes/ExternalDataRepo.php M includes/Serializer/CrossCheckResultListSerializer.php M includes/Serializer/IndexedTagsSerializer.php M includes/Serializer/SerializerFactory.php M includes/UpdateTable/Importer.php M specials/SpecialCrossCheck.php M specials/SpecialExternalDbs.php M tests/phpunit/Api/CrossCheckTest.php M tests/phpunit/CrossCheck/Comparer/DataValueComparerBaseTest.php M tests/phpunit/CrossCheck/Comparer/DataValueComparerFactoryTest.php M tests/phpunit/CrossCheck/Comparer/DispatchingDataValueComparerTest.php M tests/phpunit/CrossCheck/Comparer/EntityIdValueComparerTest.php M tests/phpunit/CrossCheck/Comparer/GlobeCoordinateValueComparerTest.php M tests/phpunit/CrossCheck/Comparer/MonolingualTextValueComparerTest.php M tests/phpunit/CrossCheck/Comparer/MultilingualTextValueComparerTest.php M tests/phpunit/CrossCheck/Comparer/QuantityValueComparerTest.php M tests/phpunit/CrossCheck/Comparer/StringComparerTest.php M tests/phpunit/CrossCheck/Comparer/StringValueComparerTest.php M tests/phpunit/CrossCheck/Comparer/TimeValueComparerTest.php M tests/phpunit/CrossCheck/CrossCheckInteractorTest.php M tests/phpunit/CrossCheck/CrossCheckerTest.php M tests/phpunit/CrossCheck/ReferenceHandlerTest.php M tests/phpunit/CrossCheck/Result/CompareResultTest.php M tests/phpunit/CrossCheck/Result/CrossCheckResultListTest.php M tests/phpunit/CrossCheck/Result/CrossCheckResultTest.php M tests/phpunit/CrossCheck/Result/ReferenceResultTest.php M tests/phpunit/DumpMetaInformation/DumpMetaInformationRepoTest.php M tests/phpunit/DumpMetaInformation/DumpMetaInformationTest.php M tests/phpunit/EvaluateCrossCheckJobServiceTest.php M tests/phpunit/ExternalDataRepoTest.php M tests/phpunit/ExternalValidationFactoryTest.php M tests/phpunit/Serializer/CompareResultSerializerTest.php M tests/phpunit/Serializer/CrossCheckResultListSerializerTest.php M tests/phpunit/Serializer/CrossCheckResultSerializerTest.php M tests/phpunit/Serializer/DumpMetaInformationSerializerTest.php M tests/phpunit/Serializer/IndexedTagsSerializerTest.php M tests/phpunit/Serializer/ReferenceResultSerializerTest.php M tests/phpunit/Serializer/SerializerBaseTest.php M tests/phpunit/Serializer/SerializerFactoryTest.php M tests/phpunit/Specials/SpecialCrossCheckTest.php M tests/phpunit/Specials/SpecialExternalDbsTest.php M tests/phpunit/UpdateTable/ImportContextTest.php M tests/phpunit/UpdateTable/UpdateTableTest.php 65 files changed, 352 insertions(+), 274 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikidataQualityExternalValidation refs/changes/56/217256/1 diff --git a/api/CrossCheck.php b/api/CrossCheck.php index f453a33..5771c6d 100755 --- a/api/CrossCheck.php +++ b/api/CrossCheck.php @@ -85,6 +85,7 @@ /** * @param array $entityIds + * * @return array */ private function parseEntityIds( array $entityIds ) { @@ -126,10 +127,10 @@ $serializedResultList ); } else { - $output[(string)$entityId] = $serializedResultList; + $output[ (string)$entityId ] = $serializedResultList; } } else { - $output[$entityId] = array( + $output[ $entityId ] = array( 'missing' => '' ); } diff --git a/includes/CrossCheck/Comparer/DataValueComparer.php b/includes/CrossCheck/Comparer/DataValueComparer.php index ac86cb4..50a90d8 100755 --- a/includes/CrossCheck/Comparer/DataValueComparer.php +++ b/includes/CrossCheck/Comparer/DataValueComparer.php @@ -9,6 +9,7 @@ /** * Interface DataValueComparer + * * @package WikibaseQuality\ExternalValidation\CrossCheck\Comparer * @author BP2014N1 * @license GNU GPL v2+ @@ -17,6 +18,7 @@ /** * @param string $dataValueType + * * @return bool */ public function isComparerFor( $dataValueType ); @@ -27,6 +29,7 @@ * @param DataValue $localValue * @param array $externalValues * @param DumpMetaInformation $dumpMetaInformation + * * @return CompareResult */ public function compare( DataValue $localValue, array $externalValues, DumpMetaInformation $dumpMetaInformation ); diff --git a/includes/CrossCheck/Comparer/DataValueComparerBase.php b/includes/CrossCheck/Comparer/DataValueComparerBase.php index e6e24cb..5c863cf 100755 --- a/includes/CrossCheck/Comparer/DataValueComparerBase.php +++ b/includes/CrossCheck/Comparer/DataValueComparerBase.php @@ -35,6 +35,7 @@ * * @param array $externalValues * @param DumpMetaInformation $dumpMetaInformation + * * @return array */ protected function parseExternalValues( array $externalValues, DumpMetaInformation $dumpMetaInformation ) { diff --git a/includes/CrossCheck/Comparer/DataValueComparerFactory.php b/includes/CrossCheck/Comparer/DataValueComparerFactory.php index d805325..51a1129 100755 --- a/includes/CrossCheck/Comparer/DataValueComparerFactory.php +++ b/includes/CrossCheck/Comparer/DataValueComparerFactory.php @@ -4,6 +4,7 @@ use Wikibase\Lib\Store\EntityLookup; + /** * Class DataValueComparerFactory * diff --git a/includes/CrossCheck/Comparer/DispatchingDataValueComparer.php b/includes/CrossCheck/Comparer/DispatchingDataValueComparer.php index 3183d2f..6e00e9b 100755 --- a/includes/CrossCheck/Comparer/DispatchingDataValueComparer.php +++ b/includes/CrossCheck/Comparer/DispatchingDataValueComparer.php @@ -2,14 +2,15 @@ namespace WikibaseQuality\ExternalValidation\CrossCheck\Comparer; - use DataValues\DataValue; use Doctrine\Instantiator\Exception\InvalidArgumentException; use WikibaseQuality\ExternalValidation\CrossCheck\Result\CompareResult; use WikibaseQuality\ExternalValidation\DumpMetaInformation\DumpMetaInformation; + /** * Class DispatchingDataValueComparer + * * @package WikibaseQuality\ExternalValidation\CrossCheck\Comparer * @author BP2014N1 * @license GNU GPL v2+ @@ -46,6 +47,7 @@ * @see DataValueComparer::isComparerFor * * @param string $dataValueType + * * @return bool */ public function isComparerFor( $dataValueType ) { @@ -63,6 +65,7 @@ * * @param DataValue $localValue * @param array $externalValues + * * @return CompareResult */ public function compare( DataValue $localValue, array $externalValues, DumpMetaInformation $dumpMetaInformation ) { diff --git a/includes/CrossCheck/Comparer/EntityIdValueComparer.php b/includes/CrossCheck/Comparer/EntityIdValueComparer.php index ba8a97a..bfa7dbd 100755 --- a/includes/CrossCheck/Comparer/EntityIdValueComparer.php +++ b/includes/CrossCheck/Comparer/EntityIdValueComparer.php @@ -45,6 +45,7 @@ * @param DataValue $localValue * @param array $externalValues * @param DumpMetaInformation $dumpMetaInformation + * * @throws InvalidArgumentException * @return CompareResult */ @@ -94,6 +95,7 @@ * @see DataValueComparer::isComparerFor * * @param string $dataValueType + * * @return bool */ public function isComparerFor( $dataValueType ) { diff --git a/includes/CrossCheck/Comparer/GlobeCoordinateValueComparer.php b/includes/CrossCheck/Comparer/GlobeCoordinateValueComparer.php index c88a923..ef1dd56 100755 --- a/includes/CrossCheck/Comparer/GlobeCoordinateValueComparer.php +++ b/includes/CrossCheck/Comparer/GlobeCoordinateValueComparer.php @@ -26,6 +26,7 @@ * @param DataValue $localValue * @param array $externalValues * @param DumpMetaInformation $dumpMetaInformation + * * @throws InvalidArgumentException * @return CompareResult */ @@ -56,6 +57,7 @@ * @see DataValueComparerBase::getExternalValueParser * * @param DumpMetaInformation $dumpMetaInformation + * * @return GlobeCoordinateParser */ protected function getExternalValueParser( DumpMetaInformation $dumpMetaInformation ) { @@ -66,6 +68,7 @@ * @see DataValueComparer::isComparerFor * * @param string $dataValueType + * * @return bool */ public function isComparerFor( $dataValueType ) { diff --git a/includes/CrossCheck/Comparer/MonolingualTextValueComparer.php b/includes/CrossCheck/Comparer/MonolingualTextValueComparer.php index 88f1fab..c5fe57c 100755 --- a/includes/CrossCheck/Comparer/MonolingualTextValueComparer.php +++ b/includes/CrossCheck/Comparer/MonolingualTextValueComparer.php @@ -8,6 +8,7 @@ use WikibaseQuality\ExternalValidation\CrossCheck\Result\CompareResult; use WikibaseQuality\ExternalValidation\DumpMetaInformation\DumpMetaInformation; + /** * Class MonolingualTextValueComparer * @@ -35,6 +36,7 @@ * @param DataValue $localValue * @param array $externalValues * @param DumpMetaInformation $dumpMetaInformation + * * @throws InvalidArgumentException * @return CompareResult */ @@ -57,6 +59,7 @@ * @see DataValueComparer::isComparerFor * * @param string $dataValueType + * * @return bool */ public function isComparerFor( $dataValueType ) { diff --git a/includes/CrossCheck/Comparer/MultilingualTextValueComparer.php b/includes/CrossCheck/Comparer/MultilingualTextValueComparer.php index ecf0a4d..17e1d9b 100755 --- a/includes/CrossCheck/Comparer/MultilingualTextValueComparer.php +++ b/includes/CrossCheck/Comparer/MultilingualTextValueComparer.php @@ -36,6 +36,7 @@ * @param DataValue $localValue * @param array $externalValues * @param DumpMetaInformation $dumpMetaInformation + * * @throws InvalidArgumentException * @return CompareResult */ @@ -62,6 +63,7 @@ * @see DataValueComparer::isComparerFor * * @param string $dataValueType + * * @return bool */ public function isComparerFor( $dataValueType ) { diff --git a/includes/CrossCheck/Comparer/QuantityValueComparer.php b/includes/CrossCheck/Comparer/QuantityValueComparer.php index f7661d1..0e0c7dd 100755 --- a/includes/CrossCheck/Comparer/QuantityValueComparer.php +++ b/includes/CrossCheck/Comparer/QuantityValueComparer.php @@ -27,6 +27,7 @@ * @param DataValue $localValue * @param array $externalValues * @param DumpMetaInformation $dumpMetaInformation + * * @throws InvalidArgumentException * @return CompareResult */ @@ -40,7 +41,7 @@ $status = CompareResult::STATUS_MISMATCH; foreach ( $externalValues as $externalValue ) { if ( $externalValue->getLowerBound() <= $localValue->getUpperBound() && - $externalValue->getUpperBound() >= $localValue->getLowerBound() + $externalValue->getUpperBound() >= $localValue->getLowerBound() ) { $status = CompareResult::STATUS_MATCH; break; @@ -55,6 +56,7 @@ * @see DataValueComparerBase::getExternalValueParser * * @param DumpMetaInformation $dumpMetaInformation + * * @return QuantityParser */ protected function getExternalValueParser( DumpMetaInformation $dumpMetaInformation ) { @@ -68,6 +70,7 @@ * @see DataValueComparer::isComparerFor * * @param string $dataValueType + * * @return bool */ public function isComparerFor( $dataValueType ) { diff --git a/includes/CrossCheck/Comparer/StringComparer.php b/includes/CrossCheck/Comparer/StringComparer.php index d20e625..147e823 100755 --- a/includes/CrossCheck/Comparer/StringComparer.php +++ b/includes/CrossCheck/Comparer/StringComparer.php @@ -5,6 +5,7 @@ use Doctrine\Instantiator\Exception\InvalidArgumentException; use WikibaseQuality\ExternalValidation\CrossCheck\Result\CompareResult; + /** * Class StringComparer * @@ -24,6 +25,7 @@ * * @param string $value * @param string $comparativeValue + * * @return string */ public function compare( $value, $comparativeValue ) { @@ -46,6 +48,7 @@ * * @param string $value * @param array $comparativeValues + * * @return string */ public function compareArray( $value, array $comparativeValues ) { @@ -72,6 +75,7 @@ * * @param array $values * @param array $comparativeValues + * * @return string */ public function compareArrays( array $values, array $comparativeValues ) { @@ -98,6 +102,7 @@ /** * @param mixed $value * @param string $parameterName + * * @throws InvalidArgumentException */ private function assertIsString( $value, $parameterName ) { @@ -109,6 +114,7 @@ /** * @param mixed $values * @param string $parameterName + * * @throws InvalidArgumentException */ private function assertIsArrayOfStrings( $values, $parameterName ) { @@ -124,6 +130,7 @@ * * @param string $value * @param string $comparativeValue + * * @return bool */ private function checkSimilarity( $value, $comparativeValue ) { @@ -173,8 +180,8 @@ $localLength = strlen( $value ); $externalLength = strlen( $comparativeValue ); while ( $prefixLength < min( $localLength, $externalLength ) ) { - $c = $value[$prefixLength]; - if ( $externalLength > $prefixLength && $comparativeValue[$prefixLength] !== $c ) { + $c = $value[ $prefixLength ]; + if ( $externalLength > $prefixLength && $comparativeValue[ $prefixLength ] !== $c ) { break; } $prefixLength++; @@ -196,8 +203,8 @@ $localLength = strlen( $value ); $externalLength = strlen( $comparativeValue ); while ( $suffixLength < min( $localLength, $externalLength ) ) { - $c = $value[$localLength - 1 - $suffixLength]; - if ( $externalLength > $suffixLength && $comparativeValue[$externalLength - 1 - $suffixLength] !== $c ) { + $c = $value[ $localLength - 1 - $suffixLength ]; + if ( $externalLength > $suffixLength && $comparativeValue[ $externalLength - 1 - $suffixLength ] !== $c ) { break; } $suffixLength++; diff --git a/includes/CrossCheck/Comparer/StringValueComparer.php b/includes/CrossCheck/Comparer/StringValueComparer.php index f3fd6b9..6c87677 100755 --- a/includes/CrossCheck/Comparer/StringValueComparer.php +++ b/includes/CrossCheck/Comparer/StringValueComparer.php @@ -36,6 +36,7 @@ * @param DataValue $localValue * @param array $externalValues * @param DumpMetaInformation $dumpMetaInformation + * * @throws \InvalidArgumentException * @return CompareResult */ @@ -58,6 +59,7 @@ * @see DataValueComparer::isComparerFor * * @param string $dataValueType + * * @return bool */ public function isComparerFor( $dataValueType ) { diff --git a/includes/CrossCheck/Comparer/TimeValueComparer.php b/includes/CrossCheck/Comparer/TimeValueComparer.php index 0dfc4cc..4a63552 100755 --- a/includes/CrossCheck/Comparer/TimeValueComparer.php +++ b/includes/CrossCheck/Comparer/TimeValueComparer.php @@ -30,6 +30,7 @@ * @param DataValue $localValue * @param array $externalValues * @param DumpMetaInformation $dumpMetaInformation + * * @throws InvalidArgumentException * @return CompareResult */ @@ -62,6 +63,7 @@ * @see DataValueComparerBase::getExternalValueParser * * @param DumpMetaInformation $dumpMetaInformation + * * @return ValueParser */ protected function getExternalValueParser( DumpMetaInformation $dumpMetaInformation ) { @@ -76,6 +78,7 @@ * @see DataValueComparer::isComparerFor * * @param string $dataValueType + * * @return bool */ public function isComparerFor( $dataValueType ) { diff --git a/includes/CrossCheck/CrossCheckInteractor.php b/includes/CrossCheck/CrossCheckInteractor.php index 207b902..945f992 100755 --- a/includes/CrossCheck/CrossCheckInteractor.php +++ b/includes/CrossCheck/CrossCheckInteractor.php @@ -47,11 +47,11 @@ $this->crossChecker = $crossChecker; } - /** * Runs cross-check for all statements of multiple entities represented by ids. * * @param EntityId $entityId + * * @return CrossCheckResultList */ public function crossCheckEntityById( EntityId $entityId ) { @@ -66,6 +66,7 @@ * Runs cross-check for all statements of a single entity represented by id. * * @param EntityId[] $entityIds + * * @return CrossCheckResultList[] */ public function crossCheckEntitiesByIds( array $entityIds ) { @@ -73,17 +74,17 @@ $results = array(); foreach ( $entityIds as $entityId ) { - $results[$entityId->getSerialization()] = $this->crossCheckEntityById( $entityId ); + $results[ $entityId->getSerialization() ] = $this->crossCheckEntityById( $entityId ); } return $results; } - /** * Runs cross-check for all statements of a single entity. * * @param Entity $entity + * * @return CrossCheckResultList */ public function crossCheckEntity( Entity $entity ) { @@ -95,6 +96,7 @@ * Runs cross-check for all statements of multiple entities. * * @param Entity[] $entities + * * @return CrossCheckResultList[] * @throws InvalidArgumentException */ @@ -104,18 +106,18 @@ $results = array(); foreach ( $entities as $entity ) { $entityId = $entity->getId()->getSerialization(); - $results[$entityId] = $this->crossCheckEntity( $entity ); + $results[ $entityId ] = $this->crossCheckEntity( $entity ); } return $results; } - /** * Runs cross-check for all statements with any of the given property ids of a single entity represented by its id. * * @param EntityId $entityId * @param PropertyId[] $propertyIds + * * @return CrossCheckResultList * @throws InvalidArgumentException */ @@ -134,6 +136,7 @@ * * @param EntityId[] $entityIds * @param PropertyId[] $propertyIds + * * @return CrossCheckResultList[] * @throws InvalidArgumentException */ @@ -143,18 +146,18 @@ $results = array(); foreach ( $entityIds as $entityId ) { - $results[$entityId->getSerialization()] = $this->crossCheckEntityByIdWithProperties( $entityId, $propertyIds ); + $results[ $entityId->getSerialization() ] = $this->crossCheckEntityByIdWithProperties( $entityId, $propertyIds ); } return $results; } - /** * Runs cross-check for all statements with any of the given property ids of a single entity. * * @param Entity $entity * @param PropertyId[] $propertyIds + * * @return CrossCheckResultList * @throws InvalidArgumentException */ @@ -176,6 +179,7 @@ * * @param Entity[] $entities * @param PropertyId[] $propertyIds + * * @return CrossCheckResultList[] * @throws InvalidArgumentException */ @@ -186,17 +190,17 @@ $results = array(); foreach ( $entities as $entity ) { $entityId = $entity->getId()->getSerialization(); - $results[$entityId] = $this->crossCheckEntityWithProperties( $entity, $propertyIds ); + $results[ $entityId ] = $this->crossCheckEntityWithProperties( $entity, $propertyIds ); } return $results; } - /** * Runs cross-check for a single claim. * * @param string $claimGuid + * * @return CrossCheckResultList * @throws InvalidArgumentException */ @@ -212,6 +216,7 @@ * Runs cross-check for multiple claims. * * @param string[] $claimGuids + * * @return CrossCheckResultList[] * @throws InvalidArgumentException */ @@ -222,13 +227,13 @@ $groupedClaimGuids = array(); foreach ( $claimGuids as $claimGuid ) { $serializedEntityId = $this->claimGuidParser->parse( $claimGuid )->getEntityId(); - $entityIds[$serializedEntityId->getSerialization()] = $serializedEntityId; - $groupedClaimGuids[$serializedEntityId->getSerialization()][] = $claimGuid; + $entityIds[ $serializedEntityId->getSerialization() ] = $serializedEntityId; + $groupedClaimGuids[ $serializedEntityId->getSerialization() ][] = $claimGuid; } $resultLists = array(); foreach ( $groupedClaimGuids as $serializedEntityId => $claimGuidsPerEntity ) { - $entityId = $entityIds[$serializedEntityId]; + $entityId = $entityIds[ $serializedEntityId ]; $entity = $this->entityLookup->getEntity( $entityId ); if ( $entity ) { @@ -239,19 +244,19 @@ } } - $resultLists[$entityId->getSerialization()] = $this->crossChecker->crossCheckStatements( $entity, $statements ); + $resultLists[ $entityId->getSerialization() ] = $this->crossChecker->crossCheckStatements( $entity, $statements ); } else { - $resultLists[$entityId->getSerialization()] = null; + $resultLists[ $entityId->getSerialization() ] = null; } } return $resultLists; } - /** * @param array $entityIds * @param string $parameterName + * * @throws InvalidArgumentException */ private function assertIsArrayOfEntityIds( array $entityIds, $parameterName ) { @@ -265,6 +270,7 @@ /** * @param array $entities * @param string $parameterName + * * @throws InvalidArgumentException */ private function assertIsArrayOfEntities( array $entities, $parameterName ) { @@ -278,6 +284,7 @@ /** * @param array $propertyIds * @param string $parameterName + * * @throws InvalidArgumentException */ private function assertIsArrayOfPropertyIds( array $propertyIds, $parameterName ) { @@ -291,6 +298,7 @@ /** * @param string $string * @param string $parameterName + * * @throws InvalidArgumentException */ private function assertIsString( $string, $parameterName ) { @@ -302,6 +310,7 @@ /** * @param array $strings * @param string $parameterName + * * @throws InvalidArgumentException */ private function assertIsArrayOfStrings( array $strings, $parameterName ) { diff --git a/includes/CrossCheck/CrossChecker.php b/includes/CrossCheck/CrossChecker.php index 1524a4e..0e20cfa 100755 --- a/includes/CrossCheck/CrossChecker.php +++ b/includes/CrossCheck/CrossChecker.php @@ -101,6 +101,7 @@ * Gets those dump ids from database, that are applicable for cross-checks with the given entity * * @param Entity $entity + * * @return array */ private function getApplicableDumps( Entity $entity ) { @@ -109,7 +110,7 @@ $dumpMetaInformation = $this->dumpMetaInformationRepo->getWithIdentifierProperties( $identifierPropertyIds ); foreach ( $dumpMetaInformation as $dump ) { foreach ( $dump->getIdentifierPropertyIds() as $identifierPropertyId ) { - $applicableDumps[$identifierPropertyId->getSerialization()][$dump->getDumpId()] = $dump; + $applicableDumps[ $identifierPropertyId->getSerialization() ][ $dump->getDumpId() ] = $dump; } } @@ -137,7 +138,7 @@ $resultList = new CrossCheckResultList(); foreach ( $externalData as $dumpId => $externalDataPerDump ) { - $dumpMetaInformation = $dumpMetaInformationList[$dumpId]; + $dumpMetaInformation = $dumpMetaInformationList[ $dumpId ]; foreach ( $externalDataPerDump as $externalId => $externalDataPerId ) { $externalId = (string)$externalId; diff --git a/includes/CrossCheck/ReferenceHandler.php b/includes/CrossCheck/ReferenceHandler.php index 50009ff..7ce09d1 100755 --- a/includes/CrossCheck/ReferenceHandler.php +++ b/includes/CrossCheck/ReferenceHandler.php @@ -35,6 +35,7 @@ * @param PropertyId $identifierPropertyId * @param string $externalId * @param DumpMetaInformation $dumpMetaInformation + * * @throws InvalidArgumentException * @return ReferenceResult */ @@ -58,6 +59,7 @@ * Returns references of given Statement * * @param Statement $statement * + * * @return array */ private function getReferences( Statement $statement ) { @@ -78,6 +80,7 @@ * @param PropertyId $identifierPropertyId * @param string $externalId * @param DumpMetaInformation $dumpMetaInformation + * * @return Reference */ private function buildReference( PropertyId $identifierPropertyId, $externalId, DumpMetaInformation $dumpMetaInformation ) { diff --git a/includes/CrossCheck/Result/CrossCheckResult.php b/includes/CrossCheck/Result/CrossCheckResult.php index dc7b92b..a4d3726 100755 --- a/includes/CrossCheck/Result/CrossCheckResult.php +++ b/includes/CrossCheck/Result/CrossCheckResult.php @@ -65,6 +65,7 @@ * @param DumpMetaInformation $dumpMetaInformation * @param CompareResult $compareResult * @param ReferenceResult $referenceResult + * * @throws InvalidArgumentException */ public function __construct( PropertyId $propertyId, $claimGuid, $externalId, DumpMetaInformation $dumpMetaInformation, CompareResult $compareResult, ReferenceResult $referenceResult ) { diff --git a/includes/CrossCheck/Result/CrossCheckResultList.php b/includes/CrossCheck/Result/CrossCheckResultList.php index 4d0c1e9..8474d35 100755 --- a/includes/CrossCheck/Result/CrossCheckResultList.php +++ b/includes/CrossCheck/Result/CrossCheckResultList.php @@ -25,6 +25,7 @@ /** * @param array $results + * * @throws InvalidArgumentException */ public function __construct( array $results = array() ) { diff --git a/includes/CrossCheck/Result/ReferenceResult.php b/includes/CrossCheck/Result/ReferenceResult.php index a2eba3f..da510a5 100755 --- a/includes/CrossCheck/Result/ReferenceResult.php +++ b/includes/CrossCheck/Result/ReferenceResult.php @@ -41,8 +41,10 @@ public function __construct( $status, Reference $reference ) { if ( !is_string( $status ) ) { throw new InvalidArgumentException( '$status must be string.' ); - } else if ( !in_array( $status, array( self::STATUS_REFERENCES_MISSING, self::STATUS_REFERENCES_STATED ) ) ) { - throw new InvalidArgumentException( '$status must be a valid reference status.' ); + } else { + if ( !in_array( $status, array( self::STATUS_REFERENCES_MISSING, self::STATUS_REFERENCES_STATED ) ) ) { + throw new InvalidArgumentException( '$status must be a valid reference status.' ); + } } $this->status = $status; diff --git a/includes/DumpMetaInformation/DumpMetaInformationRepo.php b/includes/DumpMetaInformation/DumpMetaInformationRepo.php index 91a6109..51a41a8 100755 --- a/includes/DumpMetaInformation/DumpMetaInformationRepo.php +++ b/includes/DumpMetaInformation/DumpMetaInformationRepo.php @@ -14,6 +14,7 @@ /** * Class DumpMetaInformationRepo + * * @package WikibaseQuality\ExternalValidation\DumpMetaInformation * @author BP2014N1 * @license GNU GPL v2+ @@ -78,6 +79,7 @@ * Gets DumpMetaInformation for specific dump id from database. * * @param $dumpId + * * @return DumpMetaInformation * @throws InvalidArgumentException */ @@ -96,6 +98,7 @@ * Returns array in the form 'dumpId' => DumpMetaInformation * * @param string[] $dumpIds + * * @return DumpMetaInformation[] * @throws InvalidArgumentException */ @@ -124,6 +127,7 @@ * Returns array in the form 'dumpId' => DumpMetaInformation * * @param array $identifierPropertyIds + * * @return DumpMetaInformation[] */ public function getWithIdentifierProperties( array $identifierPropertyIds ) { @@ -177,6 +181,7 @@ /** * @param DatabaseBase $db * @param array|string $conditions + * * @return DumpMetaInformation[] */ private function getFromDb( DatabaseBase $db, $conditions = '' ) { @@ -207,6 +212,7 @@ /** * @param ResultWrapper $result + * * @return null|array * @throws UnexpectedValueException */ @@ -215,13 +221,13 @@ foreach ( $result as $row ) { if ( array_key_exists( $row->dump_id, $aggregatedRows ) ) { $propertyId = $this->entityIdParser->parse( $row->identifier_pid ); - $aggregatedRows[$row->dump_id]->identifier_pid[] = $propertyId; + $aggregatedRows[ $row->dump_id ]->identifier_pid[] = $propertyId; } else { if ( $row->identifier_pid !== null ) { $propertyId = $this->entityIdParser->parse( $row->identifier_pid ); $row->identifier_pid = array( $propertyId ); } - $aggregatedRows[$row->dump_id] = $row; + $aggregatedRows[ $row->dump_id ] = $row; } } @@ -239,12 +245,11 @@ $licenseItemId = $this->entityIdParser->parse( $row->license_qid ); $identifierPropertyIds = $row->identifier_pid; - $dumpMetaInformation[$row->dump_id] = new DumpMetaInformation( $dumpId, $sourceItemId, $identifierPropertyIds, $importDate, $language, $sourceUrl, $size, $licenseItemId ); + $dumpMetaInformation[ $row->dump_id ] = new DumpMetaInformation( $dumpId, $sourceItemId, $identifierPropertyIds, $importDate, $language, $sourceUrl, $size, $licenseItemId ); } return $dumpMetaInformation; } - /** * Inserts or updates given dump meta information to database @@ -295,6 +300,7 @@ /** * @param DumpMetaInformation $dumpMetaInformation * + * * @return array */ private function getDumpInformationArray( DumpMetaInformation $dumpMetaInformation ) { diff --git a/includes/EvaluateCrossCheckJob.php b/includes/EvaluateCrossCheckJob.php index 3358d91..2677c76 100755 --- a/includes/EvaluateCrossCheckJob.php +++ b/includes/EvaluateCrossCheckJob.php @@ -5,6 +5,7 @@ use Job; use Title; + /** * Class EvaluateCrossCheckJob * diff --git a/includes/EvaluateCrossCheckJobService.php b/includes/EvaluateCrossCheckJobService.php index 57b5e21..5e78c3f 100755 --- a/includes/EvaluateCrossCheckJobService.php +++ b/includes/EvaluateCrossCheckJobService.php @@ -7,6 +7,7 @@ use WikibaseQuality\ExternalValidation\CrossCheck\Result\CompareResult; use WikibaseQuality\ExternalValidation\CrossCheck\Result\ReferenceResult; + /** * Class EvaluateCrossCheckJobService * diff --git a/includes/ExternalDataRepo.php b/includes/ExternalDataRepo.php index 11f3c7e..b92961c 100755 --- a/includes/ExternalDataRepo.php +++ b/includes/ExternalDataRepo.php @@ -54,6 +54,7 @@ * @param array $dumpIds * @param array $externalIds * @param PropertyId[] $statements * + * * @return array */ public function get( array $dumpIds, array $externalIds, array $propertyIds ) { @@ -85,7 +86,7 @@ ); foreach ( $result as $row ) { - $externalData[$row->dump_id][$row->external_id][$row->pid][] = $row->external_value; + $externalData[ $row->dump_id ][ $row->external_id ][ $row->pid ][] = $row->external_value; } return $externalData; @@ -98,6 +99,7 @@ * @param string $externalId * @param PropertyId $propertyId * @param string $externalValue + * * @return bool */ public function insert( $dumpId, $externalId, PropertyId $propertyId, $externalValue ) { @@ -113,6 +115,7 @@ * Inserts a batch of external data. * * @param array $externalDataBatch + * * @return bool */ public function insertBatch( array $externalDataBatch ) { @@ -140,6 +143,7 @@ * * @param string $dumpId * @param int $batchSize + * * @throws \DBUnexpectedError */ public function deleteOfDump( $dumpId, $batchSize = 1000 ) { @@ -154,6 +158,7 @@ * * @param array $dumpIds * @param int $batchSize + * * @throws \DBUnexpectedError */ public function deleteOfDumps( array $dumpIds, $batchSize = 1000 ) { @@ -179,6 +184,7 @@ * * @param string $columnName * @param array $values + * * @return string */ private static function buildSqlInCondition( DatabaseBase $db, $columnName, array $values ) { diff --git a/includes/Serializer/CrossCheckResultListSerializer.php b/includes/Serializer/CrossCheckResultListSerializer.php index 432fb0c..b4f8776 100755 --- a/includes/Serializer/CrossCheckResultListSerializer.php +++ b/includes/Serializer/CrossCheckResultListSerializer.php @@ -67,14 +67,14 @@ foreach ( $resultList->getPropertyIds() as $propertyId ) { if ( $this->shouldIndexTags() ) { $index = count( $serialization ); - $serialization[$index]['id'] = $propertyId->getSerialization(); - $this->setIndexedTagName( $serialization[$index], 'result' ); + $serialization[ $index ]['id'] = $propertyId->getSerialization(); + $this->setIndexedTagName( $serialization[ $index ], 'result' ); } else { $index = (string)$propertyId; } foreach ( $resultList->getWithPropertyId( $propertyId ) as $result ) { - $serialization[$index][] = $this->crossCheckResultSerializer->serialize( $result ); + $serialization[ $index ][] = $this->crossCheckResultSerializer->serialize( $result ); } } diff --git a/includes/Serializer/IndexedTagsSerializer.php b/includes/Serializer/IndexedTagsSerializer.php index c0c4d21..c2ea79a 100755 --- a/includes/Serializer/IndexedTagsSerializer.php +++ b/includes/Serializer/IndexedTagsSerializer.php @@ -18,6 +18,7 @@ /** * Determines, if tags should be indexed. + * * @var bool */ private $shouldIndexTags; @@ -37,6 +38,7 @@ * @see Serializer::serialize * * @param mixed $object + * * @return array|int|string|bool|float A possibly nested structure consisting of only arrays and scalar values */ abstract public function serialize( $object ); diff --git a/includes/Serializer/SerializerFactory.php b/includes/Serializer/SerializerFactory.php index 3660b8f..355483f 100755 --- a/includes/Serializer/SerializerFactory.php +++ b/includes/Serializer/SerializerFactory.php @@ -4,6 +4,7 @@ use Serializers\Serializer; + /** * Class SerializerFactory * @@ -36,6 +37,7 @@ * Returns a serializer that can serialize CrossCheckResultList objects * * @param bool $shouldIndexTags + * * @return Serializer */ public function newCrossCheckResultListSerializer( $shouldIndexTags = false ) { @@ -49,6 +51,7 @@ * Returns a serializer that can serialize CrossCheckResult objects * * @param bool $shouldIndexTags + * * @return Serializer */ public function newCrossCheckResultSerializer( $shouldIndexTags = false ) { @@ -63,6 +66,7 @@ * Returns a serializer that can serialize DumpMetaInformation objects * * @param bool $shouldIndexTags + * * @return Serializer */ public function newDumpMetaInformationSerializer( $shouldIndexTags = false ) { @@ -73,6 +77,7 @@ * Returns a serializer that can serialize CompareResult objects * * @param bool $shouldIndexTags + * * @return Serializer */ public function newCompareResultSerializer( $shouldIndexTags = false ) { diff --git a/includes/UpdateTable/Importer.php b/includes/UpdateTable/Importer.php index 10492c2..1be4d53 100755 --- a/includes/UpdateTable/Importer.php +++ b/includes/UpdateTable/Importer.php @@ -146,7 +146,6 @@ $dumpIds[] = $dumpMetaInformation->getDumpId(); $this->dumpMetaInformationRepo->save( $dumpMetaInformation ); - $i++; if ( !$this->importContext->isQuiet() ) { print "\r\033[K"; diff --git a/specials/SpecialCrossCheck.php b/specials/SpecialCrossCheck.php index 6c60c88..ba700be 100755 --- a/specials/SpecialCrossCheck.php +++ b/specials/SpecialCrossCheck.php @@ -104,7 +104,6 @@ $this->crossCheckInteractor = ExternalValidationFactory::getDefaultInstance()->getCrossCheckInteractor(); } - /** * @see SpecialPage::getGroupName * @@ -283,8 +282,8 @@ */ private function buildResultHeader( EntityId $entityId ) { $entityLink = sprintf( '%s (%s)', - $this->entityIdHtmlLinkFormatter->formatEntityId( $entityId ), - htmlspecialchars( $entityId->getSerialization() ) ); + $this->entityIdHtmlLinkFormatter->formatEntityId( $entityId ), + htmlspecialchars( $entityId->getSerialization() ) ); return Html::rawElement( @@ -306,9 +305,9 @@ foreach ( $results as $result ) { $status = strtolower( $result->getCompareResult()->getStatus() ); if ( array_key_exists( $status, $statuses ) ) { - $statuses[$status]++; + $statuses[ $status ]++; } else { - $statuses[$status] = 1; + $statuses[ $status ] = 1; } } diff --git a/specials/SpecialExternalDbs.php b/specials/SpecialExternalDbs.php index ce5ee01..3a299a9 100755 --- a/specials/SpecialExternalDbs.php +++ b/specials/SpecialExternalDbs.php @@ -2,7 +2,6 @@ namespace WikibaseQuality\ExternalValidation\Specials; - use DateInterval; use DateTime; use DateTimeZone; @@ -97,7 +96,7 @@ $groupedDumpMetaInformation = array(); foreach ( $dumps as $dump ) { $sourceItemId = $dump->getSourceItemId()->getSerialization(); - $groupedDumpMetaInformation[$sourceItemId][] = $dump; + $groupedDumpMetaInformation[ $sourceItemId ][] = $dump; } $table = new HtmlTableBuilder( diff --git a/tests/phpunit/Api/CrossCheckTest.php b/tests/phpunit/Api/CrossCheckTest.php index 81e2166..360062d 100755 --- a/tests/phpunit/Api/CrossCheckTest.php +++ b/tests/phpunit/Api/CrossCheckTest.php @@ -11,6 +11,7 @@ use Wikibase\Repo\WikibaseRepo; use Wikibase\Test\Api\WikibaseApiTestCase; + /** * @covers WikibaseQuality\ExternalValidation\Api\CrossCheck * @@ -40,6 +41,7 @@ * @license GNU GPL v2+ */ class CrossCheckTest extends WikibaseApiTestcase { + /** * Id of a item that (hopefully) does not exist. */ @@ -55,7 +57,6 @@ /** @var bool */ private static $hasSetup; - protected function setup() { parent::setup(); @@ -190,8 +191,8 @@ $entityIdP1 = self::$idMap['P1']->getSerialization(); $entityIdP2 = self::$idMap['P2']->getSerialization(); $this->assertArrayHasKey( $entityIdQ1, $result[0]['results'] ); - $this->assertArrayHasKey( $entityIdP1, $result[0]['results'][$entityIdQ1] ); - $this->assertArrayHasKey( $entityIdP2, $result[0]['results'][$entityIdQ1] ); + $this->assertArrayHasKey( $entityIdP1, $result[0]['results'][ $entityIdQ1 ] ); + $this->assertArrayHasKey( $entityIdP2, $result[0]['results'][ $entityIdQ1 ] ); } public function testExecutePropertyFilter() { @@ -205,8 +206,8 @@ $entityIdP1 = self::$idMap['P1']->getSerialization(); $entityIdP2 = self::$idMap['P2']->getSerialization(); $this->assertArrayHasKey( $entityIdQ1, $result[0]['results'] ); - $this->assertArrayHasKey( $entityIdP1, $result[0]['results'][$entityIdQ1] ); - $this->assertArrayNotHasKey( $entityIdP2, $result[0]['results'][$entityIdQ1] ); + $this->assertArrayHasKey( $entityIdP1, $result[0]['results'][ $entityIdQ1 ] ); + $this->assertArrayNotHasKey( $entityIdP2, $result[0]['results'][ $entityIdQ1 ] ); } public function testExecuteNotExistentItem() { @@ -216,7 +217,7 @@ ); $result = $this->doApiRequest( $params ); $this->assertArrayHasKey( self::NOT_EXISTENT_ITEM_ID, $result[0]['results'] ); - $this->assertArrayHasKey( 'missing', $result[0]['results'][self::NOT_EXISTENT_ITEM_ID] ); + $this->assertArrayHasKey( 'missing', $result[0]['results'][ self::NOT_EXISTENT_ITEM_ID ] ); } public function testExecuteSingleClaim() { @@ -228,8 +229,8 @@ $entityIdQ1 = self::$idMap['Q1']->getSerialization(); $entityIdP1 = self::$idMap['P1']->getSerialization(); $this->assertArrayHasKey( $entityIdQ1, $result[0]['results'] ); - $this->assertArrayHasKey( $entityIdP1, $result[0]['results'][$entityIdQ1] ); - foreach ( $result[0]['results'][$entityIdQ1][$entityIdP1] as $compareResult ) { + $this->assertArrayHasKey( $entityIdP1, $result[0]['results'][ $entityIdQ1 ] ); + foreach ( $result[0]['results'][ $entityIdQ1 ][ $entityIdP1 ] as $compareResult ) { $this->assertArrayHasKey( 'claimGuid', $compareResult ); $this->assertEquals( self::$claimGuids['P1'], $compareResult['claimGuid'] ); } @@ -242,7 +243,7 @@ ); $result = $this->doApiRequest( $params ); $this->assertArrayHasKey( self::NOT_EXISTENT_ITEM_ID, $result[0]['results'] ); - $this->assertArrayHasKey( 'missing', $result[0]['results'][self::NOT_EXISTENT_ITEM_ID] ); + $this->assertArrayHasKey( 'missing', $result[0]['results'][ self::NOT_EXISTENT_ITEM_ID ] ); } public function testExecuteInvalidClaimGuid() { diff --git a/tests/phpunit/CrossCheck/Comparer/DataValueComparerBaseTest.php b/tests/phpunit/CrossCheck/Comparer/DataValueComparerBaseTest.php index b56526d..e37a754 100755 --- a/tests/phpunit/CrossCheck/Comparer/DataValueComparerBaseTest.php +++ b/tests/phpunit/CrossCheck/Comparer/DataValueComparerBaseTest.php @@ -5,6 +5,7 @@ use DataValues\DataValue; use WikibaseQuality\ExternalValidation\CrossCheck\Comparer\DataValueComparer; + /** * @group WikibaseQualityExternalValidation * @@ -18,11 +19,9 @@ */ protected abstract function buildComparer(); - public function testImplementsDataValueComparerInterface() { $this->assertInstanceOf( 'WikibaseQuality\ExternalValidation\CrossCheck\Comparer\DataValueComparer', $this->buildComparer() ); } - /** * @dataProvider comparableProvider @@ -34,7 +33,6 @@ public abstract function comparableProvider(); - /** * @dataProvider nonComparableProvider */ @@ -45,7 +43,6 @@ public abstract function nonComparableProvider(); - /** * @dataProvider nonComparableProvider */ @@ -53,7 +50,6 @@ $this->setExpectedException( 'InvalidArgumentException' ); $this->buildComparer()->compare( $dataValue, array(), $this->getDumpMetaInformationMock() ); } - /** * @dataProvider comparisonProvider @@ -70,16 +66,15 @@ public abstract function comparisonProvider(); - protected function getDumpMetaInformationMock( $language = 'en' ) { $mock = $this->getMockBuilder( 'WikibaseQuality\ExternalValidation\DumpMetaInformation\DumpMetaInformation' ) - ->disableOriginalConstructor() - ->setMethods( array( 'getLanguage' ) ) - ->getMock(); + ->disableOriginalConstructor() + ->setMethods( array( 'getLanguage' ) ) + ->getMock(); $mock->expects( $this->any() ) - ->method( 'getLanguage' ) - ->willReturn( $language ); + ->method( 'getLanguage' ) + ->willReturn( $language ); return $mock; } diff --git a/tests/phpunit/CrossCheck/Comparer/DataValueComparerFactoryTest.php b/tests/phpunit/CrossCheck/Comparer/DataValueComparerFactoryTest.php index 29a57e1..41ec8d8 100755 --- a/tests/phpunit/CrossCheck/Comparer/DataValueComparerFactoryTest.php +++ b/tests/phpunit/CrossCheck/Comparer/DataValueComparerFactoryTest.php @@ -2,7 +2,6 @@ namespace WikibaseQuality\ExternalValidation\Tests\CrossCheck\Comparer; - use DataValues\DataValue; use DataValues\Geo\Values\GlobeCoordinateValue; use DataValues\LatLongValue; @@ -17,6 +16,7 @@ use WikibaseQuality\ExternalValidation\CrossCheck\Comparer\DataValueComparerFactory; use WikibaseQuality\ExternalValidation\DumpMetaInformation\DumpMetaInformation; use WikibaseQuality\Tests\Helper\JsonFileEntityLookup; + /** * @covers WikibaseQuality\ExternalValidation\CrossCheck\Comparer\DataValueComparerFactory @@ -68,7 +68,6 @@ parent::tearDown(); } - private function buildDataValueComparerFactory() { return new DataValueComparerFactory( new JsonFileEntityLookup( __DIR__ . '/testdata' ) @@ -87,17 +86,16 @@ private function getDumpMetaInformationMock( $language = 'en' ) { $mock = $this->getMockBuilder( 'WikibaseQuality\ExternalValidation\DumpMetaInformation\DumpMetaInformation' ) - ->disableOriginalConstructor() - ->setMethods( array( 'getLanguage' ) ) - ->getMock(); + ->disableOriginalConstructor() + ->setMethods( array( 'getLanguage' ) ) + ->getMock(); $mock->expects( $this->any() ) - ->method( 'getLanguage' ) - ->willReturn( $language ); + ->method( 'getLanguage' ) + ->willReturn( $language ); return $mock; } - public function testNewEntityIdValueComparer() { $this->assertEntityIdValueComparesWithoutException( @@ -114,7 +112,6 @@ ); } - public function testNewGlobeCoordinateValueComparer() { $this->assertGlobeCoordinateValueComparesWithoutException( $this->buildDataValueComparerFactory()->newGlobeCoordinateValueComparer() @@ -129,7 +126,6 @@ $this->getDumpMetaInformationMock() ); } - public function testNewMonolingualTextValueComparer() { $this->assertMonolingualTextValueComparesWithoutException( @@ -146,7 +142,6 @@ ); } - public function testNewMultilingualTextValueComparer() { $this->assertMultilingualTextValueComparesWithoutException( $this->buildDataValueComparerFactory()->newMultilingualTextValueComparer() @@ -161,7 +156,6 @@ $this->getDumpMetaInformationMock( 'en' ) ); } - public function testNewQuantityValueComparer() { $this->assertQuantityValueComparesWithoutException( @@ -178,7 +172,6 @@ ); } - public function testNewStringValueComparer() { $this->assertStringValueComparesWithoutException( $this->buildDataValueComparerFactory()->newStringValueComparer() @@ -194,7 +187,6 @@ ); } - public function testNewTimeValueComparer() { $this->assertTimeValueComparesWithoutException( $this->buildDataValueComparerFactory()->newTimeValueComparer() @@ -209,7 +201,6 @@ $this->getDumpMetaInformationMock( 'de' ) ); } - public function testNewDispatchingDataValueComparer() { $dataValueComparer = $this->buildDataValueComparerFactory()->newDispatchingDataValueComparer(); diff --git a/tests/phpunit/CrossCheck/Comparer/DispatchingDataValueComparerTest.php b/tests/phpunit/CrossCheck/Comparer/DispatchingDataValueComparerTest.php index cbec464..7dab979 100755 --- a/tests/phpunit/CrossCheck/Comparer/DispatchingDataValueComparerTest.php +++ b/tests/phpunit/CrossCheck/Comparer/DispatchingDataValueComparerTest.php @@ -2,7 +2,6 @@ namespace WikibaseQuality\ExternalValidation\Tests\CrossCheck\Comparer; - use DataValues\MonolingualTextValue; use DataValues\MultilingualTextValue; use DataValues\QuantityValue; @@ -83,19 +82,19 @@ private function mockDataValueComparer( $isComparerFor, $compareResult ) { $mock = $this->getMockBuilder( 'WikibaseQuality\ExternalValidation\CrossCheck\Comparer\DataValueComparer' ) - ->setMethods( array( 'isComparerFor', 'compare' ) ) - ->getMock(); + ->setMethods( array( 'isComparerFor', 'compare' ) ) + ->getMock(); $mock->expects( $this->any() ) - ->method( 'compare' ) - ->willReturn( $compareResult ); + ->method( 'compare' ) + ->willReturn( $compareResult ); $mock->expects( $this->any() ) - ->method( 'isComparerFor' ) - ->willReturnCallback( - function ( $dataValueType ) use ( $isComparerFor ) { - return $dataValueType == $isComparerFor; - } - ); + ->method( 'isComparerFor' ) + ->willReturnCallback( + function ( $dataValueType ) use ( $isComparerFor ) { + return $dataValueType == $isComparerFor; + } + ); return $mock; } @@ -110,6 +109,7 @@ /** * Test cases for testConstructInvalidArguments + * * @return array */ public function constructInvalidArgumentsDataProvider() { diff --git a/tests/phpunit/CrossCheck/Comparer/EntityIdValueComparerTest.php b/tests/phpunit/CrossCheck/Comparer/EntityIdValueComparerTest.php index bdd7a6f..e58f9d0 100755 --- a/tests/phpunit/CrossCheck/Comparer/EntityIdValueComparerTest.php +++ b/tests/phpunit/CrossCheck/Comparer/EntityIdValueComparerTest.php @@ -2,7 +2,6 @@ namespace WikibaseQuality\ExternalValidation\Tests\CrossCheck\Comparer; - use DataValues\MonolingualTextValue; use DataValues\QuantityValue; use DataValues\StringValue; @@ -124,19 +123,19 @@ protected function buildComparer() { $entityLookup = new JsonFileEntityLookup( __DIR__ . '/testdata' ); $stringComparer = $this->getMockBuilder( 'WikibaseQuality\ExternalValidation\CrossCheck\Comparer\StringComparer' ) - ->setMethods( array( 'compareArrays' ) ) - ->getMock(); + ->setMethods( array( 'compareArrays' ) ) + ->getMock(); $stringComparer->expects( $this->any() ) - ->method( 'compareArrays' ) - ->willReturnCallback( - function ( array $values1, array $values2 ) { - if ( count( array_intersect( $values1, $values2 ) ) > 0 ) { - return CompareResult::STATUS_MATCH; - } else { - return CompareResult::STATUS_MISMATCH; - } - } - ); + ->method( 'compareArrays' ) + ->willReturnCallback( + function ( array $values1, array $values2 ) { + if ( count( array_intersect( $values1, $values2 ) ) > 0 ) { + return CompareResult::STATUS_MATCH; + } else { + return CompareResult::STATUS_MISMATCH; + } + } + ); return new EntityIdValueComparer( $entityLookup, $stringComparer ); } diff --git a/tests/phpunit/CrossCheck/Comparer/GlobeCoordinateValueComparerTest.php b/tests/phpunit/CrossCheck/Comparer/GlobeCoordinateValueComparerTest.php index f033240..33b5bed 100755 --- a/tests/phpunit/CrossCheck/Comparer/GlobeCoordinateValueComparerTest.php +++ b/tests/phpunit/CrossCheck/Comparer/GlobeCoordinateValueComparerTest.php @@ -2,7 +2,6 @@ namespace WikibaseQuality\ExternalValidation\Tests\CrossCheck\Comparer; - use DataValues\Geo\Values\GlobeCoordinateValue; use DataValues\Geo\Values\LatLongValue; use DataValues\MonolingualTextValue; diff --git a/tests/phpunit/CrossCheck/Comparer/MonolingualTextValueComparerTest.php b/tests/phpunit/CrossCheck/Comparer/MonolingualTextValueComparerTest.php index 9f1d494..a895f87 100755 --- a/tests/phpunit/CrossCheck/Comparer/MonolingualTextValueComparerTest.php +++ b/tests/phpunit/CrossCheck/Comparer/MonolingualTextValueComparerTest.php @@ -2,7 +2,6 @@ namespace WikibaseQuality\ExternalValidation\Tests\CrossCheck\Comparer; - use DataValues\MonolingualTextValue; use DataValues\QuantityValue; use DataValues\StringValue; @@ -108,19 +107,19 @@ protected function buildComparer() { $stringComparer = $this->getMockBuilder( 'WikibaseQuality\ExternalValidation\CrossCheck\Comparer\StringComparer' ) - ->setMethods( array( 'compareArray' ) ) - ->getMock(); + ->setMethods( array( 'compareArray' ) ) + ->getMock(); $stringComparer->expects( $this->any() ) - ->method( 'compareArray' ) - ->willReturnCallback( - function ( $values1, array $values2 ) { - if ( in_array( $values1, $values2 ) ) { - return CompareResult::STATUS_MATCH; - } else { - return CompareResult::STATUS_MISMATCH; - } - } - ); + ->method( 'compareArray' ) + ->willReturnCallback( + function ( $values1, array $values2 ) { + if ( in_array( $values1, $values2 ) ) { + return CompareResult::STATUS_MATCH; + } else { + return CompareResult::STATUS_MISMATCH; + } + } + ); return new MonolingualTextValueComparer( $stringComparer ); } diff --git a/tests/phpunit/CrossCheck/Comparer/MultilingualTextValueComparerTest.php b/tests/phpunit/CrossCheck/Comparer/MultilingualTextValueComparerTest.php index dba9cee..53414b7 100755 --- a/tests/phpunit/CrossCheck/Comparer/MultilingualTextValueComparerTest.php +++ b/tests/phpunit/CrossCheck/Comparer/MultilingualTextValueComparerTest.php @@ -2,7 +2,6 @@ namespace WikibaseQuality\ExternalValidation\Tests\CrossCheck\Comparer; - use DataValues\MonolingualTextValue; use DataValues\MultilingualTextValue; use DataValues\QuantityValue; @@ -113,19 +112,19 @@ protected function buildComparer() { $stringComparer = $this->getMockBuilder( 'WikibaseQuality\ExternalValidation\CrossCheck\Comparer\StringComparer' ) - ->setMethods( array( 'compareArray' ) ) - ->getMock(); + ->setMethods( array( 'compareArray' ) ) + ->getMock(); $stringComparer->expects( $this->any() ) - ->method( 'compareArray' ) - ->willReturnCallback( - function ( $values1, array $values2 ) { - if ( in_array( $values1, $values2 ) ) { - return CompareResult::STATUS_MATCH; - } else { - return CompareResult::STATUS_MISMATCH; - } - } - ); + ->method( 'compareArray' ) + ->willReturnCallback( + function ( $values1, array $values2 ) { + if ( in_array( $values1, $values2 ) ) { + return CompareResult::STATUS_MATCH; + } else { + return CompareResult::STATUS_MISMATCH; + } + } + ); return new MultilingualTextValueComparer( $stringComparer ); } diff --git a/tests/phpunit/CrossCheck/Comparer/QuantityValueComparerTest.php b/tests/phpunit/CrossCheck/Comparer/QuantityValueComparerTest.php index f08c7c7..3f752cb 100755 --- a/tests/phpunit/CrossCheck/Comparer/QuantityValueComparerTest.php +++ b/tests/phpunit/CrossCheck/Comparer/QuantityValueComparerTest.php @@ -2,7 +2,6 @@ namespace WikibaseQuality\ExternalValidation\Tests\CrossCheck\Comparer; - use DataValues\MonolingualTextValue; use DataValues\QuantityValue; use DataValues\StringValue; diff --git a/tests/phpunit/CrossCheck/Comparer/StringComparerTest.php b/tests/phpunit/CrossCheck/Comparer/StringComparerTest.php index b3db2f8..ce9b6a9 100755 --- a/tests/phpunit/CrossCheck/Comparer/StringComparerTest.php +++ b/tests/phpunit/CrossCheck/Comparer/StringComparerTest.php @@ -5,6 +5,7 @@ use WikibaseQuality\ExternalValidation\CrossCheck\Comparer\StringComparer; use WikibaseQuality\ExternalValidation\CrossCheck\Result\CompareResult; + /** * @covers WikibaseQuality\ExternalValidation\CrossCheck\Comparer\StringComparer * @@ -30,7 +31,6 @@ parent::tearDown(); } - /** * @dataProvider compareValidArgumentsDataProvider */ @@ -42,6 +42,7 @@ /** * Test cases for testCompareValidArguments + * * @return array */ public function compareValidArgumentsDataProvider() { @@ -188,6 +189,7 @@ /** * Test cases for testCompareInvalidArguments + * * @return array */ public function compareInvalidArgumentsDataProvider() { @@ -207,7 +209,6 @@ ); } - /** * @dataProvider compareArrayValidArgumentsDataProvider */ @@ -219,6 +220,7 @@ /** * Test cases for testCompareArrayValidArguments + * * @return array */ public function compareArrayValidArgumentsDataProvider() { @@ -277,6 +279,7 @@ /** * Test cases for testCompareArrayInvalidArguments + * * @return array */ public function compareArrayInvalidArgumentsDataProvider() { @@ -296,7 +299,6 @@ ); } - /** * @dataProvider compareDataArraysValidArgumentsProvider */ @@ -308,6 +310,7 @@ /** * Test cases for testCompareArraysValidArguments + * * @return array */ public function compareDataArraysValidArgumentsProvider() { @@ -356,6 +359,7 @@ /** * Test cases for testCompareInvalidArguments + * * @return array */ public function compareArraysInvalidArgumentsDataProvider() { diff --git a/tests/phpunit/CrossCheck/Comparer/StringValueComparerTest.php b/tests/phpunit/CrossCheck/Comparer/StringValueComparerTest.php index 7535ef8..61241ae 100755 --- a/tests/phpunit/CrossCheck/Comparer/StringValueComparerTest.php +++ b/tests/phpunit/CrossCheck/Comparer/StringValueComparerTest.php @@ -2,7 +2,6 @@ namespace WikibaseQuality\ExternalValidation\Tests\CrossCheck\Comparer; - use DataValues\MonolingualTextValue; use DataValues\QuantityValue; use DataValues\StringValue; @@ -107,19 +106,19 @@ protected function buildComparer() { $stringComparer = $this->getMockBuilder( 'WikibaseQuality\ExternalValidation\CrossCheck\Comparer\StringComparer' ) - ->setMethods( array( 'compareArray' ) ) - ->getMock(); + ->setMethods( array( 'compareArray' ) ) + ->getMock(); $stringComparer->expects( $this->any() ) - ->method( 'compareArray' ) - ->willReturnCallback( - function ( $values1, array $values2 ) { - if ( in_array( $values1, $values2 ) ) { - return CompareResult::STATUS_MATCH; - } else { - return CompareResult::STATUS_MISMATCH; - } - } - ); + ->method( 'compareArray' ) + ->willReturnCallback( + function ( $values1, array $values2 ) { + if ( in_array( $values1, $values2 ) ) { + return CompareResult::STATUS_MATCH; + } else { + return CompareResult::STATUS_MISMATCH; + } + } + ); return new StringValueComparer( $stringComparer ); } diff --git a/tests/phpunit/CrossCheck/Comparer/TimeValueComparerTest.php b/tests/phpunit/CrossCheck/Comparer/TimeValueComparerTest.php index 980c220..15942db 100755 --- a/tests/phpunit/CrossCheck/Comparer/TimeValueComparerTest.php +++ b/tests/phpunit/CrossCheck/Comparer/TimeValueComparerTest.php @@ -2,7 +2,6 @@ namespace WikibaseQuality\ExternalValidation\Tests\CrossCheck\Comparer; - use DataValues\MonolingualTextValue; use DataValues\QuantityValue; use DataValues\StringValue; diff --git a/tests/phpunit/CrossCheck/CrossCheckInteractorTest.php b/tests/phpunit/CrossCheck/CrossCheckInteractorTest.php index d155952..9a19384 100755 --- a/tests/phpunit/CrossCheck/CrossCheckInteractorTest.php +++ b/tests/phpunit/CrossCheck/CrossCheckInteractorTest.php @@ -51,21 +51,21 @@ $entityLookup = new JsonFileEntityLookup( __DIR__ . '/testdata' ); $claimGuidParser = new ClaimGuidParser( new BasicEntityIdParser() ); $crossChecker = $this->getMockBuilder( 'WikibaseQuality\ExternalValidation\CrossCheck\CrossChecker' ) - ->disableOriginalConstructor() - ->setMethods( array( 'crossCheckStatements' ) ) - ->getMock(); + ->disableOriginalConstructor() + ->setMethods( array( 'crossCheckStatements' ) ) + ->getMock(); $crossChecker->expects( $this->any() ) - ->method( 'crossCheckStatements' ) - ->willReturnCallback( - function ( Entity $entity, StatementList $statements ) { - return array_map( - function ( Statement $statement ) { - return $statement->getGuid(); - }, - $statements->toArray() - ); - } - ); + ->method( 'crossCheckStatements' ) + ->willReturnCallback( + function ( Entity $entity, StatementList $statements ) { + return array_map( + function ( Statement $statement ) { + return $statement->getGuid(); + }, + $statements->toArray() + ); + } + ); $this->crossCheckInteractor = new CrossCheckInteractor( $entityLookup, $claimGuidParser, $crossChecker ); } @@ -74,7 +74,6 @@ parent::tearDown(); } - /** * @dataProvider crossCheckEntityByIdDataProvider @@ -87,6 +86,7 @@ /** * Test cases for testCrossCheckEntityById + * * @return array */ public function crossCheckEntityByIdDataProvider() { @@ -120,7 +120,6 @@ ); } - /** * @dataProvider crossCheckEntitiesByIdsDataProvider */ @@ -136,6 +135,7 @@ /** * Test cases for testCrossCheckEntitiesByIds + * * @return array */ public function crossCheckEntitiesByIdsDataProvider() { @@ -175,7 +175,6 @@ ); } - /** * @dataProvider crossCheckEntityDataProvider */ @@ -187,6 +186,7 @@ /** * Test cases for testCrossCheckEntity + * * @return array */ public function crossCheckEntityDataProvider() { @@ -216,7 +216,6 @@ ); } - /** * @dataProvider testCrossCheckEntitiesDataProvider */ @@ -232,6 +231,7 @@ /** * Test cases for testCrossCheckEntities + * * @return array */ public function testCrossCheckEntitiesDataProvider() { @@ -271,7 +271,6 @@ ); } - /** * @dataProvider crossCheckEntityByIdWithPropertiesDataProvider */ @@ -287,6 +286,7 @@ /** * Test cases for testCrossCheckEntityByIdWithProperties + * * @return array */ public function crossCheckEntityByIdWithPropertiesDataProvider() { @@ -331,7 +331,6 @@ ); } - /** * @dataProvider crossCheckEntitiesByIdWithPropertiesDataProvider */ @@ -347,6 +346,7 @@ /** * Test cases for testCrossCheckEntitiesByIdWithProperties + * * @return array */ public function crossCheckEntitiesByIdWithPropertiesDataProvider() { @@ -430,7 +430,6 @@ ); } - /** * @dataProvider crossCheckEntityWithPropertiesDataProvider */ @@ -446,6 +445,7 @@ /** * Test cases for testCrossCheckEntityWithProperties + * * @return array */ public function crossCheckEntityWithPropertiesDataProvider() { @@ -483,7 +483,6 @@ ); } - /** * @dataProvider crossCheckEntitiesWithPropertiesDataProvider */ @@ -499,6 +498,7 @@ /** * Test cases for testCrossCheckEntitiesWithProperties + * * @return array */ public function crossCheckEntitiesWithPropertiesDataProvider() { @@ -582,7 +582,6 @@ ); } - /** * @dataProvider crossCheckClaimDataProvider */ @@ -598,6 +597,7 @@ /** * Test casses for testCrossCheckClaim + * * @return array */ public function crossCheckClaimDataProvider() { @@ -622,7 +622,6 @@ ); } - /** * @dataProvider crossCheckClaimsDataProvider */ @@ -638,6 +637,7 @@ /** * Test casses for testCrossCheckClaims + * * @return array */ public function crossCheckClaimsDataProvider() { @@ -709,7 +709,6 @@ ) ); } - private function runAssertions( $expectedResult, $actualResult ) { if ( $actualResult ) { diff --git a/tests/phpunit/CrossCheck/CrossCheckerTest.php b/tests/phpunit/CrossCheck/CrossCheckerTest.php index 1e108b5..5338471 100755 --- a/tests/phpunit/CrossCheck/CrossCheckerTest.php +++ b/tests/phpunit/CrossCheck/CrossCheckerTest.php @@ -66,7 +66,6 @@ ); } - public function setUp() { parent::setUp(); @@ -278,6 +277,7 @@ /** * Runs assertions on compare result list. + * * @param CrossCheckResultList $actualResults * @param array $expectedResults */ @@ -301,24 +301,24 @@ private function getCrossChecker() { $compareResult = $this->getMockBuilder( 'WikibaseQuality\ExternalValidation\CrossCheck\Result\CompareResult' ) - ->disableOriginalConstructor() - ->getMock(); + ->disableOriginalConstructor() + ->getMock(); $dataValueComparer = $this->getMockBuilder( 'WikibaseQuality\ExternalValidation\CrossCheck\Comparer\DataValueComparer' ) - ->setMethods( array( 'compare' ) ) - ->getMockForAbstractClass(); + ->setMethods( array( 'compare' ) ) + ->getMockForAbstractClass(); $dataValueComparer->expects( $this->any() ) - ->method( 'compare' ) - ->willReturn( $compareResult ); + ->method( 'compare' ) + ->willReturn( $compareResult ); $referenceResult = $this->getMockBuilder( 'WikibaseQuality\ExternalValidation\CrossCheck\Result\ReferenceResult' ) - ->disableOriginalConstructor() - ->getMock(); + ->disableOriginalConstructor() + ->getMock(); $referenceHandler = $this->getMockBuilder( 'WikibaseQuality\ExternalValidation\CrossCheck\ReferenceHandler' ) - ->setMethods( array( 'execute' ) ) - ->getMock(); + ->setMethods( array( 'execute' ) ) + ->getMock(); $referenceHandler->expects( $this->any() ) - ->method( 'execute' ) - ->willReturn( $referenceResult ); + ->method( 'execute' ) + ->willReturn( $referenceResult ); return new CrossChecker( $dataValueComparer, @@ -330,50 +330,50 @@ private function getDumpMetaInformationRepoMock() { $dumpMetaInformationRepo = $this->getMockBuilder( 'WikibaseQuality\ExternalValidation\DumpMetaInformation\DumpMetaInformationRepo' ) - ->disableOriginalConstructor() - ->setMethods( array( 'getWithIdentifierProperties' ) ) - ->getMock(); + ->disableOriginalConstructor() + ->setMethods( array( 'getWithIdentifierProperties' ) ) + ->getMock(); $dumpMetaInformation = $this->dumpMetaInformation; $dumpMetaInformationRepo->expects( $this->any() ) - ->method( 'getWithIdentifierProperties' ) - ->willReturnCallback( - function ( array $identifierPropertyIds ) use ( $dumpMetaInformation ) { - $result = array(); - foreach ( $dumpMetaInformation as $dump ) { - if ( count( array_intersect( $identifierPropertyIds, $dump->getIdentifierPropertyIds() ) ) > 0 ) { - $result[$dump->getDumpId()] = $dump; - } - } - return $result; - } - ); + ->method( 'getWithIdentifierProperties' ) + ->willReturnCallback( + function ( array $identifierPropertyIds ) use ( $dumpMetaInformation ) { + $result = array(); + foreach ( $dumpMetaInformation as $dump ) { + if ( count( array_intersect( $identifierPropertyIds, $dump->getIdentifierPropertyIds() ) ) > 0 ) { + $result[ $dump->getDumpId() ] = $dump; + } + } + return $result; + } + ); return $dumpMetaInformationRepo; } private function getExternalDataRepoMock() { $externalDataRepo = $this->getMockBuilder( 'WikibaseQuality\ExternalValidation\ExternalDataRepo' ) - ->disableOriginalConstructor() - ->setMethods( array( 'get' ) ) - ->getMock(); + ->disableOriginalConstructor() + ->setMethods( array( 'get' ) ) + ->getMock(); $externalData = $this->externalData; $externalDataRepo->expects( $this->any() ) - ->method( 'get' ) - ->willReturnCallback( - function ( array $dumpIds, array $externalIds, array $propertyIds ) use ( $externalData ) { - $result = array(); - foreach ( $externalData as $row ) { - $dumpId = $row['dump_id']; - $externalId = $row['external_id']; - $propertyId = $row['pid']; + ->method( 'get' ) + ->willReturnCallback( + function ( array $dumpIds, array $externalIds, array $propertyIds ) use ( $externalData ) { + $result = array(); + foreach ( $externalData as $row ) { + $dumpId = $row['dump_id']; + $externalId = $row['external_id']; + $propertyId = $row['pid']; - if ( in_array( $dumpId, $dumpIds ) && in_array( $externalId, $externalIds ) && in_array( $propertyId, $propertyIds ) ) { - $result[$dumpId][$externalId][$propertyId][] = $row['external_value']; - } - } - return $result; - } - ); + if ( in_array( $dumpId, $dumpIds ) && in_array( $externalId, $externalIds ) && in_array( $propertyId, $propertyIds ) ) { + $result[ $dumpId ][ $externalId ][ $propertyId ][] = $row['external_value']; + } + } + return $result; + } + ); return $externalDataRepo; } diff --git a/tests/phpunit/CrossCheck/ReferenceHandlerTest.php b/tests/phpunit/CrossCheck/ReferenceHandlerTest.php index dc4b518..c6ccc6b 100755 --- a/tests/phpunit/CrossCheck/ReferenceHandlerTest.php +++ b/tests/phpunit/CrossCheck/ReferenceHandlerTest.php @@ -14,6 +14,7 @@ use WikibaseQuality\ExternalValidation\CrossCheck\ReferenceHandler; use WikibaseQuality\ExternalValidation\CrossCheck\Result\ReferenceResult; + /** * @covers WikibaseQuality\ExternalValidation\CrossCheck\ReferenceHandler * @@ -66,6 +67,7 @@ /** * Test cases for testExecute + * * @return array */ public function executeDataProvider() { @@ -137,11 +139,11 @@ private function getDumpMetaInformationMock( ItemId $sourceItemId ) { $mock = $this->getMockBuilder( 'WikibaseQuality\ExternalValidation\DumpMetaInformation\DumpMetaInformation' ) - ->disableOriginalConstructor() - ->getMock(); + ->disableOriginalConstructor() + ->getMock(); $mock->expects( $this->any() ) - ->method( 'getSourceItemId' ) - ->willReturn( $sourceItemId ); + ->method( 'getSourceItemId' ) + ->willReturn( $sourceItemId ); return $mock; } diff --git a/tests/phpunit/CrossCheck/Result/CompareResultTest.php b/tests/phpunit/CrossCheck/Result/CompareResultTest.php index 94f6af6..d8bb148 100755 --- a/tests/phpunit/CrossCheck/Result/CompareResultTest.php +++ b/tests/phpunit/CrossCheck/Result/CompareResultTest.php @@ -28,6 +28,7 @@ /** * Test cases for testConstructValidArguments + * * @return array */ public function constructValidArgumentsDataProvider() { @@ -70,6 +71,7 @@ /** * Test cases for testConstructInvalidArguments + * * @return array */ public function constructInvalidArgumentsDataProvider() { diff --git a/tests/phpunit/CrossCheck/Result/CrossCheckResultListTest.php b/tests/phpunit/CrossCheck/Result/CrossCheckResultListTest.php index c5a10ac..6d59ff1 100755 --- a/tests/phpunit/CrossCheck/Result/CrossCheckResultListTest.php +++ b/tests/phpunit/CrossCheck/Result/CrossCheckResultListTest.php @@ -17,6 +17,7 @@ * @license GNU GPL v2+ */ class CrossCheckResultListTest extends \MediaWikiTestCase { + /** * @var CrossCheckResult */ @@ -90,6 +91,7 @@ /** * Test cases for testConstruct + * * @return array */ public function constructDataProvider() { @@ -160,33 +162,33 @@ private function getCrossCheckResultMock( PropertyId $propertyId, $status, $referencesMissing ) { // Mock CompareResult $compareResultMock = $this->getMockBuilder( 'WikibaseQuality\ExternalValidation\CrossCheck\Result\CompareResult' ) - ->disableOriginalConstructor() - ->getMock(); + ->disableOriginalConstructor() + ->getMock(); $compareResultMock->expects( $this->any() ) - ->method( 'getStatus' ) - ->willReturn( $status ); + ->method( 'getStatus' ) + ->willReturn( $status ); // Mock ReferenceResult $referenceResult = $this->getMockBuilder( 'WikibaseQuality\ExternalValidation\CrossCheck\Result\ReferenceResult' ) - ->disableOriginalConstructor() - ->getMock(); + ->disableOriginalConstructor() + ->getMock(); $referenceResult->expects( $this->any() ) - ->method( 'areReferencesMissing' ) - ->willReturn( $referencesMissing ); + ->method( 'areReferencesMissing' ) + ->willReturn( $referencesMissing ); // Mock CrossCheckResult $crossCheckResultMock = $this->getMockBuilder( 'WikibaseQuality\ExternalValidation\CrossCheck\Result\CrossCheckResult' ) - ->disableOriginalConstructor() - ->getMock(); + ->disableOriginalConstructor() + ->getMock(); $crossCheckResultMock->expects( $this->any() ) - ->method( 'getPropertyId' ) - ->willReturn( $propertyId ); + ->method( 'getPropertyId' ) + ->willReturn( $propertyId ); $crossCheckResultMock->expects( $this->any() ) - ->method( 'getCompareResult' ) - ->willReturn( $compareResultMock ); + ->method( 'getCompareResult' ) + ->willReturn( $compareResultMock ); $crossCheckResultMock->expects( $this->any() ) - ->method( 'getReferenceResult' ) - ->willReturn( $referenceResult ); + ->method( 'getReferenceResult' ) + ->willReturn( $referenceResult ); return $crossCheckResultMock; } diff --git a/tests/phpunit/CrossCheck/Result/CrossCheckResultTest.php b/tests/phpunit/CrossCheck/Result/CrossCheckResultTest.php index f9a9765..7601e99 100755 --- a/tests/phpunit/CrossCheck/Result/CrossCheckResultTest.php +++ b/tests/phpunit/CrossCheck/Result/CrossCheckResultTest.php @@ -6,6 +6,7 @@ use WikibaseQuality\ExternalValidation\CrossCheck\Result\CompareResult; use WikibaseQuality\ExternalValidation\CrossCheck\Result\CrossCheckResult; + /** * @covers WikibaseQuality\ExternalValidation\CrossCheck\Result\CrossCheckResult * @@ -52,6 +53,7 @@ /** * Test cases for testConstructInvalidArguments + * * @return array */ public function constructInvalidArgumentsDataProvider() { @@ -89,8 +91,8 @@ private function getDumpMetaInformationMock() { $mock = $this->getMockBuilder( 'WikibaseQuality\ExternalValidation\DumpMetaInformation\DumpMetaInformation' ) - ->disableOriginalConstructor() - ->getMock(); + ->disableOriginalConstructor() + ->getMock(); return $mock; } @@ -101,8 +103,8 @@ ->disableOriginalConstructor() ->getMock(); $mock->expects( $this->any() ) - ->method( 'getStatus' ) - ->willReturn( $status ); + ->method( 'getStatus' ) + ->willReturn( $status ); return $mock; } @@ -113,8 +115,8 @@ ->disableOriginalConstructor() ->getMock(); $mock->expects( $this->any() ) - ->method( 'areReferencesMissing' ) - ->willReturn( $referencesMissing ); + ->method( 'areReferencesMissing' ) + ->willReturn( $referencesMissing ); return $mock; } diff --git a/tests/phpunit/CrossCheck/Result/ReferenceResultTest.php b/tests/phpunit/CrossCheck/Result/ReferenceResultTest.php index 77b6199..3c75d8f 100755 --- a/tests/phpunit/CrossCheck/Result/ReferenceResultTest.php +++ b/tests/phpunit/CrossCheck/Result/ReferenceResultTest.php @@ -27,6 +27,7 @@ /** * Test cases for testConstructValidArguments + * * @return array */ public function constructValidArgumentsDataProvider() { @@ -57,6 +58,7 @@ /** * Test cases for testConstructInvalidArguments + * * @return array */ public function constructInvalidArgumentsDataProvider() { diff --git a/tests/phpunit/DumpMetaInformation/DumpMetaInformationRepoTest.php b/tests/phpunit/DumpMetaInformation/DumpMetaInformationRepoTest.php index 8ccf5ee..47f2aa1 100755 --- a/tests/phpunit/DumpMetaInformation/DumpMetaInformationRepoTest.php +++ b/tests/phpunit/DumpMetaInformation/DumpMetaInformationRepoTest.php @@ -159,6 +159,7 @@ /** * Test cases for testConstructInvalidArguments + * * @return array */ public function constructInvalidArgumentsDataProvider() { @@ -231,7 +232,6 @@ ); } - /** * @dataProvider getWithIdsDataProvider */ @@ -302,6 +302,7 @@ /** * Test cases for testGetWithIdentifierProperties + * * @return array */ public function getWithIdentifierPropertiesDataProvider() { diff --git a/tests/phpunit/DumpMetaInformation/DumpMetaInformationTest.php b/tests/phpunit/DumpMetaInformation/DumpMetaInformationTest.php index afa4d3d..6887a56 100755 --- a/tests/phpunit/DumpMetaInformation/DumpMetaInformationTest.php +++ b/tests/phpunit/DumpMetaInformation/DumpMetaInformationTest.php @@ -7,6 +7,7 @@ use Wikibase\DataModel\Entity\PropertyId; use WikibaseQuality\ExternalValidation\DumpMetaInformation\DumpMetaInformation; + /** * @covers WikibaseQuality\ExternalValidation\DumpMetaInformation\DumpMetaInformation * diff --git a/tests/phpunit/EvaluateCrossCheckJobServiceTest.php b/tests/phpunit/EvaluateCrossCheckJobServiceTest.php index f748d90..5ee5dcb 100755 --- a/tests/phpunit/EvaluateCrossCheckJobServiceTest.php +++ b/tests/phpunit/EvaluateCrossCheckJobServiceTest.php @@ -65,7 +65,11 @@ $this->checkTimestamp = wfTimestamp( TS_MW ); - $this->params = array( 'entityId' => $this->entity->getId()->getSerialization(), 'referenceTimestamp' => null, 'results' => $results ); + $this->params = array( + 'entityId' => $this->entity->getId()->getSerialization(), + 'referenceTimestamp' => null, + 'results' => $results + ); } protected function tearDown() { diff --git a/tests/phpunit/ExternalDataRepoTest.php b/tests/phpunit/ExternalDataRepoTest.php index d80b6de..7997981 100755 --- a/tests/phpunit/ExternalDataRepoTest.php +++ b/tests/phpunit/ExternalDataRepoTest.php @@ -5,6 +5,7 @@ use Wikibase\DataModel\Entity\PropertyId; use WikibaseQuality\ExternalValidation\ExternalDataRepo; + /** * @covers WikibaseQuality\ExternalValidation\ExternalDataRepo * @@ -79,7 +80,6 @@ ); } - public function testAssertTablesExist() { $this->assertTrue( $this->externalDataRepo->assertTablesExist() ); @@ -87,7 +87,6 @@ $repoWrongTable = new ExternalDataRepo( 'NonExistingTable' ); $repoWrongTable->assertTablesExist(); } - /** * @dataProvider getDataProvider @@ -102,6 +101,7 @@ /** * Test cases for testGet + * * @return array */ public function getDataProvider() { @@ -179,7 +179,6 @@ ); } - /** * @dataProvider insertDataProvider */ @@ -208,6 +207,7 @@ /** * Test cases for testInsert + * * @return array */ public function insertDataProvider() { @@ -242,7 +242,6 @@ ); } - /** * @dataProvider insertBatchDataProvider */ @@ -250,7 +249,6 @@ $this->setExpectedException( $expectedException ); $this->externalDataRepo->insertBatch( $externalDataBatch ); - $this->assertSelect( DUMP_DATA_TABLE, @@ -267,6 +265,7 @@ /** * Test cases for testInsertBatch + * * @return array */ public function insertBatchDataProvider() { @@ -295,7 +294,6 @@ ) ); } - public function testDeleteOfDump() { $dumpId = 'deleteOfDump'; @@ -334,7 +332,6 @@ $this->externalDataRepo->deleteOfDump( 42 ); } - public function testDeleteOfDumps() { $dumpIds = array( 'deleteOfDumps1', 'deleteOfDump2' ); diff --git a/tests/phpunit/ExternalValidationFactoryTest.php b/tests/phpunit/ExternalValidationFactoryTest.php index c8e9443..6bb696f 100755 --- a/tests/phpunit/ExternalValidationFactoryTest.php +++ b/tests/phpunit/ExternalValidationFactoryTest.php @@ -4,6 +4,7 @@ use WikibaseQuality\ExternalValidation\ExternalValidationFactory; + /** * @covers WikibaseQuality\ExternalValidation\ExternalValidationFactory * diff --git a/tests/phpunit/Serializer/CompareResultSerializerTest.php b/tests/phpunit/Serializer/CompareResultSerializerTest.php index 4c996fc..58ba60b 100755 --- a/tests/phpunit/Serializer/CompareResultSerializerTest.php +++ b/tests/phpunit/Serializer/CompareResultSerializerTest.php @@ -2,9 +2,9 @@ namespace WikibaseQuality\ExternalValidation\Tests\Serializer; - use WikibaseQuality\ExternalValidation\CrossCheck\Result\CompareResult; use WikibaseQuality\ExternalValidation\Serializer\CompareResultSerializer; + /** * @covers WikibaseQuality\ExternalValidation\Serializer\IndexedTagsSerializer @@ -190,8 +190,8 @@ protected function buildSerializer( $shouldIndexTags = false ) { $serializerMock = $this->getMock( 'Serializers\Serializer' ); $serializerMock->expects( $this->any() ) - ->method( 'serialize' ) - ->willReturn( 'foobar' ); + ->method( 'serialize' ) + ->willReturn( 'foobar' ); return new CompareResultSerializer( $serializerMock, $shouldIndexTags ); } diff --git a/tests/phpunit/Serializer/CrossCheckResultListSerializerTest.php b/tests/phpunit/Serializer/CrossCheckResultListSerializerTest.php index e3499f6..6ec0b1f 100755 --- a/tests/phpunit/Serializer/CrossCheckResultListSerializerTest.php +++ b/tests/phpunit/Serializer/CrossCheckResultListSerializerTest.php @@ -23,8 +23,8 @@ protected function buildSerializer( $shouldIndexTags = false ) { $serializerMock = $this->getMock( 'Serializers\Serializer' ); $serializerMock->expects( $this->any() ) - ->method( 'serialize' ) - ->willReturn( 'foobar' ); + ->method( 'serialize' ) + ->willReturn( 'foobar' ); return new CrossCheckResultListSerializer( $serializerMock, $shouldIndexTags ); } diff --git a/tests/phpunit/Serializer/CrossCheckResultSerializerTest.php b/tests/phpunit/Serializer/CrossCheckResultSerializerTest.php index cae9630..a016437 100755 --- a/tests/phpunit/Serializer/CrossCheckResultSerializerTest.php +++ b/tests/phpunit/Serializer/CrossCheckResultSerializerTest.php @@ -6,6 +6,7 @@ use WikibaseQuality\ExternalValidation\CrossCheck\Result\CrossCheckResult; use WikibaseQuality\ExternalValidation\Serializer\CrossCheckResultSerializer; + /** * @covers WikibaseQuality\ExternalValidation\Serializer\CrossCheckResultSerializer * @@ -21,8 +22,8 @@ protected function buildSerializer() { $serializerMock = $this->getMock( 'Serializers\Serializer' ); $serializerMock->expects( $this->any() ) - ->method( 'serialize' ) - ->willReturn( 'foobar' ); + ->method( 'serialize' ) + ->willReturn( 'foobar' ); return new CrossCheckResultSerializer( $serializerMock, $serializerMock, $serializerMock ); } diff --git a/tests/phpunit/Serializer/DumpMetaInformationSerializerTest.php b/tests/phpunit/Serializer/DumpMetaInformationSerializerTest.php index f9e9bf9..d52315e 100755 --- a/tests/phpunit/Serializer/DumpMetaInformationSerializerTest.php +++ b/tests/phpunit/Serializer/DumpMetaInformationSerializerTest.php @@ -7,6 +7,7 @@ use WikibaseQuality\ExternalValidation\DumpMetaInformation\DumpMetaInformation; use WikibaseQuality\ExternalValidation\Serializer\DumpMetaInformationSerializer; + /** * @covers WikibaseQuality\ExternalValidation\Serializer\DumpMetaInformationSerializer * diff --git a/tests/phpunit/Serializer/IndexedTagsSerializerTest.php b/tests/phpunit/Serializer/IndexedTagsSerializerTest.php index dabd1f3..8aca08d 100755 --- a/tests/phpunit/Serializer/IndexedTagsSerializerTest.php +++ b/tests/phpunit/Serializer/IndexedTagsSerializerTest.php @@ -2,7 +2,6 @@ namespace WikibaseQuality\ExternalValidation\Tests\Serializer; - /** * @covers WikibaseQuality\ExternalValidation\Serializer\IndexedTagsSerializer * @@ -22,15 +21,16 @@ } $serializer = $this->getMockBuilder( 'WikibaseQuality\ExternalValidation\Serializer\IndexedTagsSerializer' ) - ->setConstructorArgs( array( $shouldIndexTags ) ) - ->setMethods( array() ) - ->getMockForAbstractClass(); + ->setConstructorArgs( array( $shouldIndexTags ) ) + ->setMethods( array() ) + ->getMockForAbstractClass(); $this->assertEquals( $shouldIndexTags, $serializer->shouldIndexTags() ); } /** * Test cases for testConstruct + * * @return array */ public function constructDataProvider() { diff --git a/tests/phpunit/Serializer/ReferenceResultSerializerTest.php b/tests/phpunit/Serializer/ReferenceResultSerializerTest.php index 6201d18..7f52547 100755 --- a/tests/phpunit/Serializer/ReferenceResultSerializerTest.php +++ b/tests/phpunit/Serializer/ReferenceResultSerializerTest.php @@ -72,8 +72,8 @@ protected function buildSerializer() { $serializerMock = $this->getMock( 'Serializers\Serializer' ); $serializerMock->expects( $this->any() ) - ->method( 'serialize' ) - ->willReturn( 'foobar' ); + ->method( 'serialize' ) + ->willReturn( 'foobar' ); return new ReferenceResultSerializer( $serializerMock ); } diff --git a/tests/phpunit/Serializer/SerializerBaseTest.php b/tests/phpunit/Serializer/SerializerBaseTest.php index 0248f76..9e3389c 100755 --- a/tests/phpunit/Serializer/SerializerBaseTest.php +++ b/tests/phpunit/Serializer/SerializerBaseTest.php @@ -5,6 +5,7 @@ use Serializers\DispatchableSerializer; use Serializers\Serializer; + /** * @group WikibaseQualityExternalValidation * diff --git a/tests/phpunit/Serializer/SerializerFactoryTest.php b/tests/phpunit/Serializer/SerializerFactoryTest.php index 16fcf32..8c4da61 100755 --- a/tests/phpunit/Serializer/SerializerFactoryTest.php +++ b/tests/phpunit/Serializer/SerializerFactoryTest.php @@ -19,6 +19,7 @@ use WikibaseQuality\ExternalValidation\DumpMetaInformation\DumpMetaInformation; use WikibaseQuality\ExternalValidation\Serializer\SerializerFactory; + /** * @covers WikibaseQuality\ExternalValidation\Serializer\SerializerFactory * diff --git a/tests/phpunit/Specials/SpecialCrossCheckTest.php b/tests/phpunit/Specials/SpecialCrossCheckTest.php index f9fc794..57335ca 100755 --- a/tests/phpunit/Specials/SpecialCrossCheckTest.php +++ b/tests/phpunit/Specials/SpecialCrossCheckTest.php @@ -14,6 +14,7 @@ use Wikibase\Test\SpecialPageTestBase; use WikibaseQuality\ExternalValidation\Specials\SpecialCrossCheck; + /** * @covers WikibaseQuality\ExternalValidation\Specials\SpecialCrossCheck * @@ -40,6 +41,7 @@ * @license GNU GPL v2+ */ class SpecialCrossCheckTest extends SpecialPageTestBase { + /** * Id of a item that (hopefully) does not exist. */ @@ -73,6 +75,7 @@ /** * Adds temporary test data to database + * * @throws \DBUnexpectedError */ public function addDBData() { @@ -218,6 +221,7 @@ /** * Test cases for testExecute + * * @return array */ public function executeProvider() { @@ -274,7 +278,12 @@ 'content' => '(wbqev-crosscheck-not-existent-entity)' ); - $cases['valid input - not existing item'] = array( self::NOT_EXISTENT_ITEM_ID, array(), $userLanguage, $matchers ); + $cases['valid input - not existing item'] = array( + self::NOT_EXISTENT_ITEM_ID, + array(), + $userLanguage, + $matchers + ); // Valid input and entity exists unset( $matchers['error'] ); diff --git a/tests/phpunit/Specials/SpecialExternalDbsTest.php b/tests/phpunit/Specials/SpecialExternalDbsTest.php index 3b23b14..cb15876 100755 --- a/tests/phpunit/Specials/SpecialExternalDbsTest.php +++ b/tests/phpunit/Specials/SpecialExternalDbsTest.php @@ -5,6 +5,7 @@ use Wikibase\Test\SpecialPageTestBase; use WikibaseQuality\ExternalValidation\Specials\SpecialExternalDbs; + /** * @covers WikibaseQuality\ExternalValidation\Specials\SpecialExternalDbs * @@ -35,14 +36,15 @@ $languageNameLookup = $this->getMock( 'Wikibase\Lib\LanguageNameLookup' ); $languageNameLookup->expects( $this->any() ) - ->method( 'getName' ) - ->will( $this->returnValue( 'LANGUAGE NAME' ) ); + ->method( 'getName' ) + ->will( $this->returnValue( 'LANGUAGE NAME' ) ); return $page; } /** * Adds temporary test data to database + * * @throws \DBUnexpectedError */ public function addDBData() { diff --git a/tests/phpunit/UpdateTable/ImportContextTest.php b/tests/phpunit/UpdateTable/ImportContextTest.php index ba2eb8f..28aedb4 100755 --- a/tests/phpunit/UpdateTable/ImportContextTest.php +++ b/tests/phpunit/UpdateTable/ImportContextTest.php @@ -27,8 +27,8 @@ public function provideInvalidArguments() { $loadBalancer = $this->getMockBuilder( 'LoadBalancer' ) - ->disableOriginalConstructor() - ->getMock(); + ->disableOriginalConstructor() + ->getMock(); return array( array( $loadBalancer, diff --git a/tests/phpunit/UpdateTable/UpdateTableTest.php b/tests/phpunit/UpdateTable/UpdateTableTest.php index e18302b..776cde9 100755 --- a/tests/phpunit/UpdateTable/UpdateTableTest.php +++ b/tests/phpunit/UpdateTable/UpdateTableTest.php @@ -2,7 +2,6 @@ namespace WikibaseQuality\ExternalValidation\Tests\UpdateTable; - use DateTime; use Wikibase\DataModel\Entity\BasicEntityIdParser; use Wikibase\DataModel\Entity\ItemId; @@ -66,7 +65,6 @@ $dumpMetaInformationRepo = new DumpMetaInformationRepo( DUMP_META_TABLE, DUMP_IDENTIFIER_PROPERTIES_TABLE, new BasicEntityIdParser() ); $dumpMetaInformationRepo->save( $dumpMetaInformation ); - // Insert external data $this->db->insert( DUMP_DATA_TABLE, @@ -86,7 +84,6 @@ ) ); } - public function testExecute() { // Execute script -- To view, visit https://gerrit.wikimedia.org/r/217256 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6ade00d6fd78a66128315273cc7cad3a6850e485 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/WikidataQualityExternalValidation Gerrit-Branch: v1 Gerrit-Owner: Tamslo <tamaraslosa...@gmail.com> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits