Soeren.oldag has uploaded a new change for review.
https://gerrit.wikimedia.org/r/218321
Change subject: Implemented further hints from review from Daniel.
......................................................................
Implemented further hints from review from Daniel.
Bug: T100991
Change-Id: Ie5eac5b53ca776025a4bfd65ae2d22882b03955a
---
M WikibaseQualityExternalValidation.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/CompareResult.php
M includes/CrossCheck/Result/CrossCheckResult.php
M includes/CrossCheck/Result/CrossCheckResultList.php
M includes/CrossCheck/Result/ReferenceResult.php
M includes/DumpMetaInformation/DumpMetaInformation.php
M includes/DumpMetaInformation/DumpMetaInformationRepo.php
M includes/ExternalDataRepo.php
M includes/Serializer/DumpMetaInformationSerializer.php
M includes/Serializer/IndexedTagsSerializer.php
M includes/UpdateTable/ImportContext.php
M includes/UpdateTable/Importer.php
M includes/Violations/CrossCheckResultToViolationTranslator.php
M includes/Violations/CrossCheckViolationFormatter.php
M specials/SpecialCrossCheck.php
M specials/SpecialExternalDbs.php
M tests/phpunit/CrossCheck/CrossCheckerTest.php
M tests/phpunit/DumpMetaInformation/DumpMetaInformationRepoTest.php
M tests/phpunit/DumpMetaInformation/DumpMetaInformationTest.php
M tests/phpunit/EvaluateCrossCheckJobServiceTest.php
M tests/phpunit/Serializer/DumpMetaInformationSerializerTest.php
M tests/phpunit/Serializer/SerializerFactoryTest.php
M tests/phpunit/UpdateTable/UpdateTableTest.php
M tests/phpunit/Violations/CrossCheckResultToViolationTranslatorTest.php
36 files changed, 97 insertions(+), 72 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikidataQualityExternalValidation
refs/changes/21/218321/1
diff --git a/WikibaseQualityExternalValidation.php
b/WikibaseQualityExternalValidation.php
index ce96f3a..eaf146f 100755
--- a/WikibaseQualityExternalValidation.php
+++ b/WikibaseQualityExternalValidation.php
@@ -6,12 +6,12 @@
call_user_func( function () {
// Set credits
$GLOBALS['wgExtensionCredits']['specialpage'][] = array(
- 'path' => __FILE__,
+ 'path' => __DIR__,
'name' => 'WikibaseQualityExternalValidation',
'author' => 'BP2014N1',
'url' =>
'https://www.mediawiki.org/wiki/Extension:WikibaseQualityExternalValidation',
'descriptionmsg' => 'wbqev-desc',
- 'version' => '1.0.0'
+ 'version' => '0.1.0'
);
// Initialize localization and aliases
diff --git a/includes/CrossCheck/Comparer/DispatchingDataValueComparer.php
b/includes/CrossCheck/Comparer/DispatchingDataValueComparer.php
index 6e00e9b..fae357a 100755
--- a/includes/CrossCheck/Comparer/DispatchingDataValueComparer.php
+++ b/includes/CrossCheck/Comparer/DispatchingDataValueComparer.php
@@ -3,7 +3,7 @@
namespace WikibaseQuality\ExternalValidation\CrossCheck\Comparer;
use DataValues\DataValue;
-use Doctrine\Instantiator\Exception\InvalidArgumentException;
+use InvalidArgumentException;
use WikibaseQuality\ExternalValidation\CrossCheck\Result\CompareResult;
use WikibaseQuality\ExternalValidation\DumpMetaInformation\DumpMetaInformation;
diff --git a/includes/CrossCheck/Comparer/EntityIdValueComparer.php
b/includes/CrossCheck/Comparer/EntityIdValueComparer.php
index c2d81bc..2190442 100755
--- a/includes/CrossCheck/Comparer/EntityIdValueComparer.php
+++ b/includes/CrossCheck/Comparer/EntityIdValueComparer.php
@@ -4,7 +4,7 @@
use DataValues\DataValue;
use DataValues\StringValue;
-use Doctrine\Instantiator\Exception\InvalidArgumentException;
+use InvalidArgumentException;
use Wikibase\DataModel\Entity\EntityId;
use Wikibase\DataModel\Entity\EntityIdValue;
use Wikibase\Lib\Store\EntityLookup;
diff --git a/includes/CrossCheck/Comparer/GlobeCoordinateValueComparer.php
b/includes/CrossCheck/Comparer/GlobeCoordinateValueComparer.php
index f2b9e8b..4d8ccd3 100755
--- a/includes/CrossCheck/Comparer/GlobeCoordinateValueComparer.php
+++ b/includes/CrossCheck/Comparer/GlobeCoordinateValueComparer.php
@@ -5,7 +5,7 @@
use DataValues\DataValue;
use DataValues\Geo\Parsers\GlobeCoordinateParser;
use DataValues\GlobeCoordinateValue;
-use Doctrine\Instantiator\Exception\InvalidArgumentException;
+use InvalidArgumentException;
use WikibaseQuality\ExternalValidation\CrossCheck\Result\CompareResult;
use WikibaseQuality\ExternalValidation\DumpMetaInformation\DumpMetaInformation;
diff --git a/includes/CrossCheck/Comparer/MonolingualTextValueComparer.php
b/includes/CrossCheck/Comparer/MonolingualTextValueComparer.php
index c5fe57c..0abe1df 100755
--- a/includes/CrossCheck/Comparer/MonolingualTextValueComparer.php
+++ b/includes/CrossCheck/Comparer/MonolingualTextValueComparer.php
@@ -4,7 +4,7 @@
use DataValues\DataValue;
use DataValues\MonolingualTextValue;
-use Doctrine\Instantiator\Exception\InvalidArgumentException;
+use InvalidArgumentException;
use WikibaseQuality\ExternalValidation\CrossCheck\Result\CompareResult;
use WikibaseQuality\ExternalValidation\DumpMetaInformation\DumpMetaInformation;
diff --git a/includes/CrossCheck/Comparer/MultilingualTextValueComparer.php
b/includes/CrossCheck/Comparer/MultilingualTextValueComparer.php
index 17e1d9b..416a0a3 100755
--- a/includes/CrossCheck/Comparer/MultilingualTextValueComparer.php
+++ b/includes/CrossCheck/Comparer/MultilingualTextValueComparer.php
@@ -4,7 +4,7 @@
use DataValues\DataValue;
use DataValues\MultilingualTextValue;
-use Doctrine\Instantiator\Exception\InvalidArgumentException;
+use InvalidArgumentException;
use WikibaseQuality\ExternalValidation\CrossCheck\Result\CompareResult;
use WikibaseQuality\ExternalValidation\DumpMetaInformation\DumpMetaInformation;
diff --git a/includes/CrossCheck/Comparer/QuantityValueComparer.php
b/includes/CrossCheck/Comparer/QuantityValueComparer.php
index 0e0c7dd..f3d0b62 100755
--- a/includes/CrossCheck/Comparer/QuantityValueComparer.php
+++ b/includes/CrossCheck/Comparer/QuantityValueComparer.php
@@ -4,7 +4,7 @@
use DataValues\DataValue;
use DataValues\QuantityValue;
-use Doctrine\Instantiator\Exception\InvalidArgumentException;
+use InvalidArgumentException;
use ValueParsers\ParserOptions;
use ValueParsers\QuantityParser;
use ValueParsers\ValueParser;
diff --git a/includes/CrossCheck/Comparer/StringComparer.php
b/includes/CrossCheck/Comparer/StringComparer.php
index c7fd06a..088f2bf 100755
--- a/includes/CrossCheck/Comparer/StringComparer.php
+++ b/includes/CrossCheck/Comparer/StringComparer.php
@@ -2,7 +2,7 @@
namespace WikibaseQuality\ExternalValidation\CrossCheck\Comparer;
-use Doctrine\Instantiator\Exception\InvalidArgumentException;
+use InvalidArgumentException;
use WikibaseQuality\ExternalValidation\CrossCheck\Result\CompareResult;
diff --git a/includes/CrossCheck/Comparer/StringValueComparer.php
b/includes/CrossCheck/Comparer/StringValueComparer.php
index 6c87677..f74530f 100755
--- a/includes/CrossCheck/Comparer/StringValueComparer.php
+++ b/includes/CrossCheck/Comparer/StringValueComparer.php
@@ -4,7 +4,7 @@
use DataValues\DataValue;
use DataValues\StringValue;
-use Doctrine\Instantiator\Exception\InvalidArgumentException;
+use InvalidArgumentException;
use WikibaseQuality\ExternalValidation\CrossCheck\Result\CompareResult;
use WikibaseQuality\ExternalValidation\DumpMetaInformation\DumpMetaInformation;
diff --git a/includes/CrossCheck/Comparer/TimeValueComparer.php
b/includes/CrossCheck/Comparer/TimeValueComparer.php
index 4a63552..659f526 100755
--- a/includes/CrossCheck/Comparer/TimeValueComparer.php
+++ b/includes/CrossCheck/Comparer/TimeValueComparer.php
@@ -4,7 +4,7 @@
use DataValues\DataValue;
use DataValues\TimeValue;
-use Doctrine\Instantiator\Exception\InvalidArgumentException;
+use InvalidArgumentException;
use ValueFormatters\FormatterOptions;
use ValueFormatters\ValueFormatter;
use ValueParsers\ParserOptions;
diff --git a/includes/CrossCheck/CrossCheckInteractor.php
b/includes/CrossCheck/CrossCheckInteractor.php
index 945f992..3d50183 100755
--- a/includes/CrossCheck/CrossCheckInteractor.php
+++ b/includes/CrossCheck/CrossCheckInteractor.php
@@ -2,7 +2,7 @@
namespace WikibaseQuality\ExternalValidation\CrossCheck;
-use Doctrine\Instantiator\Exception\InvalidArgumentException;
+use InvalidArgumentException;
use Wikibase\DataModel\Claim\ClaimGuidParser;
use Wikibase\DataModel\Entity\Entity;
use Wikibase\DataModel\Entity\EntityId;
diff --git a/includes/CrossCheck/CrossChecker.php
b/includes/CrossCheck/CrossChecker.php
index 0e20cfa..2996fd9 100755
--- a/includes/CrossCheck/CrossChecker.php
+++ b/includes/CrossCheck/CrossChecker.php
@@ -2,7 +2,7 @@
namespace WikibaseQuality\ExternalValidation\CrossCheck;
-use Doctrine\Instantiator\Exception\InvalidArgumentException;
+use InvalidArgumentException;
use Wikibase\DataModel\Entity\Entity;
use Wikibase\DataModel\Entity\PropertyId;
use Wikibase\DataModel\Snak\PropertyValueSnak;
diff --git a/includes/CrossCheck/ReferenceHandler.php
b/includes/CrossCheck/ReferenceHandler.php
index 7ce09d1..440fcd6 100755
--- a/includes/CrossCheck/ReferenceHandler.php
+++ b/includes/CrossCheck/ReferenceHandler.php
@@ -3,7 +3,7 @@
namespace WikibaseQuality\ExternalValidation\CrossCheck;
use DataValues\StringValue;
-use Doctrine\Instantiator\Exception\InvalidArgumentException;
+use InvalidArgumentException;
use Wikibase\DataModel\Entity\EntityIdValue;
use Wikibase\DataModel\Entity\PropertyId;
use Wikibase\DataModel\Reference;
diff --git a/includes/CrossCheck/Result/CompareResult.php
b/includes/CrossCheck/Result/CompareResult.php
index b92b00f..7cae382 100755
--- a/includes/CrossCheck/Result/CompareResult.php
+++ b/includes/CrossCheck/Result/CompareResult.php
@@ -3,7 +3,7 @@
namespace WikibaseQuality\ExternalValidation\CrossCheck\Result;
use DataValues\DataValue;
-use Doctrine\Instantiator\Exception\InvalidArgumentException;
+use InvalidArgumentException;
/**
diff --git a/includes/CrossCheck/Result/CrossCheckResult.php
b/includes/CrossCheck/Result/CrossCheckResult.php
index a4d3726..3d5a015 100755
--- a/includes/CrossCheck/Result/CrossCheckResult.php
+++ b/includes/CrossCheck/Result/CrossCheckResult.php
@@ -2,7 +2,7 @@
namespace WikibaseQuality\ExternalValidation\CrossCheck\Result;
-use Doctrine\Instantiator\Exception\InvalidArgumentException;
+use InvalidArgumentException;
use Wikibase\DataModel\Entity\PropertyId;
use WikibaseQuality\ExternalValidation\DumpMetaInformation\DumpMetaInformation;
diff --git a/includes/CrossCheck/Result/CrossCheckResultList.php
b/includes/CrossCheck/Result/CrossCheckResultList.php
index 8474d35..5646858 100755
--- a/includes/CrossCheck/Result/CrossCheckResultList.php
+++ b/includes/CrossCheck/Result/CrossCheckResultList.php
@@ -4,7 +4,7 @@
use ArrayIterator;
use Countable;
-use Doctrine\Instantiator\Exception\InvalidArgumentException;
+use InvalidArgumentException;
use IteratorAggregate;
use Wikibase\DataModel\Entity\PropertyId;
diff --git a/includes/CrossCheck/Result/ReferenceResult.php
b/includes/CrossCheck/Result/ReferenceResult.php
index 6c17062..d89fb06 100755
--- a/includes/CrossCheck/Result/ReferenceResult.php
+++ b/includes/CrossCheck/Result/ReferenceResult.php
@@ -3,7 +3,7 @@
namespace WikibaseQuality\ExternalValidation\CrossCheck\Result;
use Wikibase\DataModel\Reference;
-use Doctrine\Instantiator\Exception\InvalidArgumentException;
+use InvalidArgumentException;
/**
diff --git a/includes/DumpMetaInformation/DumpMetaInformation.php
b/includes/DumpMetaInformation/DumpMetaInformation.php
index 43b20e8..96c2149 100755
--- a/includes/DumpMetaInformation/DumpMetaInformation.php
+++ b/includes/DumpMetaInformation/DumpMetaInformation.php
@@ -2,8 +2,7 @@
namespace WikibaseQuality\ExternalValidation\DumpMetaInformation;
-use MWTimestamp;
-use Doctrine\Instantiator\Exception\InvalidArgumentException;
+use InvalidArgumentException;
use Wikibase\DataModel\Entity\ItemId;
use Wikibase\DataModel\Entity\PropertyId;
@@ -39,7 +38,7 @@
/**
* Date of import
*
- * @var MWTimestamp
+ * @var string
*/
private $importDate;
@@ -75,13 +74,14 @@
* @param string $dumpId
* @param ItemId $sourceItemId
* @param array $identifierPropertyIds
- * @param MWTimestamp $importDate
+ * @param string $importDate
* @param string $language
* @param string $sourceUrl
* @param int $size
* @param ItemId $licenseItemId
*/
- public function __construct( $dumpId, ItemId $sourceItemId, array
$identifierPropertyIds, MWTimestamp $importDate, $language, $sourceUrl, $size,
ItemId $licenseItemId ) {
+ public function __construct( $dumpId, ItemId $sourceItemId, array
$identifierPropertyIds, $importDate, $language,
+ $sourceUrl,
$size, ItemId $licenseItemId ) {
if ( !is_string( $dumpId ) ) {
throw new InvalidArgumentException( '$dumpId must be
string.' );
}
@@ -98,7 +98,7 @@
$this->dumpId = $dumpId;
$this->sourceItemId = $sourceItemId;
$this->identifierPropertyIds = $identifierPropertyIds;
- $this->importDate = $importDate;
+ $this->setImportDate( $importDate );
$this->language = $language;
$this->sourceUrl = $sourceUrl;
$this->size = $size;
@@ -127,7 +127,7 @@
}
/**
- * @return MWTimestamp
+ * @return string
*/
public function getImportDate() {
return $this->importDate;
@@ -160,4 +160,20 @@
public function getLicenseItemId() {
return $this->licenseItemId;
}
+
+ /**
+ * @param string $importDate
+ */
+ private function setImportDate( $importDate ) {
+ if ( !is_string( $importDate ) ) {
+ throw new InvalidArgumentException( '$importDate must
be string.' );
+ }
+
+ $timestamp = wfTimestamp( TS_MW, $importDate );
+ if( !$timestamp ) {
+ throw new InvalidArgumentException( '$updatedAt has
invalid timestamp format.' );
+ }
+
+ $this->importDate = $importDate;
+ }
}
\ No newline at end of file
diff --git a/includes/DumpMetaInformation/DumpMetaInformationRepo.php
b/includes/DumpMetaInformation/DumpMetaInformationRepo.php
index 2cdd73b..1942549 100755
--- a/includes/DumpMetaInformation/DumpMetaInformationRepo.php
+++ b/includes/DumpMetaInformation/DumpMetaInformationRepo.php
@@ -4,9 +4,8 @@
use DatabaseBase;
use DBError;
-use MWTimestamp;
-use Doctrine\Instantiator\Exception\InvalidArgumentException;
-use Doctrine\Instantiator\Exception\UnexpectedValueException;
+use InvalidArgumentException;
+use UnexpectedValueException;
use ResultWrapper;
use Wikibase\DataModel\Entity\EntityIdParser;
use Wikibase\DataModel\Entity\ItemId;
@@ -256,7 +255,7 @@
foreach ( $aggregatedRows as $row ) {
$dumpId = $row->dump_id;
$sourceItemId = $this->entityIdParser->parse( $row->source_qid );
- $importDate = new MWTimestamp( $row->import_date );
+ $importDate = wfTimestamp( TS_MW, $row->import_date );
$language = $row->language;
$sourceUrl = $row->source_url;
$size = (int)$row->size;
diff --git a/includes/ExternalDataRepo.php b/includes/ExternalDataRepo.php
index 13b7070..08be3cb 100755
--- a/includes/ExternalDataRepo.php
+++ b/includes/ExternalDataRepo.php
@@ -2,7 +2,7 @@
namespace WikibaseQuality\ExternalValidation;
-use Doctrine\Instantiator\Exception\InvalidArgumentException;
+use InvalidArgumentException;
use Wikibase\DataModel\Entity\PropertyId;
use DBError;
use DatabaseBase;
diff --git a/includes/Serializer/DumpMetaInformationSerializer.php
b/includes/Serializer/DumpMetaInformationSerializer.php
index 304e710..3660635 100755
--- a/includes/Serializer/DumpMetaInformationSerializer.php
+++ b/includes/Serializer/DumpMetaInformationSerializer.php
@@ -65,7 +65,7 @@
'dumpId' => $dumpMetaInformation->getDumpId(),
'sourceItemId' =>
$dumpMetaInformation->getSourceItemId()->getSerialization(),
'identifierPropertyIds' => $identifierPropertyIds,
- 'importDate' =>
$dumpMetaInformation->getImportDate()->format( 'Y-m-d H:i:s' ),
+ 'importDate' => wfTimestamp( TS_ISO_8601,
$dumpMetaInformation->getImportDate() ),
'language' => $dumpMetaInformation->getLanguage(),
'sourceUrl' => $dumpMetaInformation->getSourceUrl(),
'size' => $dumpMetaInformation->getSize(),
diff --git a/includes/Serializer/IndexedTagsSerializer.php
b/includes/Serializer/IndexedTagsSerializer.php
index c2ea79a..45e4ab6 100755
--- a/includes/Serializer/IndexedTagsSerializer.php
+++ b/includes/Serializer/IndexedTagsSerializer.php
@@ -3,7 +3,7 @@
namespace WikibaseQuality\ExternalValidation\Serializer;
use ApiResult;
-use Doctrine\Instantiator\Exception\InvalidArgumentException;
+use InvalidArgumentException;
use Serializers\Serializer;
diff --git a/includes/UpdateTable/ImportContext.php
b/includes/UpdateTable/ImportContext.php
index 45723f3..4d19283 100755
--- a/includes/UpdateTable/ImportContext.php
+++ b/includes/UpdateTable/ImportContext.php
@@ -2,7 +2,7 @@
namespace WikibaseQuality\ExternalValidation\UpdateTable;
-use Doctrine\Instantiator\Exception\InvalidArgumentException;
+use InvalidArgumentException;
/**
diff --git a/includes/UpdateTable/Importer.php
b/includes/UpdateTable/Importer.php
index 44aa502..ab369c5 100755
--- a/includes/UpdateTable/Importer.php
+++ b/includes/UpdateTable/Importer.php
@@ -3,7 +3,6 @@
namespace WikibaseQuality\ExternalValidation\UpdateTable;
use PharData;
-use MWTimestamp;
use Wikibase\DataModel\Entity\ItemId;
use Wikibase\DataModel\Entity\PropertyId;
use WikibaseQuality\ExternalValidation\DumpMetaInformation\DumpMetaInformation;
@@ -136,7 +135,7 @@
$data[0],
new ItemId( $data[1] ),
$identifierPropertyIds,
- new MWTimestamp( $data[3] ),
+ $data[3],
$data[4],
$data[5],
intval( $data[6] ),
diff --git a/includes/Violations/CrossCheckResultToViolationTranslator.php
b/includes/Violations/CrossCheckResultToViolationTranslator.php
index a85a52f..6a7430d 100755
--- a/includes/Violations/CrossCheckResultToViolationTranslator.php
+++ b/includes/Violations/CrossCheckResultToViolationTranslator.php
@@ -45,7 +45,7 @@
$claimGuid = $crossCheckResult->getClaimGuid();
//TODO: Use real ClaimGuid and TypeEntityId
$constraintTypeEntityId =
$crossCheckResult->getDumpMetaInformation()->getSourceItemId();
- $constraintId = md5(
$crossCheckResult->getDumpMetaInformation()->getImportDate()->format( 'YmdHis'
) . $constraintTypeEntityId );
+ $constraintId = md5(
$crossCheckResult->getDumpMetaInformation()->getImportDate() .
$constraintTypeEntityId );
$constraintId = WBQ_EXTERNAL_VALIDATION_ID .
Violation::CONSTRAINT_ID_DELIMITER . $constraintId;
$revisionId = $this->entityRevisionLookup->getLatestRevisionId(
$entityId );
$status = Violation::STATUS_VIOLATION;
diff --git a/includes/Violations/CrossCheckViolationFormatter.php
b/includes/Violations/CrossCheckViolationFormatter.php
index 84228d3..e5a8aac 100755
--- a/includes/Violations/CrossCheckViolationFormatter.php
+++ b/includes/Violations/CrossCheckViolationFormatter.php
@@ -3,7 +3,7 @@
namespace WikibaseQuality\ExternalValidation\Violations;
use Deserializers\Deserializer;
-use Doctrine\Instantiator\Exception\InvalidArgumentException;
+use InvalidArgumentException;
use Html;
use ValueFormatters\ValueFormatter;
use Wikibase\DataModel\Entity\ItemId;
diff --git a/specials/SpecialCrossCheck.php b/specials/SpecialCrossCheck.php
index 03b7f6c..ae94a1a 100755
--- a/specials/SpecialCrossCheck.php
+++ b/specials/SpecialCrossCheck.php
@@ -24,8 +24,8 @@
use Traversable;
use Wikibase\DataModel\Entity\EntityId;
use DataValues\DataValue;
-use Doctrine\Instantiator\Exception\InvalidArgumentException;
-use Doctrine\Instantiator\Exception\UnexpectedValueException;
+use InvalidArgumentException;
+use UnexpectedValueException;
use Wikibase\DataModel\Entity\EntityIdParsingException;
use Wikibase\DataModel\Entity\EntityIdValue;
use WikibaseQuality\ExternalValidation\CrossCheck\CrossCheckInteractor;
@@ -447,7 +447,7 @@
protected function saveResultsInViolationsTable( $entity, $results ) {
$violations =
$this->crossCheckResultToViolationTranslator->translateToViolation( $entity,
$results );
foreach( $violations as $violation ) {
- $this->violationStore->save( $violation );
+ $this->violationStore->insert( $violation );
}
}
@@ -459,6 +459,6 @@
$jobs[] = EvaluateCrossCheckJob::newInsertNow(
$entity->getId()->getSerialization(), $checkTimeStamp, $results );
$jobs[] = EvaluateCrossCheckJob::newInsertDeferred(
$entity->getId()->getSerialization(), $checkTimeStamp, 10*60 );
$jobs[] = EvaluateCrossCheckJob::newInsertDeferred(
$entity->getId()->getSerialization(), $checkTimeStamp, 60*60 );
- JobQueueGroup::singleton()->push( $jobs );
+ //JobQueueGroup::singleton()->push( $jobs );
}
}
diff --git a/specials/SpecialExternalDbs.php b/specials/SpecialExternalDbs.php
index 407c05c..d2d3c6f 100755
--- a/specials/SpecialExternalDbs.php
+++ b/specials/SpecialExternalDbs.php
@@ -134,7 +134,7 @@
foreach ( $dumpMetaInformationGroup as $dumpMetaInformation ) {
$rows[] = array(
$dumpMetaInformation->getDumpId(),
-
$dumpMetaInformation->getImportDate()->getHumanTimestamp(),
+ $this->getLanguage()->timeanddate(
$dumpMetaInformation->getImportDate() ),
Language::fetchLanguageName(
$dumpMetaInformation->getLanguage(),
$this->getLanguage()->getCode()
diff --git a/tests/phpunit/CrossCheck/CrossCheckerTest.php
b/tests/phpunit/CrossCheck/CrossCheckerTest.php
index 5930990..7e83505 100755
--- a/tests/phpunit/CrossCheck/CrossCheckerTest.php
+++ b/tests/phpunit/CrossCheck/CrossCheckerTest.php
@@ -2,7 +2,6 @@
namespace WikibaseQuality\ExternalValidation\Tests\CrossCheck;
-use MWTimestamp;
use Wikibase\DataModel\Entity\Item;
use Wikibase\DataModel\Entity\ItemId;
use Wikibase\DataModel\Entity\PropertyId;
@@ -74,7 +73,7 @@
'foobar',
new ItemId( 'Q36578' ),
array( new PropertyId( 'P227' ) ),
- new MWTimestamp(),
+ '20150101000000',
'en',
'http://www.foo.bar',
42,
@@ -84,7 +83,7 @@
'fubar',
new ItemId( 'Q36578' ),
array( new PropertyId( 'P228' ) ),
- new MWTimestamp(),
+ '20150101000000',
'en',
'http://www.fu.bar',
42,
diff --git a/tests/phpunit/DumpMetaInformation/DumpMetaInformationRepoTest.php
b/tests/phpunit/DumpMetaInformation/DumpMetaInformationRepoTest.php
index fb87d88..0a01c15 100755
--- a/tests/phpunit/DumpMetaInformation/DumpMetaInformationRepoTest.php
+++ b/tests/phpunit/DumpMetaInformation/DumpMetaInformationRepoTest.php
@@ -2,7 +2,6 @@
namespace WikibaseQuality\ExternalValidation\Tests\DumpMetaInformation;
-use MwTimestamp;
use Wikibase\DataModel\Entity\BasicEntityIdParser;
use Wikibase\DataModel\Entity\ItemId;
use Wikibase\DataModel\Entity\PropertyId;
@@ -43,7 +42,7 @@
'foo',
new ItemId( 'Q1' ),
array( new PropertyId( 'P1' ) ),
- new MwTimestamp( '2015-01-01 00:00:00' ),
+ '20150101000000',
'en',
'http://www.foo.bar',
42,
@@ -53,7 +52,7 @@
'bar',
new ItemId( 'Q2' ),
array( new PropertyId( 'P2' ) ),
- new MwTimestamp( '2020-01-01 12:12:12' ),
+ '20200101121212',
'de',
'http://www.fu.bar',
4242,
@@ -66,7 +65,7 @@
new PropertyId( 'P2' ),
new PropertyId( 'P3' )
),
- new MwTimestamp( '2025-01-01 13:13:13' ),
+ '20250101131313',
'de',
'http://www.fu.baz',
424242,
@@ -115,7 +114,7 @@
array(
'dump_id' => $dumpMetaInformation->getDumpId(),
'source_qid' =>
$dumpMetaInformation->getSourceItemId()->getSerialization(),
- 'import_date' =>
$dumpMetaInformation->getImportDate()->format( 'YmdHis' ),
+ 'import_date' => $this->db->timestamp(
$dumpMetaInformation->getImportDate() ),
'language' => $dumpMetaInformation->getLanguage(),
'source_url' => $dumpMetaInformation->getSourceUrl(),
'size' => $dumpMetaInformation->getSize(),
@@ -375,7 +374,7 @@
array(
$dumpMetaInformation->getDumpId(),
$dumpMetaInformation->getSourceItemId()->getSerialization(),
- $dumpMetaInformation->getImportDate()->format( 'YmdHis' ),
+ $dumpMetaInformation->getImportDate(),
$dumpMetaInformation->getLanguage(),
$dumpMetaInformation->getSourceUrl(),
$dumpMetaInformation->getSize(),
@@ -411,7 +410,7 @@
'fubar',
new ItemId( 'Q3' ),
array( new PropertyId( 'P3' ) ),
- new MwTimestamp( '2015-01-01 00:00:00' ),
+ '20150101000000',
'en',
'http://www.fubar.com',
42,
diff --git a/tests/phpunit/DumpMetaInformation/DumpMetaInformationTest.php
b/tests/phpunit/DumpMetaInformation/DumpMetaInformationTest.php
index af20190..e6b8909 100755
--- a/tests/phpunit/DumpMetaInformation/DumpMetaInformationTest.php
+++ b/tests/phpunit/DumpMetaInformation/DumpMetaInformationTest.php
@@ -2,7 +2,6 @@
namespace WikibaseQuality\ExternalValidation\Tests\DumpMetaInformation;
-use MwTimestamp;
use Wikibase\DataModel\Entity\ItemId;
use Wikibase\DataModel\Entity\PropertyId;
use WikibaseQuality\ExternalValidation\DumpMetaInformation\DumpMetaInformation;
@@ -31,7 +30,7 @@
'foo',
new ItemId( 'Q1' ),
array( new PropertyId( 'P1' ) ),
- new MwTimestamp( '2015-01-01 00:00:00' ),
+ '20150101000000',
'en',
'http://www.foo.bar',
42,
@@ -67,7 +66,7 @@
$dumpId = 'foobar';
$sourceItemId = new ItemId( 'Q123' );
$identifierPropertyIds = array( new PropertyId( 'P123' ) );
- $importDate = new MwTimestamp();
+ $importDate = '20150101000000';
$language = 'de';
$sourceUrl = 'http://randomurl.tld';
$size = 42;
@@ -127,6 +126,28 @@
'42',
$licenseItemId,
'InvalidArgumentException'
+ ),
+ array(
+ $dumpId,
+ $sourceItemId,
+ $identifierPropertyIds,
+ 42,
+ $language,
+ $sourceUrl,
+ $size,
+ $licenseItemId,
+ 'InvalidArgumentException'
+ ),
+ array(
+ $dumpId,
+ $sourceItemId,
+ $identifierPropertyIds,
+ 'foobar',
+ $language,
+ $sourceUrl,
+ $size,
+ $licenseItemId,
+ 'InvalidArgumentException'
)
);
}
@@ -143,7 +164,7 @@
public function testGetImportDate() {
- $this->assertEquals(
$this->dumpMetaInformation->getImportDate(), new MwTimestamp( '2015-01-01
00:00:00' ) );
+ $this->assertEquals(
$this->dumpMetaInformation->getImportDate(), '20150101000000' );
}
public function testGetLanguage() {
diff --git a/tests/phpunit/EvaluateCrossCheckJobServiceTest.php
b/tests/phpunit/EvaluateCrossCheckJobServiceTest.php
index 7e815e7..80f1b5b 100755
--- a/tests/phpunit/EvaluateCrossCheckJobServiceTest.php
+++ b/tests/phpunit/EvaluateCrossCheckJobServiceTest.php
@@ -4,8 +4,6 @@
use Wikibase\Lib\ClaimGuidGenerator;
use Wikibase\DataModel\Entity\Item;
-use MWTimestamp;
-use WikibaseQuality\ConstraintReport\EvaluateConstraintReportJobService;
use WikibaseQuality\ExternalValidation\EvaluateCrossCheckJobService;
use WikibaseQuality\ExternalValidation\DumpMetaInformation\DumpMetaInformation;
use WikibaseQuality\ExternalValidation\CrossCheck\Result\CompareResult;
@@ -39,8 +37,6 @@
$this->entity = new Item();
$this->entity->setId( new ItemId( 'Q23' ) );
- $this->checkTimestamp = wfTimestamp( TS_MW );
-
$propertyId = new PropertyId( 'P188' );
$guidGenerator = new ClaimGuidGenerator();
$itemId = new ItemId( 'Q42' );
@@ -49,8 +45,7 @@
$externalId = 'foobar';
- $timeStamp = new MWTimestamp();
- $dumpMetaInformation = new DumpMetaInformation( 'dumpId',
$itemId, $identifierPropertyIds, $timeStamp, 'irrelevent', 'irrelevant.org',
100, $itemId );
+ $dumpMetaInformation = new DumpMetaInformation( 'dumpId',
$itemId, $identifierPropertyIds, '20150101000000', 'irrelevent',
'irrelevant.org', 100, $itemId );
$compareResultViolation = new CompareResult( new StringValue(
'foo' ), array( new StringValue( 'bar' ) ), CompareResult::STATUS_MISMATCH );
$compareResultCompliance = new CompareResult( new StringValue(
'foo' ), array( new StringValue( 'foo' ) ), CompareResult::STATUS_MATCH );
diff --git a/tests/phpunit/Serializer/DumpMetaInformationSerializerTest.php
b/tests/phpunit/Serializer/DumpMetaInformationSerializerTest.php
index 32d76a7..5b4cdd9 100755
--- a/tests/phpunit/Serializer/DumpMetaInformationSerializerTest.php
+++ b/tests/phpunit/Serializer/DumpMetaInformationSerializerTest.php
@@ -2,7 +2,6 @@
namespace WikibaseQuality\ExternalValidation\Tests\Serializer;
-use MWTimestamp;
use Wikibase\DataModel\Entity\ItemId;
use Wikibase\DataModel\Entity\PropertyId;
use WikibaseQuality\ExternalValidation\DumpMetaInformation\DumpMetaInformation;
@@ -32,7 +31,7 @@
'foobar',
new ItemId( 'Q36578' ),
array( new PropertyId( 'P42' ) ),
- new MWTimestamp( '2015-01-01 00:00:00'
),
+ '20150101000000',
'en',
'http://www.foo.bar',
42,
@@ -58,7 +57,7 @@
'foobar',
new ItemId( 'Q36578' ),
array( new PropertyId( 'P42' ) ),
- new MWTimestamp( '2015-01-01 00:00:00' ),
+ '20150101000000',
'en',
'http://www.foo.bar',
42,
@@ -71,7 +70,7 @@
'dumpId' => 'foobar',
'sourceItemId' => 'Q36578',
'identifierPropertyIds' => array( 'P42'
),
- 'importDate' => '2015-01-01 00:00:00',
+ 'importDate' => '2015-01-01T00:00:00Z',
'language' => 'en',
'sourceUrl' => 'http://www.foo.bar',
'size' => 42,
@@ -87,7 +86,7 @@
0 => array( 'id' => 'P42' ),
'_element' => 'propertyId'
),
- 'importDate' => '2015-01-01 00:00:00',
+ 'importDate' => '2015-01-01T00:00:00Z',
'language' => 'en',
'sourceUrl' => 'http://www.foo.bar',
'size' => 42,
diff --git a/tests/phpunit/Serializer/SerializerFactoryTest.php
b/tests/phpunit/Serializer/SerializerFactoryTest.php
index cd568b9..63a60d7 100755
--- a/tests/phpunit/Serializer/SerializerFactoryTest.php
+++ b/tests/phpunit/Serializer/SerializerFactoryTest.php
@@ -57,7 +57,7 @@
'foo',
new ItemId( 'Q1' ),
array( new PropertyId( 'P1' ) ),
- new MwTimestamp( '2015-01-01 00:00:00' ),
+ '20150101000000',
'en',
'http://www.foo.bar',
42,
diff --git a/tests/phpunit/UpdateTable/UpdateTableTest.php
b/tests/phpunit/UpdateTable/UpdateTableTest.php
index 19681a2..a1f68b5 100755
--- a/tests/phpunit/UpdateTable/UpdateTableTest.php
+++ b/tests/phpunit/UpdateTable/UpdateTableTest.php
@@ -2,7 +2,6 @@
namespace WikibaseQuality\ExternalValidation\Tests\UpdateTable;
-use MWTimestamp;
use Wikibase\DataModel\Entity\BasicEntityIdParser;
use Wikibase\DataModel\Entity\ItemId;
use Wikibase\DataModel\Entity\PropertyId;
@@ -54,7 +53,7 @@
'foobar',
new ItemId( 'Q36578' ),
array( new PropertyId( 'P227' ) ),
- new MwTimestamp( '2015-01-01 00:00:00' ),
+ '20150101000000',
'en',
'http://www.foo.bar',
42,
diff --git
a/tests/phpunit/Violations/CrossCheckResultToViolationTranslatorTest.php
b/tests/phpunit/Violations/CrossCheckResultToViolationTranslatorTest.php
index 9922c6d..26bdfda 100755
--- a/tests/phpunit/Violations/CrossCheckResultToViolationTranslatorTest.php
+++ b/tests/phpunit/Violations/CrossCheckResultToViolationTranslatorTest.php
@@ -8,7 +8,6 @@
use Wikibase\DataModel\Entity\Item;
use Wikibase\DataModel\Entity\PropertyId;
use Wikibase\DataModel\Entity\ItemId;
-use MwTimestamp;
use Wikibase\Repo\WikibaseRepo;
use WikibaseQuality\ExternalValidation\CrossCheck\Result\CompareResult;
use WikibaseQuality\ExternalValidation\CrossCheck\Result\CrossCheckResult;
@@ -92,7 +91,7 @@
'foo',
new ItemId( 'Q123456' ),
array( new PropertyId( 'P227' ) ),
- new MwTimestamp( '2015-01-01 00:00:00' ),
+ '20150101000000',
'en',
'http://www.foo.bar',
42,
--
To view, visit https://gerrit.wikimedia.org/r/218321
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie5eac5b53ca776025a4bfd65ae2d22882b03955a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikidataQualityExternalValidation
Gerrit-Branch: master
Gerrit-Owner: Soeren.oldag <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
