Addshore has uploaded a new change for review.
https://gerrit.wikimedia.org/r/106733
Change subject: Fix JsonDumperGeneratorTest on Windows
......................................................................
Fix JsonDumperGeneratorTest on Windows
Change-Id: I74c4aa255eec4130c789c27fc0c4f894ea8f8113
---
M lib/includes/Dumpers/JsonDumpGenerator.php
M lib/tests/phpunit/Dumpers/JsonDumpGeneratorTest.php
2 files changed, 5 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/33/106733/1
diff --git a/lib/includes/Dumpers/JsonDumpGenerator.php
b/lib/includes/Dumpers/JsonDumpGenerator.php
index 743e10c..8fc6539 100644
--- a/lib/includes/Dumpers/JsonDumpGenerator.php
+++ b/lib/includes/Dumpers/JsonDumpGenerator.php
@@ -238,9 +238,11 @@
private function idMatchesShard( EntityId $id ) {
$hash = sha1( $id->getSerialization() );
$n = (int)hexdec( substr( $hash, 0, 8 ) ); // 4 bytes of the
hash
+ if( $n < 0 ) {
+ $n = -$n;
+ }
$n = $n % $this->shardingFactor; // modulo number of shards
-
- return $n == $this->shard;
+ return $n === $this->shard;
}
private function idMatchesType( EntityId $id ) {
diff --git a/lib/tests/phpunit/Dumpers/JsonDumpGeneratorTest.php
b/lib/tests/phpunit/Dumpers/JsonDumpGeneratorTest.php
index fbcb049..ff671d1 100644
--- a/lib/tests/phpunit/Dumpers/JsonDumpGeneratorTest.php
+++ b/lib/tests/phpunit/Dumpers/JsonDumpGeneratorTest.php
@@ -9,14 +9,12 @@
use Wikibase\DataModel\SimpleSiteLink;
use Wikibase\Dumpers\JsonDumpGenerator;
use Wikibase\Entity;
-use Wikibase\EntityContentFactory;
use Wikibase\EntityFactory;
use Wikibase\Item;
use Wikibase\Lib\Serializers\DispatchingEntitySerializer;
use Wikibase\Lib\Serializers\SerializationOptions;
use Wikibase\Lib\Serializers\SerializerFactory;
use Wikibase\Property;
-use Wikibase\StorageException;
/**
* @covers Wikibase\Dumpers\JsonDumpGenerator
@@ -89,6 +87,7 @@
/**
* @param EntityId[] $ids
+ * @param array $missingIds
*
* @return JsonDumpGenerator
*/
--
To view, visit https://gerrit.wikimedia.org/r/106733
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I74c4aa255eec4130c789c27fc0c4f894ea8f8113
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Addshore <addshorew...@gmail.com>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
