[MediaWiki-commits] [Gerrit] Adapted travis scripts and readme to repository renaming. - change (mediawiki...WikibaseQualityConstraints)
Soeren.oldag has uploaded a new change for review. https://gerrit.wikimedia.org/r/233712 Change subject: Adapted travis scripts and readme to repository renaming. .. Adapted travis scripts and readme to repository renaming. Change-Id: I0872c86ecb7dc5d96b858609031fa87825ff4d01 --- M README.md M build/travis/before_script.sh 2 files changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikibaseQualityConstraints refs/changes/12/233712/1 diff --git a/README.md b/README.md index 312b05d..01b291a 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ (https://scrutinizer-ci.com/g/wikimedia/mediawiki-extensions-WikibaseQualityConstraints/?branch=master) This is a complementary extension for the [Wikibase Quality base extension] -(https://github.com/wikimedia/mediawiki-extensions-WikidataQuality.git). +(https://github.com/wikimedia/mediawiki-extensions-WikibaseQuality.git). It performs constraint checks in Wikibase. ## Installation diff --git a/build/travis/before_script.sh b/build/travis/before_script.sh index 1387f91..788a9f8 100644 --- a/build/travis/before_script.sh +++ b/build/travis/before_script.sh @@ -21,10 +21,10 @@ mv mediawiki-extensions-Wikibase-master wiki/extensions/Wikibase # checkout WikibaseQuality -wget https://github.com/wikimedia/mediawiki-extensions-WikidataQuality/archive/master.tar.gz +wget https://github.com/wikimedia/mediawiki-extensions-WikibaseQuality/archive/master.tar.gz tar -zxf master.tar.gz rm master.tar.gz -mv mediawiki-extensions-WikidataQuality-master wiki/extensions/WikibaseQuality +mv mediawiki-extensions-WikibaseQuality-master wiki/extensions/WikibaseQuality cd wiki -- To view, visit https://gerrit.wikimedia.org/r/233712 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0872c86ecb7dc5d96b858609031fa87825ff4d01 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/WikibaseQualityConstraints Gerrit-Branch: master Gerrit-Owner: Soeren.oldag soeren_ol...@freenet.de ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Adapted travis scripts to repository renaming. - change (mediawiki...WikibaseQualityExternalValidation)
Soeren.oldag has uploaded a new change for review.
https://gerrit.wikimedia.org/r/233708
Change subject: Adapted travis scripts to repository renaming.
..
Adapted travis scripts to repository renaming.
Change-Id: Ia9ae9c7fdae01c44eaab47f5b78b759b03cf0c84
---
M README.md
M build/travis/before_script.sh
2 files changed, 11 insertions(+), 11 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikibaseQualityExternalValidation
refs/changes/08/233708/1
diff --git a/README.md b/README.md
index b17f1d1..d8ff63b 100644
--- a/README.md
+++ b/README.md
@@ -1,13 +1,13 @@
# Wikibase Quality External Validation
-[]
-(https://travis-ci.org/wikimedia/mediawiki-extensions-WikidataQualityExternalValidation)
-[]
-(https://coveralls.io/r/wikimedia/mediawiki-extensions-WikidataQualityExternalValidation)
-[]
-(https://scrutinizer-ci.com/g/wikimedia/mediawiki-extensions-WikidataQualityExternalValidation/?branch=master)
+[]
+(https://travis-ci.org/wikimedia/mediawiki-extensions-WikibaseQualityExternalValidation)
+[]
+(https://coveralls.io/r/wikimedia/mediawiki-extensions-WikibaseQualityExternalValidation)
+[]
+(https://scrutinizer-ci.com/g/wikimedia/mediawiki-extensions-WikibaseQualityExternalValidation/?branch=master)
This is a complementary extension for the
-[Wikibase Quality base
extension](https://github.com/wikimedia/mediawiki-extensions-WikidataQuality.git).
+[Wikibase Quality base
extension](https://github.com/wikimedia/mediawiki-extensions-WikibaseQuality.git).
It performs cross checks between Wikibase and external databases to validate
data.
## Installation
@@ -24,11 +24,11 @@
repositories: [
{
type: git,
-url:
https://gerrit.wikimedia.org/r/mediawiki/extensions/WikidataQuality;
+url:
https://gerrit.wikimedia.org/r/mediawiki/extensions/WikibaseQuality;
},
{
type: git,
-url:
https://gerrit.wikimedia.org/r/mediawiki/extensions/WikidataQualityExternalValidation;
+url:
https://gerrit.wikimedia.org/r/mediawiki/extensions/WikibaseQualityExternalValidation;
}
],
require: {
diff --git a/build/travis/before_script.sh b/build/travis/before_script.sh
index 91840d3..e676b97 100644
--- a/build/travis/before_script.sh
+++ b/build/travis/before_script.sh
@@ -21,10 +21,10 @@
mv mediawiki-extensions-Wikibase-master wiki/extensions/Wikibase
# checkout WikibaseQuality
-wget
https://github.com/wikimedia/mediawiki-extensions-WikidataQuality/archive/master.tar.gz
+wget
https://github.com/wikimedia/mediawiki-extensions-WikibaseQuality/archive/master.tar.gz
tar -zxf master.tar.gz
rm master.tar.gz
-mv mediawiki-extensions-WikidataQuality-master wiki/extensions/WikibaseQuality
+mv mediawiki-extensions-WikibaseQuality-master wiki/extensions/WikibaseQuality
cd wiki
--
To view, visit https://gerrit.wikimedia.org/r/233708
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia9ae9c7fdae01c44eaab47f5b78b759b03cf0c84
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikibaseQualityExternalValidation
Gerrit-Branch: master
Gerrit-Owner: Soeren.oldag soeren_ol...@freenet.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Adapted travis scripts and readme to repository renaming. - change (mediawiki...WikibaseQualityConstraints)
Soeren.oldag has uploaded a new change for review.
https://gerrit.wikimedia.org/r/233715
Change subject: Adapted travis scripts and readme to repository renaming.
..
Adapted travis scripts and readme to repository renaming.
Change-Id: I057ffe261a4ae96c004e4c65734200b07da70ec8
---
M README.md
M build/travis/before_script.sh
2 files changed, 11 insertions(+), 11 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikibaseQualityConstraints
refs/changes/15/233715/1
diff --git a/README.md b/README.md
index abbc8bf..fcc0327 100644
--- a/README.md
+++ b/README.md
@@ -1,13 +1,13 @@
# Wikibase Quality Constraints
-[]
-(https://travis-ci.org/wikimedia/mediawiki-extensions-WikidataQualityConstraints)
-[]
-(https://coveralls.io/r/wikimedia/mediawiki-extensions-WikidataQualityConstraints)
-[]
-(https://scrutinizer-ci.com/g/wikimedia/mediawiki-extensions-WikidataQualityConstraints/?branch=master)
+[]
+(https://travis-ci.org/wikimedia/mediawiki-extensions-WikibaseQualityConstraints)
+[]
+(https://coveralls.io/r/wikimedia/mediawiki-extensions-WikibaseQualityConstraints)
+[]
+(https://scrutinizer-ci.com/g/wikimedia/mediawiki-extensions-WikibaseQualityConstraints/?branch=master)
This is a complementary extension for the [Wikibase Quality base extension]
-(https://github.com/wikimedia/mediawiki-extensions-WikidataQuality.git).
+(https://github.com/wikimedia/mediawiki-extensions-WikibaseQuality.git).
It performs constraint checks in Wikibase.
## Installation
@@ -24,11 +24,11 @@
repositories: [
{
type: git,
-url:
https://gerrit.wikimedia.org/r/mediawiki/extensions/WikidataQuality;
+url:
https://gerrit.wikimedia.org/r/mediawiki/extensions/WikibaseQuality;
},
{
type: git,
-url:
https://gerrit.wikimedia.org/r/mediawiki/extensions/WikidataQualityConstraints;
+url:
https://gerrit.wikimedia.org/r/mediawiki/extensions/WikibaseQualityConstraints;
}
],
require: {
diff --git a/build/travis/before_script.sh b/build/travis/before_script.sh
index d16c1f8..cb90a90 100644
--- a/build/travis/before_script.sh
+++ b/build/travis/before_script.sh
@@ -21,10 +21,10 @@
mv mediawiki-extensions-Wikibase-master wiki/extensions/Wikibase
# checkout WikibaseQuality
-wget
https://github.com/wikimedia/mediawiki-extensions-WikidataQuality/archive/v1.tar.gz
+wget
https://github.com/wikimedia/mediawiki-extensions-WikibaseQuality/archive/v1.tar.gz
tar -zxf v1.tar.gz
rm v1.tar.gz
-mv mediawiki-extensions-WikidataQuality-1 wiki/extensions/WikibaseQuality
+mv mediawiki-extensions-WikibaseQuality-1 wiki/extensions/WikibaseQuality
cd wiki
--
To view, visit https://gerrit.wikimedia.org/r/233715
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I057ffe261a4ae96c004e4c65734200b07da70ec8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikibaseQualityConstraints
Gerrit-Branch: v1
Gerrit-Owner: Soeren.oldag soeren_ol...@freenet.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Follow up on compatibility breaks in Wikibase. - change (mediawiki...WikibaseQualityExternalValidation)
Soeren.oldag has uploaded a new change for review.
https://gerrit.wikimedia.org/r/233696
Change subject: Follow up on compatibility breaks in Wikibase.
..
Follow up on compatibility breaks in Wikibase.
Change-Id: I56cf650f98e88c2cba7ad6ec78438b02ae807ded
---
M api/RunCrossCheck.php
M specials/SpecialExternalDbs.php
M tests/phpunit/Api/RunCrossCheckTest.php
M tests/phpunit/EvaluateCrossCheckJobServiceTest.php
M tests/phpunit/Specials/SpecialCrossCheckTest.php
5 files changed, 46 insertions(+), 41 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikibaseQualityExternalValidation
refs/changes/96/233696/1
diff --git a/api/RunCrossCheck.php b/api/RunCrossCheck.php
index 4df22d1..b92eb63 100644
--- a/api/RunCrossCheck.php
+++ b/api/RunCrossCheck.php
@@ -4,14 +4,14 @@
use ApiBase;
use ApiMain;
-use DataValues\Serializers;
use RequestContext;
+use DataValues\Serializers;
+use Wikibase\DataModel\Entity\EntityId;
use Wikibase\DataModel\Services\EntityId\EntityIdParser;
use Wikibase\DataModel\Services\Statement\StatementGuidValidator;
use Wikibase\Repo\Api\ApiErrorReporter;
use Wikibase\Repo\Api\ApiHelperFactory;
use Wikibase\Repo\Api\ResultBuilder;
-use Wikibase\DataModel\Entity\EntityId;
use Wikibase\Repo\WikibaseRepo;
use WikibaseQuality\ExternalValidation\CrossCheck\CrossCheckInteractor;
use WikibaseQuality\ExternalValidation\ExternalValidationServices;
@@ -28,6 +28,11 @@
* @license GNU GPL v2+
*/
class RunCrossCheck extends ApiBase {
+
+ /**
+* @var EntityIdParser
+*/
+ private $entityIdParser;
/**
* @var StatementGuidValidator
@@ -55,11 +60,6 @@
private $resultBuilder;
/**
-* @var EntityIdParser
-*/
- private $idParser;
-
- /**
* Creates new instance from global state.
*
* @param ApiMain $main
@@ -75,11 +75,11 @@
$main,
$name,
$prefix,
+ $repo-getEntityIdParser(),
$repo-getStatementGuidValidator(),
$externalValidationServices-getCrossCheckInteractor(),
$externalValidationServices-getSerializerFactory(),
- $repo-getApiHelperFactory( RequestContext::getMain() ),
- $repo-getEntityIdParser()
+ $repo-getApiHelperFactory( RequestContext::getMain() )
);
}
@@ -87,18 +87,23 @@
* @param ApiMain $main
* @param string $name
* @param string $prefix
+* @param EntityIdParser $entityIdParser
+* @param StatementGuidValidator $statementGuidValidator
+* @param CrossCheckInteractor $crossCheckInteractor
+* @param SerializerFactory $serializerFactory
+* @param ApiHelperFactory $apiHelperFactory
*/
- public function __construct( ApiMain $main, $name, $prefix = '',
StatementGuidValidator $claimGuidValidator,
-
CrossCheckInteractor $crossCheckInteractor, SerializerFactory
$serializerFactory,
-
ApiHelperFactory $apiHelperFactory, EntityIdParser $idParser ) {
+ public function __construct( ApiMain $main, $name, $prefix = '',
EntityIdParser $entityIdParser,
+
StatementGuidValidator $statementGuidValidator, CrossCheckInteractor
$crossCheckInteractor,
+
SerializerFactory $serializerFactory, ApiHelperFactory $apiHelperFactory ) {
parent::__construct( $main, $name, $prefix );
- $this-statementGuidValidator = $claimGuidValidator;
+ $this-entityIdParser = $entityIdParser;
+ $this-statementGuidValidator = $statementGuidValidator;
$this-crossCheckInteractor = $crossCheckInteractor;
$this-serializerFactory = $serializerFactory;
- $this-errorReporter = $apiHelperFactory-getErrorReporter(
$this );
$this-resultBuilder = $apiHelperFactory-getResultBuilder(
$this );
- $this-idParser = $idParser;
+ $this-errorReporter = $apiHelperFactory-getErrorReporter(
$this );
}
/**
@@ -142,7 +147,7 @@
*/
private function parseEntityIds( array $entityIds ) {
return array_map(
- array( $this-idParser, 'parse' ),
+ array( $this-entityIdParser, 'parse' ),
$entityIds
);
}
diff --git a/specials/SpecialExternalDbs.php b/specials/SpecialExternalDbs.php
index abae13a..5da0a24 100644
--- a/specials/SpecialExternalDbs.php
+++
[MediaWiki-commits] [Gerrit] Follow up on compatibility breaks in Wikibase. - change (mediawiki...WikibaseQualityExternalValidation)
Soeren.oldag has uploaded a new change for review.
https://gerrit.wikimedia.org/r/233691
Change subject: Follow up on compatibility breaks in Wikibase.
..
Follow up on compatibility breaks in Wikibase.
Change-Id: Ia3b0b6f4e4d3c03d849632325758caf07f076a64
---
M api/RunCrossCheck.php
M composer.json
M includes/CrossCheck/CrossCheckInteractor.php
M includes/CrossCheck/CrossChecker.php
M specials/SpecialCrossCheck.php
M specials/SpecialExternalDbs.php
M tests/phpunit/Api/RunCrossCheckTest.php
M tests/phpunit/CrossCheck/CrossCheckInteractorTest.php
M tests/phpunit/EvaluateCrossCheckJobServiceTest.php
M tests/phpunit/Specials/SpecialCrossCheckTest.php
10 files changed, 63 insertions(+), 61 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikibaseQualityExternalValidation
refs/changes/91/233691/1
diff --git a/api/RunCrossCheck.php b/api/RunCrossCheck.php
index 31d94f0..b92eb63 100755
--- a/api/RunCrossCheck.php
+++ b/api/RunCrossCheck.php
@@ -4,14 +4,14 @@
use ApiBase;
use ApiMain;
-use DataValues\Serializers;
use RequestContext;
+use DataValues\Serializers;
+use Wikibase\DataModel\Entity\EntityId;
+use Wikibase\DataModel\Services\EntityId\EntityIdParser;
+use Wikibase\DataModel\Services\Statement\StatementGuidValidator;
use Wikibase\Repo\Api\ApiErrorReporter;
use Wikibase\Repo\Api\ApiHelperFactory;
use Wikibase\Repo\Api\ResultBuilder;
-use Wikibase\DataModel\Entity\EntityId;
-use Wikibase\DataModel\Entity\EntityIdParser;
-use Wikibase\Lib\ClaimGuidValidator;
use Wikibase\Repo\WikibaseRepo;
use WikibaseQuality\ExternalValidation\CrossCheck\CrossCheckInteractor;
use WikibaseQuality\ExternalValidation\ExternalValidationServices;
@@ -30,9 +30,14 @@
class RunCrossCheck extends ApiBase {
/**
-* @var ClaimGuidValidator
+* @var EntityIdParser
*/
- private $claimGuidValidator;
+ private $entityIdParser;
+
+ /**
+* @var StatementGuidValidator
+*/
+ private $statementGuidValidator;
/**
* @var CrossCheckInteractor
@@ -55,11 +60,6 @@
private $resultBuilder;
/**
-* @var EntityIdParser
-*/
- private $idParser;
-
- /**
* Creates new instance from global state.
*
* @param ApiMain $main
@@ -75,11 +75,11 @@
$main,
$name,
$prefix,
- $repo-getClaimGuidValidator(),
+ $repo-getEntityIdParser(),
+ $repo-getStatementGuidValidator(),
$externalValidationServices-getCrossCheckInteractor(),
$externalValidationServices-getSerializerFactory(),
- $repo-getApiHelperFactory( RequestContext::getMain() ),
- $repo-getEntityIdParser()
+ $repo-getApiHelperFactory( RequestContext::getMain() )
);
}
@@ -87,18 +87,23 @@
* @param ApiMain $main
* @param string $name
* @param string $prefix
+* @param EntityIdParser $entityIdParser
+* @param StatementGuidValidator $statementGuidValidator
+* @param CrossCheckInteractor $crossCheckInteractor
+* @param SerializerFactory $serializerFactory
+* @param ApiHelperFactory $apiHelperFactory
*/
- public function __construct( ApiMain $main, $name, $prefix = '',
ClaimGuidValidator $claimGuidValidator,
-
CrossCheckInteractor $crossCheckInteractor, SerializerFactory
$serializerFactory,
-
ApiHelperFactory $apiHelperFactory, EntityIdParser $idParser ) {
+ public function __construct( ApiMain $main, $name, $prefix = '',
EntityIdParser $entityIdParser,
+
StatementGuidValidator $statementGuidValidator, CrossCheckInteractor
$crossCheckInteractor,
+
SerializerFactory $serializerFactory, ApiHelperFactory $apiHelperFactory ) {
parent::__construct( $main, $name, $prefix );
- $this-claimGuidValidator = $claimGuidValidator;
+ $this-entityIdParser = $entityIdParser;
+ $this-statementGuidValidator = $statementGuidValidator;
$this-crossCheckInteractor = $crossCheckInteractor;
$this-serializerFactory = $serializerFactory;
- $this-errorReporter = $apiHelperFactory-getErrorReporter(
$this );
$this-resultBuilder = $apiHelperFactory-getResultBuilder(
$this );
- $this-idParser = $idParser;
+ $this-errorReporter = $apiHelperFactory-getErrorReporter(
$this );
}
/**
@@ -142,7 +147,7
[MediaWiki-commits] [Gerrit] Adapted travis scripts to repository renaming. - change (mediawiki...WikibaseQualityExternalValidation)
Soeren.oldag has uploaded a new change for review.
https://gerrit.wikimedia.org/r/233703
Change subject: Adapted travis scripts to repository renaming.
..
Adapted travis scripts to repository renaming.
Change-Id: I99f032d22404b6b5866c14eb8d4bc69e16b05269
---
M README.md
M build/travis/before_script.sh
2 files changed, 11 insertions(+), 11 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikibaseQualityExternalValidation
refs/changes/03/233703/1
diff --git a/README.md b/README.md
index b17f1d1..d8ff63b 100755
--- a/README.md
+++ b/README.md
@@ -1,13 +1,13 @@
# Wikibase Quality External Validation
-[]
-(https://travis-ci.org/wikimedia/mediawiki-extensions-WikidataQualityExternalValidation)
-[]
-(https://coveralls.io/r/wikimedia/mediawiki-extensions-WikidataQualityExternalValidation)
-[]
-(https://scrutinizer-ci.com/g/wikimedia/mediawiki-extensions-WikidataQualityExternalValidation/?branch=master)
+[]
+(https://travis-ci.org/wikimedia/mediawiki-extensions-WikibaseQualityExternalValidation)
+[]
+(https://coveralls.io/r/wikimedia/mediawiki-extensions-WikibaseQualityExternalValidation)
+[]
+(https://scrutinizer-ci.com/g/wikimedia/mediawiki-extensions-WikibaseQualityExternalValidation/?branch=master)
This is a complementary extension for the
-[Wikibase Quality base
extension](https://github.com/wikimedia/mediawiki-extensions-WikidataQuality.git).
+[Wikibase Quality base
extension](https://github.com/wikimedia/mediawiki-extensions-WikibaseQuality.git).
It performs cross checks between Wikibase and external databases to validate
data.
## Installation
@@ -24,11 +24,11 @@
repositories: [
{
type: git,
-url:
https://gerrit.wikimedia.org/r/mediawiki/extensions/WikidataQuality;
+url:
https://gerrit.wikimedia.org/r/mediawiki/extensions/WikibaseQuality;
},
{
type: git,
-url:
https://gerrit.wikimedia.org/r/mediawiki/extensions/WikidataQualityExternalValidation;
+url:
https://gerrit.wikimedia.org/r/mediawiki/extensions/WikibaseQualityExternalValidation;
}
],
require: {
diff --git a/build/travis/before_script.sh b/build/travis/before_script.sh
index 4b6b35e..845672e 100644
--- a/build/travis/before_script.sh
+++ b/build/travis/before_script.sh
@@ -21,10 +21,10 @@
mv mediawiki-extensions-Wikibase-master wiki/extensions/Wikibase
# checkout WikibaseQuality
-wget
https://github.com/wikimedia/mediawiki-extensions-WikidataQuality/archive/v1.tar.gz
+wget
https://github.com/wikimedia/mediawiki-extensions-WikibaseQuality/archive/v1.tar.gz
tar -zxf v1.tar.gz
rm v1.tar.gz
-mv mediawiki-extensions-WikidataQuality-1 wiki/extensions/WikibaseQuality
+mv mediawiki-extensions-WikibaseQuality-1 wiki/extensions/WikibaseQuality
cd wiki
--
To view, visit https://gerrit.wikimedia.org/r/233703
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I99f032d22404b6b5866c14eb8d4bc69e16b05269
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikibaseQualityExternalValidation
Gerrit-Branch: v1
Gerrit-Owner: Soeren.oldag soeren_ol...@freenet.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix coverage for UpdateExternalDataTest. - change (mediawiki...WikibaseQualityExternalValidation)
Soeren.oldag has submitted this change and it was merged. Change subject: Fix coverage for UpdateExternalDataTest. .. Fix coverage for UpdateExternalDataTest. Change-Id: Ibdead1e3b23126e17b8cc63fc81f762a56b20b34 --- M tests/phpunit/UpdateExternalData/UpdateExternalDataTest.php 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Soeren.oldag: Verified; Looks good to me, approved diff --git a/tests/phpunit/UpdateExternalData/UpdateExternalDataTest.php b/tests/phpunit/UpdateExternalData/UpdateExternalDataTest.php index f6ff03e..e437e49 100755 --- a/tests/phpunit/UpdateExternalData/UpdateExternalDataTest.php +++ b/tests/phpunit/UpdateExternalData/UpdateExternalDataTest.php @@ -13,7 +13,7 @@ /** * @covers WikibaseQuality\ExternalValidation\UpdateExternalData\ExternalDataImporter * @covers WikibaseQuality\ExternalValidation\UpdateExternalData\CsvImportSettings - * @covers WikibaseQuality\ExternalValidation\Maintenance\UpdateTable + * @covers WikibaseQuality\ExternalValidation\Maintenance\UpdateExternalData * * @group WikibaseQualityExternalValidation * @group Database -- To view, visit https://gerrit.wikimedia.org/r/222865 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ibdead1e3b23126e17b8cc63fc81f762a56b20b34 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/WikibaseQualityExternalValidation Gerrit-Branch: v1 Gerrit-Owner: Soeren.oldag soeren_ol...@freenet.de Gerrit-Reviewer: Soeren.oldag soeren_ol...@freenet.de ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix coverage for UpdateExternalDataTest. - change (mediawiki...WikibaseQualityExternalValidation)
Soeren.oldag has uploaded a new change for review. https://gerrit.wikimedia.org/r/222864 Change subject: Fix coverage for UpdateExternalDataTest. .. Fix coverage for UpdateExternalDataTest. Change-Id: Ibdead1e3b23126e17b8cc63fc81f762a56b20b34 --- M tests/phpunit/UpdateExternalData/UpdateExternalDataTest.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikibaseQualityExternalValidation refs/changes/64/222864/1 diff --git a/tests/phpunit/UpdateExternalData/UpdateExternalDataTest.php b/tests/phpunit/UpdateExternalData/UpdateExternalDataTest.php index 0d8b492..9e0805b 100755 --- a/tests/phpunit/UpdateExternalData/UpdateExternalDataTest.php +++ b/tests/phpunit/UpdateExternalData/UpdateExternalDataTest.php @@ -13,7 +13,7 @@ /** * @covers WikibaseQuality\ExternalValidation\UpdateExternalData\ExternalDataImporter * @covers WikibaseQuality\ExternalValidation\UpdateExternalData\CsvImportSettings - * @covers WikibaseQuality\ExternalValidation\Maintenance\UpdateTable + * @covers WikibaseQuality\ExternalValidation\Maintenance\UpdateExternalData * * @group WikibaseQualityExternalValidation * @group Database -- To view, visit https://gerrit.wikimedia.org/r/222864 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ibdead1e3b23126e17b8cc63fc81f762a56b20b34 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/WikibaseQualityExternalValidation Gerrit-Branch: master Gerrit-Owner: Soeren.oldag soeren_ol...@freenet.de ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix coverage for UpdateExternalDataTest. - change (mediawiki...WikibaseQualityExternalValidation)
Soeren.oldag has uploaded a new change for review. https://gerrit.wikimedia.org/r/222865 Change subject: Fix coverage for UpdateExternalDataTest. .. Fix coverage for UpdateExternalDataTest. Change-Id: Ibdead1e3b23126e17b8cc63fc81f762a56b20b34 --- M tests/phpunit/UpdateExternalData/UpdateExternalDataTest.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikibaseQualityExternalValidation refs/changes/65/222865/1 diff --git a/tests/phpunit/UpdateExternalData/UpdateExternalDataTest.php b/tests/phpunit/UpdateExternalData/UpdateExternalDataTest.php index f6ff03e..e437e49 100755 --- a/tests/phpunit/UpdateExternalData/UpdateExternalDataTest.php +++ b/tests/phpunit/UpdateExternalData/UpdateExternalDataTest.php @@ -13,7 +13,7 @@ /** * @covers WikibaseQuality\ExternalValidation\UpdateExternalData\ExternalDataImporter * @covers WikibaseQuality\ExternalValidation\UpdateExternalData\CsvImportSettings - * @covers WikibaseQuality\ExternalValidation\Maintenance\UpdateTable + * @covers WikibaseQuality\ExternalValidation\Maintenance\UpdateExternalData * * @group WikibaseQualityExternalValidation * @group Database -- To view, visit https://gerrit.wikimedia.org/r/222865 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ibdead1e3b23126e17b8cc63fc81f762a56b20b34 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/WikibaseQualityExternalValidation Gerrit-Branch: v1 Gerrit-Owner: Soeren.oldag soeren_ol...@freenet.de ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Database schema improvements (T102992) - change (mediawiki...WikibaseQualityConstraints)
Soeren.oldag has uploaded a new change for review.
https://gerrit.wikimedia.org/r/222861
Change subject: Database schema improvements (T102992)
..
Database schema improvements (T102992)
Change-Id: I32dacbde7aef28bf012ca90218d9fb3a7cd703a0
---
M includes/ConstraintRepository.php
M maintenance/UpdateTable.php
M sql/create_wbqc_constraints.sql
3 files changed, 8 insertions(+), 10 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikibaseQualityConstraints
refs/changes/61/222861/1
diff --git a/includes/ConstraintRepository.php
b/includes/ConstraintRepository.php
index ee811ac..c051f01 100644
--- a/includes/ConstraintRepository.php
+++ b/includes/ConstraintRepository.php
@@ -49,9 +49,6 @@
);
$db = wfGetDB( DB_MASTER );
- $db-commit( __METHOD__, flush );
- wfWaitForSlaves();
-
return $db-insert( CONSTRAINT_TABLE, $accumulator );
}
@@ -87,4 +84,4 @@
return $constraints;
}
-}
\ No newline at end of file
+}
diff --git a/maintenance/UpdateTable.php b/maintenance/UpdateTable.php
index a016025..7f2d65b 100644
--- a/maintenance/UpdateTable.php
+++ b/maintenance/UpdateTable.php
@@ -31,6 +31,10 @@
$data = fgetcsv( $csvFile );
if ( $data === false || ++$i % $this-mBatchSize === 0
) {
$constraintRepo-insertBatch( $accumulator );
+
+ wfGetDB( DB_MASTER )-commit( __METHOD__,
flush );
+ wfWaitForSlaves();
+
if ( !$this-isQuiet() ) {
print \r\033[K;
print $i rows inserted;
@@ -54,4 +58,4 @@
// @codeCoverageIgnoreStart
$maintClass = 'WikibaseQuality\ConstraintReport\Maintenance\UpdateTable';
require_once RUN_MAINTENANCE_IF_MAIN;
-// @codeCoverageIgnoreEnd
\ No newline at end of file
+// @codeCoverageIgnoreEnd
diff --git a/sql/create_wbqc_constraints.sql b/sql/create_wbqc_constraints.sql
index 7b371c1..969cbab 100644
--- a/sql/create_wbqc_constraints.sql
+++ b/sql/create_wbqc_constraints.sql
@@ -1,12 +1,9 @@
CREATE TABLE IF NOT EXISTS /*_*/wbqc_constraints (
- constraint_guidVARCHAR(255) PRIMARY KEY,
+ constraint_guidVARBINARY(63) PRIMARY KEY,
pidINT(11) NOT NULL,
- constraint_type_qid VARCHAR(255)NOT NULL,
+ constraint_type_qid VARBINARY(25) NOT NULL,
constraint_parametersTEXT DEFAULT
NULL
) /*$wgDBTableOptions*/;
CREATE INDEX /*i*/wbqc_constraints_pid_index
ON /*_*/wbqc_constraints (pid);
-
-CREATE INDEX /*i*/wbqc_constraints_constraint_type_qid_index
-ON /*_*/wbqc_constraints (constraint_type_qid);
\ No newline at end of file
--
To view, visit https://gerrit.wikimedia.org/r/222861
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I32dacbde7aef28bf012ca90218d9fb3a7cd703a0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikibaseQualityConstraints
Gerrit-Branch: refs/master
Gerrit-Owner: Soeren.oldag soeren_ol...@freenet.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Database schema improvements (T102992) - change (mediawiki...WikibaseQualityExternalValidation)
Soeren.oldag has uploaded a new change for review.
https://gerrit.wikimedia.org/r/222867
Change subject: Database schema improvements (T102992)
..
Database schema improvements (T102992)
Change-Id: I3b7b5a4ee149b6a2f36c1c19521b9a7783052ea0
---
M includes/ExternalDataRepo.php
M includes/UpdateExternalData/ExternalDataImporter.php
M sql/create_wbqev_dump_information.sql
M sql/create_wbqev_identifier_properties.sql
M tests/phpunit/DumpMetaInformation/SqlDumpMetaInformationRepoTest.php
M tests/phpunit/ExternalDataRepoTest.php
M tests/phpunit/UpdateExternalData/UpdateExternalDataTest.php
7 files changed, 30 insertions(+), 26 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikibaseQualityExternalValidation
refs/changes/67/222867/1
diff --git a/includes/ExternalDataRepo.php b/includes/ExternalDataRepo.php
index 8767b28..2f0c22e 100755
--- a/includes/ExternalDataRepo.php
+++ b/includes/ExternalDataRepo.php
@@ -35,14 +35,13 @@
Assert::parameterElementType( 'string', $dumpIds, '$dumpIds' );
Assert::parameterElementType( 'string', $externalIds,
'$externalIds' );
Assert::parameterElementType(
'Wikibase\DataModel\Entity\PropertyId', $propertyIds, '$propertyIds' );
+ Assert::parameter( count( $dumpIds ) 0, '$dumpIds', '$dumpIds
has to contain at least one element.' );
+ Assert::parameter( count( $externalIds ) 0, '$externalIds',
'$externalIds has to contain at least one element.' );
- $conditions = array();
- if ( $dumpIds ) {
- $conditions['dump_id'] = $dumpIds;
- }
- if ( $externalIds ) {
- $conditions['external_id'] = $externalIds;
- }
+ $conditions = array(
+ 'dump_id' = $dumpIds,
+ 'external_id' = $externalIds
+ );
if ( $propertyIds ) {
$conditions['pid'] = $propertyIds;
}
@@ -106,9 +105,6 @@
},
$externalDataBatch
);
-
- $db-commit( __METHOD__, flush );
- wfWaitForSlaves();
return $db-insert( self::TABLE_NAME, $accumulator );
}
diff --git a/includes/UpdateExternalData/ExternalDataImporter.php
b/includes/UpdateExternalData/ExternalDataImporter.php
index 2f8971a..3a34146 100755
--- a/includes/UpdateExternalData/ExternalDataImporter.php
+++ b/includes/UpdateExternalData/ExternalDataImporter.php
@@ -137,6 +137,7 @@
}
$i = 0;
+ $db = wfGetDB( DB_MASTER );
$accumulator = array();
while ( true ) {
$data = fgetcsv( $csvFile );
@@ -148,6 +149,9 @@
exit( 'Unknown database error
occurred.' );
}
+ $db-commit( __METHOD__, 'flush' );
+ wfWaitForSlaves();
+
$this-log( \r\033[K );
$this-log( $i rows inserted );
diff --git a/sql/create_wbqev_dump_information.sql
b/sql/create_wbqev_dump_information.sql
index 8762bc6..1245e05 100644
--- a/sql/create_wbqev_dump_information.sql
+++ b/sql/create_wbqev_dump_information.sql
@@ -1,7 +1,7 @@
CREATE TABLE IF NOT EXISTS /*_*/wbqev_dump_information (
id VARBINARY(25) PRIMARY KEY NOT NULL,
source_qid VARBINARY(15) NOT NULL,
- import_date VARBINARY(25) NOT NULL,
+ import_date TIMESTAMP NOT NULL,
language VARBINARY(10) NOT NULL,
source_url VARBINARY(300) UNIQUE NOT NULL,
size INT UNSIGNEDNOT NULL,
diff --git a/sql/create_wbqev_identifier_properties.sql
b/sql/create_wbqev_identifier_properties.sql
index 56d8469..d417cc0 100644
--- a/sql/create_wbqev_identifier_properties.sql
+++ b/sql/create_wbqev_identifier_properties.sql
@@ -2,4 +2,6 @@
identifier_pid VARBINARY(15) NOT NULL,
dump_id VARBINARY(25) NOT NULL,
PRIMARY KEY (identifier_pid, dump_id)
-) /*$wgDBTableOptions*/;
\ No newline at end of file
+) /*$wgDBTableOptions*/;
+
+CREATE INDEX /*i*/dump_id ON /*_*/wbqev_identifier_properties (dump_id);
\ No newline at end of file
diff --git
a/tests/phpunit/DumpMetaInformation/SqlDumpMetaInformationRepoTest.php
b/tests/phpunit/DumpMetaInformation/SqlDumpMetaInformationRepoTest.php
index 3af7f1a..d6609e3 100755
--- a/tests/phpunit/DumpMetaInformation/SqlDumpMetaInformationRepoTest.php
+++ b/tests/phpunit/DumpMetaInformation/SqlDumpMetaInformationRepoTest.php
@@ -327,7 +327,7 @@
array(
$dumpMetaInformation-getDumpId(),
$dumpMetaInformation-getSourceItemId()-getSerialization(),
-
[MediaWiki-commits] [Gerrit] Database schema improvements (T102992) - change (mediawiki...WikibaseQualityExternalValidation)
Soeren.oldag has uploaded a new change for review.
https://gerrit.wikimedia.org/r/222869
Change subject: Database schema improvements (T102992)
..
Database schema improvements (T102992)
Change-Id: I05048ca7d321ca052111d2c5262d13c6433b4c9d
---
M includes/ExternalDataRepo.php
M includes/UpdateExternalData/ExternalDataImporter.php
M sql/create_wbqev_dump_information.sql
M sql/create_wbqev_identifier_properties.sql
M tests/phpunit/DumpMetaInformation/SqlDumpMetaInformationRepoTest.php
M tests/phpunit/ExternalDataRepoTest.php
M tests/phpunit/UpdateExternalData/UpdateExternalDataTest.php
7 files changed, 48 insertions(+), 69 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikibaseQualityExternalValidation
refs/changes/69/222869/1
diff --git a/includes/ExternalDataRepo.php b/includes/ExternalDataRepo.php
index 548d6d0..422ed2b 100755
--- a/includes/ExternalDataRepo.php
+++ b/includes/ExternalDataRepo.php
@@ -31,14 +31,13 @@
Assert::parameterElementType( 'string', $dumpIds, '$dumpIds' );
Assert::parameterElementType( 'string', $externalIds,
'$externalIds' );
Assert::parameterElementType(
'Wikibase\DataModel\Entity\PropertyId', $propertyIds, '$propertyIds' );
+ Assert::parameter( count( $dumpIds ) 0, '$dumpIds', '$dumpIds
has to contain at least one element.' );
+ Assert::parameter( count( $externalIds ) 0, '$externalIds',
'$externalIds has to contain at least one element.' );
- $conditions = array();
- if ( $dumpIds ) {
- $conditions['dump_id'] = $dumpIds;
- }
- if ( $externalIds ) {
- $conditions['external_id'] = $externalIds;
- }
+ $conditions = array(
+ 'dump_id' = $dumpIds,
+ 'external_id' = $externalIds
+ );
if ( $propertyIds ) {
$conditions['pid'] = $propertyIds;
}
@@ -100,9 +99,6 @@
},
$externalDataBatch
);
-
- $db-commit( __METHOD__, flush );
- wfWaitForSlaves();
return $db-insert( self::TABLE_NAME, $accumulator );
}
diff --git a/includes/UpdateExternalData/ExternalDataImporter.php
b/includes/UpdateExternalData/ExternalDataImporter.php
index 44249aa..c753226 100755
--- a/includes/UpdateExternalData/ExternalDataImporter.php
+++ b/includes/UpdateExternalData/ExternalDataImporter.php
@@ -139,6 +139,7 @@
}
$i = 0;
+ $db = wfGetDB( DB_MASTER );
$accumulator = array();
while ( true ) {
$data = fgetcsv( $csvFile );
@@ -150,6 +151,9 @@
exit( 'Unknown database error
occurred.' );
}
+ $db-commit( __METHOD__, 'flush' );
+ wfWaitForSlaves();
+
$this-log( \r\033[K );
$this-log( $i rows inserted );
diff --git a/sql/create_wbqev_dump_information.sql
b/sql/create_wbqev_dump_information.sql
index 8762bc6..1245e05 100644
--- a/sql/create_wbqev_dump_information.sql
+++ b/sql/create_wbqev_dump_information.sql
@@ -1,7 +1,7 @@
CREATE TABLE IF NOT EXISTS /*_*/wbqev_dump_information (
id VARBINARY(25) PRIMARY KEY NOT NULL,
source_qid VARBINARY(15) NOT NULL,
- import_date VARBINARY(25) NOT NULL,
+ import_date TIMESTAMP NOT NULL,
language VARBINARY(10) NOT NULL,
source_url VARBINARY(300) UNIQUE NOT NULL,
size INT UNSIGNEDNOT NULL,
diff --git a/sql/create_wbqev_identifier_properties.sql
b/sql/create_wbqev_identifier_properties.sql
index 56d8469..d417cc0 100644
--- a/sql/create_wbqev_identifier_properties.sql
+++ b/sql/create_wbqev_identifier_properties.sql
@@ -2,4 +2,6 @@
identifier_pid VARBINARY(15) NOT NULL,
dump_id VARBINARY(25) NOT NULL,
PRIMARY KEY (identifier_pid, dump_id)
-) /*$wgDBTableOptions*/;
\ No newline at end of file
+) /*$wgDBTableOptions*/;
+
+CREATE INDEX /*i*/dump_id ON /*_*/wbqev_identifier_properties (dump_id);
\ No newline at end of file
diff --git
a/tests/phpunit/DumpMetaInformation/SqlDumpMetaInformationRepoTest.php
b/tests/phpunit/DumpMetaInformation/SqlDumpMetaInformationRepoTest.php
index 472bc27..3966c9d 100755
--- a/tests/phpunit/DumpMetaInformation/SqlDumpMetaInformationRepoTest.php
+++ b/tests/phpunit/DumpMetaInformation/SqlDumpMetaInformationRepoTest.php
@@ -312,30 +312,18 @@
public function testSaveDumpMetaInformation( DumpMetaInformation
$dumpMetaInformation ) {
$this-dumpMetaInformationRepo-save( $dumpMetaInformation );
-$this-assertSelect(
+
[MediaWiki-commits] [Gerrit] Database schema improvements (T102992) - change (mediawiki...WikibaseQualityConstraints)
Soeren.oldag has uploaded a new change for review.
https://gerrit.wikimedia.org/r/222862
Change subject: Database schema improvements (T102992)
..
Database schema improvements (T102992)
Change-Id: I32dacbde7aef28bf012ca90218d9fb3a7cd703a0
---
M includes/ConstraintRepository.php
M maintenance/UpdateConstraintsTable.php
M sql/create_wbqc_constraints.sql
3 files changed, 8 insertions(+), 10 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikibaseQualityConstraints
refs/changes/62/222862/1
diff --git a/includes/ConstraintRepository.php
b/includes/ConstraintRepository.php
index d25e0bc..0f6e55d 100644
--- a/includes/ConstraintRepository.php
+++ b/includes/ConstraintRepository.php
@@ -51,9 +51,6 @@
);
$db = wfGetDB( DB_MASTER );
- $db-commit( __METHOD__, flush );
- wfWaitForSlaves();
-
return $db-insert( CONSTRAINT_TABLE, $accumulator );
}
@@ -90,4 +87,4 @@
return $constraints;
}
-}
\ No newline at end of file
+}
diff --git a/maintenance/UpdateConstraintsTable.php
b/maintenance/UpdateConstraintsTable.php
index a1885d8..5f0e656 100644
--- a/maintenance/UpdateConstraintsTable.php
+++ b/maintenance/UpdateConstraintsTable.php
@@ -45,6 +45,10 @@
$data = fgetcsv( $csvFile );
if ( $data === false || ++$i % $this-mBatchSize === 0
) {
$constraintRepo-insertBatch( $accumulator );
+
+ wfGetDB( DB_MASTER )-commit( __METHOD__,
flush );
+ wfWaitForSlaves();
+
if ( !$this-isQuiet() ) {
$this-output( \r\033[K );
$this-output( $i rows inserted );
@@ -68,4 +72,4 @@
// @codeCoverageIgnoreStart
$maintClass =
'WikibaseQuality\ConstraintReport\Maintenance\UpdateConstraintsTable';
require_once RUN_MAINTENANCE_IF_MAIN;
-// @codeCoverageIgnoreEnd
\ No newline at end of file
+// @codeCoverageIgnoreEnd
diff --git a/sql/create_wbqc_constraints.sql b/sql/create_wbqc_constraints.sql
index 7b371c1..969cbab 100644
--- a/sql/create_wbqc_constraints.sql
+++ b/sql/create_wbqc_constraints.sql
@@ -1,12 +1,9 @@
CREATE TABLE IF NOT EXISTS /*_*/wbqc_constraints (
- constraint_guidVARCHAR(255) PRIMARY KEY,
+ constraint_guidVARBINARY(63) PRIMARY KEY,
pidINT(11) NOT NULL,
- constraint_type_qid VARCHAR(255)NOT NULL,
+ constraint_type_qid VARBINARY(25) NOT NULL,
constraint_parametersTEXT DEFAULT
NULL
) /*$wgDBTableOptions*/;
CREATE INDEX /*i*/wbqc_constraints_pid_index
ON /*_*/wbqc_constraints (pid);
-
-CREATE INDEX /*i*/wbqc_constraints_constraint_type_qid_index
-ON /*_*/wbqc_constraints (constraint_type_qid);
\ No newline at end of file
--
To view, visit https://gerrit.wikimedia.org/r/222862
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I32dacbde7aef28bf012ca90218d9fb3a7cd703a0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikibaseQualityConstraints
Gerrit-Branch: master
Gerrit-Owner: Soeren.oldag soeren_ol...@freenet.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [WIP] Database improvements. - change (mediawiki...WikibaseQualityConstraints)
Soeren.oldag has uploaded a new change for review.
https://gerrit.wikimedia.org/r/222722
Change subject: [WIP] Database improvements.
..
[WIP] Database improvements.
Change-Id: I32dacbde7aef28bf012ca90218d9fb3a7cd703a0
---
M includes/ConstraintRepository.php
M maintenance/UpdateTable.php
M sql/create_wbqc_constraints.sql
3 files changed, 8 insertions(+), 11 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikibaseQualityConstraints
refs/changes/22/222722/1
diff --git a/includes/ConstraintRepository.php
b/includes/ConstraintRepository.php
index 000de2c..df66a75 100644
--- a/includes/ConstraintRepository.php
+++ b/includes/ConstraintRepository.php
@@ -51,9 +51,6 @@
);
$db = wfGetDB( DB_MASTER );
- $db-commit( __METHOD__, flush );
- wfWaitForSlaves();
-
return $db-insert( CONSTRAINT_TABLE, $accumulator );
}
diff --git a/maintenance/UpdateTable.php b/maintenance/UpdateTable.php
index 8078776..246e1e0 100644
--- a/maintenance/UpdateTable.php
+++ b/maintenance/UpdateTable.php
@@ -51,6 +51,10 @@
$data = fgetcsv( $csvFile );
if ( $data === false || ++$i % $this-mBatchSize === 0
) {
$constraintRepo-insertBatch( $accumulator );
+
+ wfGetDB( DB_MASTER )-commit( __METHOD__,
flush );
+ wfWaitForSlaves();
+
if ( !$this-isQuiet() ) {
$this-output( \r\033[K );
$this-output( $i rows inserted );
diff --git a/sql/create_wbqc_constraints.sql b/sql/create_wbqc_constraints.sql
index 7b371c1..22c4640 100755
--- a/sql/create_wbqc_constraints.sql
+++ b/sql/create_wbqc_constraints.sql
@@ -2,11 +2,7 @@
constraint_guidVARCHAR(255) PRIMARY KEY,
pidINT(11) NOT NULL,
constraint_type_qid VARCHAR(255)NOT NULL,
- constraint_parametersTEXT DEFAULT
NULL
-) /*$wgDBTableOptions*/;
-
-CREATE INDEX /*i*/wbqc_constraints_pid_index
-ON /*_*/wbqc_constraints (pid);
-
-CREATE INDEX /*i*/wbqc_constraints_constraint_type_qid_index
-ON /*_*/wbqc_constraints (constraint_type_qid);
\ No newline at end of file
+ constraint_parametersTEXT DEFAULT
NULL,
+ PRIMARY KEY ( constraint_guid ),
+ INDEX /*i*/pid ( pid )
+) /*$wgDBTableOptions*/;
\ No newline at end of file
--
To view, visit https://gerrit.wikimedia.org/r/222722
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I32dacbde7aef28bf012ca90218d9fb3a7cd703a0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikibaseQualityConstraints
Gerrit-Branch: v1
Gerrit-Owner: Soeren.oldag soeren_ol...@freenet.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Renamed ComparativeValueParser test namespace - change (mediawiki...WikibaseQualityExternalValidation)
Soeren.oldag has uploaded a new change for review. https://gerrit.wikimedia.org/r/222083 Change subject: Renamed ComparativeValueParser test namespace .. Renamed ComparativeValueParser test namespace Change-Id: I8b326ad9432a75e01d97f65e6aa47d1265c15a93 --- R tests/phpunit/CrossCheck/ValueParser/ComparativeValueParserFactoryTest.php R tests/phpunit/CrossCheck/ValueParser/MultilingualTextValueParserTest.php R tests/phpunit/CrossCheck/ValueParser/StringValueParserTest.php R tests/phpunit/CrossCheck/ValueParser/ValueParserTestBase.php 4 files changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikibaseQualityExternalValidation refs/changes/83/222083/1 diff --git a/tests/phpunit/CrossCheck/ComparativeValueParser/ComparativeValueParserFactoryTest.php b/tests/phpunit/CrossCheck/ValueParser/ComparativeValueParserFactoryTest.php similarity index 95% rename from tests/phpunit/CrossCheck/ComparativeValueParser/ComparativeValueParserFactoryTest.php rename to tests/phpunit/CrossCheck/ValueParser/ComparativeValueParserFactoryTest.php index df7f2c7..7902313 100644 --- a/tests/phpunit/CrossCheck/ComparativeValueParser/ComparativeValueParserFactoryTest.php +++ b/tests/phpunit/CrossCheck/ValueParser/ComparativeValueParserFactoryTest.php @@ -1,6 +1,6 @@ ?php -namespace WikibaseQuality\ExternalValidation\Tests\CrossCheck\ComparativeValueParser; +namespace WikibaseQuality\ExternalValidation\Tests\CrossCheck\ValueParser; use WikibaseQuality\ExternalValidation\CrossCheck\ValueParser\ComparativeValueParserFactory; diff --git a/tests/phpunit/CrossCheck/ComparativeValueParser/MultilingualTextValueParserTest.php b/tests/phpunit/CrossCheck/ValueParser/MultilingualTextValueParserTest.php similarity index 93% rename from tests/phpunit/CrossCheck/ComparativeValueParser/MultilingualTextValueParserTest.php rename to tests/phpunit/CrossCheck/ValueParser/MultilingualTextValueParserTest.php index 4f25811..6c6043d 100644 --- a/tests/phpunit/CrossCheck/ComparativeValueParser/MultilingualTextValueParserTest.php +++ b/tests/phpunit/CrossCheck/ValueParser/MultilingualTextValueParserTest.php @@ -1,6 +1,6 @@ ?php -namespace WikibaseQuality\ExternalValidation\Tests\CrossCheck\ComparativeValueParser; +namespace WikibaseQuality\ExternalValidation\Tests\CrossCheck\ValueParser; use DataValues\MonolingualTextValue; use DataValues\MultilingualTextValue; diff --git a/tests/phpunit/CrossCheck/ComparativeValueParser/StringValueParserTest.php b/tests/phpunit/CrossCheck/ValueParser/StringValueParserTest.php similarity index 91% rename from tests/phpunit/CrossCheck/ComparativeValueParser/StringValueParserTest.php rename to tests/phpunit/CrossCheck/ValueParser/StringValueParserTest.php index fb32239..1b24ba9 100644 --- a/tests/phpunit/CrossCheck/ComparativeValueParser/StringValueParserTest.php +++ b/tests/phpunit/CrossCheck/ValueParser/StringValueParserTest.php @@ -1,6 +1,6 @@ ?php -namespace WikibaseQuality\ExternalValidation\Tests\CrossCheck\ComparativeValueParser; +namespace WikibaseQuality\ExternalValidation\Tests\CrossCheck\ValueParser; use WikibaseQuality\ExternalValidation\CrossCheck\ValueParser\StringValueParser; use DataValues\StringValue; diff --git a/tests/phpunit/CrossCheck/ComparativeValueParser/ValueParserTestBase.php b/tests/phpunit/CrossCheck/ValueParser/ValueParserTestBase.php similarity index 93% rename from tests/phpunit/CrossCheck/ComparativeValueParser/ValueParserTestBase.php rename to tests/phpunit/CrossCheck/ValueParser/ValueParserTestBase.php index 2bbe743..e671623 100755 --- a/tests/phpunit/CrossCheck/ComparativeValueParser/ValueParserTestBase.php +++ b/tests/phpunit/CrossCheck/ValueParser/ValueParserTestBase.php @@ -1,6 +1,6 @@ ?php -namespace WikibaseQuality\ExternalValidation\Tests\CrossCheck\ComparativeValueParser; +namespace WikibaseQuality\ExternalValidation\Tests\CrossCheck\ValueParser; use DataValues\DataValue; use ValueParsers\ValueParser; -- To view, visit https://gerrit.wikimedia.org/r/222083 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8b326ad9432a75e01d97f65e6aa47d1265c15a93 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/WikibaseQualityExternalValidation Gerrit-Branch: master Gerrit-Owner: Soeren.oldag soeren_ol...@freenet.de ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [WIP] Resolved further hints from code review from Daniel (s... - change (mediawiki...WikibaseQualityExternalValidation)
Soeren.oldag has uploaded a new change for review.
https://gerrit.wikimedia.org/r/221624
Change subject: [WIP] Resolved further hints from code review from Daniel (see
change 219243).
..
[WIP] Resolved further hints from code review from Daniel (see change 219243).
Change-Id: I8f2288c5d8060a5b6bcbe65e622b504a868b3b31
---
M composer.json
D includes/CrossCheck/ComparativeValueParser/BasicComparativeValueParser.php
D
includes/CrossCheck/ComparativeValueParser/ComparativeMultilingualTextValueParser.php
D includes/CrossCheck/ComparativeValueParser/ComparativeStringValueParser.php
D includes/CrossCheck/ComparativeValueParser/ComparativeValueParser.php
D includes/CrossCheck/ComparativeValueParser/ComparativeValueParserFactory.php
D
includes/CrossCheck/ComparativeValueParser/DispatchingComparativeValueParser.php
M includes/CrossCheck/Comparer/DataValueComparer.php
M includes/CrossCheck/Comparer/DataValueComparerFactory.php
M includes/CrossCheck/Comparer/QuantityValueComparer.php
M includes/CrossCheck/Comparer/StringComparer.php
M includes/CrossCheck/CrossChecker.php
A includes/CrossCheck/ValueParser/ComparativeValueParser.php
A includes/CrossCheck/ValueParser/ComparativeValueParserFactory.php
A includes/CrossCheck/ValueParser/MultilingualTextValueParser.php
A includes/CrossCheck/ValueParser/StringValueParser.php
M includes/DumpMetaInformation/SqlDumpMetaInformationRepo.php
M includes/ExternalValidationServices.php
M includes/UpdateTable/ExternalDataImporter.php
M specials/SpecialExternalDbs.php
D
tests/phpunit/CrossCheck/ComparativeValueParser/BasicComparativeValueParserTest.php
D
tests/phpunit/CrossCheck/ComparativeValueParser/ComparativeMultilingualTextValueParserTest.php
D
tests/phpunit/CrossCheck/ComparativeValueParser/ComparativeStringValueParserTest.php
M
tests/phpunit/CrossCheck/ComparativeValueParser/ComparativeValueParserFactoryTest.php
D
tests/phpunit/CrossCheck/ComparativeValueParser/ComparativeValueParserTestBase.php
D
tests/phpunit/CrossCheck/ComparativeValueParser/DispatchingComparativeValueParserTest.php
A
tests/phpunit/CrossCheck/ComparativeValueParser/MultilingualTextValueParserTest.php
A tests/phpunit/CrossCheck/ComparativeValueParser/StringValueParserTest.php
A tests/phpunit/CrossCheck/ComparativeValueParser/ValueParserTestBase.php
M tests/phpunit/CrossCheck/Comparer/DataValueComparerFactoryTest.php
M tests/phpunit/CrossCheck/Comparer/EntityIdValueComparerTest.php
M tests/phpunit/CrossCheck/Comparer/MonolingualTextValueComparerTest.php
M tests/phpunit/CrossCheck/Comparer/MultilingualTextValueComparerTest.php
M tests/phpunit/CrossCheck/Comparer/StringComparerTest.php
M tests/phpunit/CrossCheck/Comparer/StringValueComparerTest.php
M tests/phpunit/CrossCheck/CrossCheckerTest.php
M tests/phpunit/ExternalValidationServicesTest.php
M tests/phpunit/Specials/SpecialCrossCheckTest.php
38 files changed, 627 insertions(+), 1,054 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikibaseQualityExternalValidation
refs/changes/24/221624/1
diff --git a/composer.json b/composer.json
index 041e4d6..8df076e 100755
--- a/composer.json
+++ b/composer.json
@@ -18,7 +18,7 @@
wikibase/data-model: ~3.0,
serialization/serialization: 3.*,=3.2.1,
wikibase/data-model-serialization: ~1.3,
- wikimedia/assert: ~0.2.2
+ wikimedia/assert: ~0.2.2
},
require-dev: {
phpunit/phpunit: ~3.7,=3.7.37,
diff --git
a/includes/CrossCheck/ComparativeValueParser/BasicComparativeValueParser.php
b/includes/CrossCheck/ComparativeValueParser/BasicComparativeValueParser.php
deleted file mode 100644
index 210e5da..000
--- a/includes/CrossCheck/ComparativeValueParser/BasicComparativeValueParser.php
+++ /dev/null
@@ -1,70 +0,0 @@
-?php
-
-namespace WikibaseQuality\ExternalValidation\CrossCheck\ComparativeValueParser;
-
-use InvalidArgumentException;
-use DataValues\DataValue;
-use ValueParsers\ParserOptions;
-use ValueParsers\ValueParser;
-use Wikibase\Repo\ValueParserFactory;
-use WikibaseQuality\ExternalValidation\DumpMetaInformation\DumpMetaInformation;
-
-/**
- * Class BasicComparativeValueParser
- * @package
WikibaseQuality\ExternalValidation\CrossCheck\ComparativeValueParser
- * @author BP2014N1
- * @license GNU GPL v2+
- */
-class BasicComparativeValueParser implements ComparativeValueParser {
-
- /**
-* @var ValueParserFactory
-*/
- private $valueParserFactory;
-
- /**
-* @var array
-*/
- private $conversionTypeMapping;
-
- /**
-* @param ValueParserFactory $valueParserFactory
-* @param array $conversionTypeMapping
-*/
- public function __construct( ValueParserFactory $valueParserFactory,
array $conversionTypeMapping ) {
- $this-valueParserFactory = $valueParserFactory;
-
[MediaWiki-commits] [Gerrit] Resolved further hints from code review from Daniel (see cha... - change (mediawiki...WikibaseQualityExternalValidation)
Soeren.oldag has uploaded a new change for review.
https://gerrit.wikimedia.org/r/221627
Change subject: Resolved further hints from code review from Daniel (see change
219243).
..
Resolved further hints from code review from Daniel (see change 219243).
Change-Id: I7b5c2692bf95afecf84f30b8db04c28ae84912cd
---
M composer.json
D includes/CrossCheck/ComparativeValueParser/BasicComparativeValueParser.php
D
includes/CrossCheck/ComparativeValueParser/ComparativeMultilingualTextValueParser.php
D includes/CrossCheck/ComparativeValueParser/ComparativeStringValueParser.php
D includes/CrossCheck/ComparativeValueParser/ComparativeValueParser.php
D includes/CrossCheck/ComparativeValueParser/ComparativeValueParserFactory.php
D
includes/CrossCheck/ComparativeValueParser/DispatchingComparativeValueParser.php
M includes/CrossCheck/Comparer/DataValueComparer.php
M includes/CrossCheck/Comparer/DataValueComparerFactory.php
M includes/CrossCheck/Comparer/QuantityValueComparer.php
M includes/CrossCheck/Comparer/StringComparer.php
M includes/CrossCheck/CrossChecker.php
A includes/CrossCheck/ValueParser/ComparativeValueParser.php
A includes/CrossCheck/ValueParser/ComparativeValueParserFactory.php
A includes/CrossCheck/ValueParser/MultilingualTextValueParser.php
A includes/CrossCheck/ValueParser/StringValueParser.php
M includes/DumpMetaInformation/SqlDumpMetaInformationRepo.php
M includes/ExternalValidationServices.php
M includes/UpdateTable/ExternalDataImporter.php
M specials/SpecialCrossCheck.php
D
tests/phpunit/CrossCheck/ComparativeValueParser/BasicComparativeValueParserTest.php
D
tests/phpunit/CrossCheck/ComparativeValueParser/ComparativeMultilingualTextValueParserTest.php
D
tests/phpunit/CrossCheck/ComparativeValueParser/ComparativeStringValueParserTest.php
M
tests/phpunit/CrossCheck/ComparativeValueParser/ComparativeValueParserFactoryTest.php
D
tests/phpunit/CrossCheck/ComparativeValueParser/ComparativeValueParserTestBase.php
D
tests/phpunit/CrossCheck/ComparativeValueParser/DispatchingComparativeValueParserTest.php
A
tests/phpunit/CrossCheck/ComparativeValueParser/MultilingualTextValueParserTest.php
A tests/phpunit/CrossCheck/ComparativeValueParser/StringValueParserTest.php
A tests/phpunit/CrossCheck/ComparativeValueParser/ValueParserTestBase.php
M tests/phpunit/CrossCheck/Comparer/DataValueComparerFactoryTest.php
M tests/phpunit/CrossCheck/Comparer/EntityIdValueComparerTest.php
M tests/phpunit/CrossCheck/Comparer/MonolingualTextValueComparerTest.php
M tests/phpunit/CrossCheck/Comparer/MultilingualTextValueComparerTest.php
M tests/phpunit/CrossCheck/Comparer/StringComparerTest.php
M tests/phpunit/CrossCheck/Comparer/StringValueComparerTest.php
M tests/phpunit/CrossCheck/CrossCheckerTest.php
M tests/phpunit/ExternalValidationServicesTest.php
M tests/phpunit/Specials/SpecialCrossCheckTest.php
38 files changed, 806 insertions(+), 1,219 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikibaseQualityExternalValidation
refs/changes/27/221627/1
diff --git a/composer.json b/composer.json
index b4699a6..f03a304 100755
--- a/composer.json
+++ b/composer.json
@@ -18,7 +18,7 @@
wikibase/data-model: ~3.0,
serialization/serialization: 3.*,=3.2.1,
wikibase/data-model-serialization: ~1.3,
- wikimedia/assert: ~0.2.2
+ wikimedia/assert: ~0.2.2
},
require-dev: {
phpunit/phpunit: ~3.7,=3.7.37|~4.5,
diff --git
a/includes/CrossCheck/ComparativeValueParser/BasicComparativeValueParser.php
b/includes/CrossCheck/ComparativeValueParser/BasicComparativeValueParser.php
deleted file mode 100644
index 210e5da..000
--- a/includes/CrossCheck/ComparativeValueParser/BasicComparativeValueParser.php
+++ /dev/null
@@ -1,70 +0,0 @@
-?php
-
-namespace WikibaseQuality\ExternalValidation\CrossCheck\ComparativeValueParser;
-
-use InvalidArgumentException;
-use DataValues\DataValue;
-use ValueParsers\ParserOptions;
-use ValueParsers\ValueParser;
-use Wikibase\Repo\ValueParserFactory;
-use WikibaseQuality\ExternalValidation\DumpMetaInformation\DumpMetaInformation;
-
-/**
- * Class BasicComparativeValueParser
- * @package
WikibaseQuality\ExternalValidation\CrossCheck\ComparativeValueParser
- * @author BP2014N1
- * @license GNU GPL v2+
- */
-class BasicComparativeValueParser implements ComparativeValueParser {
-
- /**
-* @var ValueParserFactory
-*/
- private $valueParserFactory;
-
- /**
-* @var array
-*/
- private $conversionTypeMapping;
-
- /**
-* @param ValueParserFactory $valueParserFactory
-* @param array $conversionTypeMapping
-*/
- public function __construct( ValueParserFactory $valueParserFactory,
array $conversionTypeMapping ) {
- $this-valueParserFactory = $valueParserFactory;
- $this-conversionTypeMapping =
[MediaWiki-commits] [Gerrit] Adoptions for renaming of WikibaseQualityFactory. - change (mediawiki...WikibaseQualityConstraints)
Soeren.oldag has uploaded a new change for review.
https://gerrit.wikimedia.org/r/221635
Change subject: Adoptions for renaming of WikibaseQualityFactory.
..
Adoptions for renaming of WikibaseQualityFactory.
Change-Id: I923dc1288916255ff90503f034a19056f881cdd0
---
M specials/SpecialConstraintReport.php
M tests/phpunit/Specials/SpecialConstraintReportTest.php
2 files changed, 4 insertions(+), 4 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikibaseQualityConstraints
refs/changes/35/221635/1
diff --git a/specials/SpecialConstraintReport.php
b/specials/SpecialConstraintReport.php
index 007f1a3..a876482 100644
--- a/specials/SpecialConstraintReport.php
+++ b/specials/SpecialConstraintReport.php
@@ -40,7 +40,7 @@
use WikibaseQuality\Html\HtmlTableCellBuilder;
use WikibaseQuality\Html\HtmlTableHeaderBuilder;
use WikibaseQuality\Violations\ViolationStore;
-use WikibaseQuality\WikibaseQualityFactory;
+use WikibaseQuality\WikibaseQualityServices;
/**
@@ -115,7 +115,7 @@
private $violationStore;
public static function newFromGlobalState() {
- $wikibaseQuality = WikibaseQualityFactory::getDefaultInstance();
+ $wikibaseQuality =
WikibaseQualityServices::getDefaultInstance();
$constraintReportFactory =
ConstraintReportFactory::getDefaultInstance();
$wikibaseRepo = WikibaseRepo::getDefaultInstance();
diff --git a/tests/phpunit/Specials/SpecialConstraintReportTest.php
b/tests/phpunit/Specials/SpecialConstraintReportTest.php
index f54ca32..2157e4e 100644
--- a/tests/phpunit/Specials/SpecialConstraintReportTest.php
+++ b/tests/phpunit/Specials/SpecialConstraintReportTest.php
@@ -14,7 +14,7 @@
use Wikibase\DataModel\Entity\EntityId;
use WikibaseQuality\ConstraintReport\ConstraintReportFactory;
use WikibaseQuality\ConstraintReport\Specials\SpecialConstraintReport;
-use WikibaseQuality\WikibaseQualityFactory;
+use WikibaseQuality\WikibaseQualityServices;
/**
@@ -68,7 +68,7 @@
}
protected function newSpecialPage() {
- $wikibaseQuality = WikibaseQualityFactory::getDefaultInstance();
+ $wikibaseQuality =
WikibaseQualityServices::getDefaultInstance();
$constraintReportFactory =
ConstraintReportFactory::getDefaultInstance();
$wikibaseRepo = WikibaseRepo::getDefaultInstance();
--
To view, visit https://gerrit.wikimedia.org/r/221635
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I923dc1288916255ff90503f034a19056f881cdd0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikibaseQualityConstraints
Gerrit-Branch: master
Gerrit-Owner: Soeren.oldag soeren_ol...@freenet.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Renamed WikibaseQualityFactory to WikibaseQualityServices. - change (mediawiki...WikibaseQuality)
Soeren.oldag has uploaded a new change for review.
https://gerrit.wikimedia.org/r/221628
Change subject: Renamed WikibaseQualityFactory to WikibaseQualityServices.
..
Renamed WikibaseQualityFactory to WikibaseQualityServices.
Change-Id: Iac71c1b1c60fc71321e8fcc8fbd7e326dc52a8e9
---
M api/GetViolationMessages.php
M api/GetViolationTypes.php
M api/ModifyViolation.php
R includes/WikibaseQualityServices.php
M specials/SpecialViolationsPage.php
M tests/phpunit/Specials/SpecialViolationsPageTest.php
M tests/phpunit/WikibaseQualityFactoryTest.php
7 files changed, 15 insertions(+), 15 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikibaseQuality
refs/changes/28/221628/1
diff --git a/api/GetViolationMessages.php b/api/GetViolationMessages.php
index f8eb2d2..daef849 100755
--- a/api/GetViolationMessages.php
+++ b/api/GetViolationMessages.php
@@ -15,7 +15,7 @@
use WikibaseQuality\Violations\Violation;
use WikibaseQuality\Violations\ViolationLookup;
use WikibaseQuality\Violations\ViolationQuery;
-use WikibaseQuality\WikibaseQualityFactory;
+use WikibaseQuality\WikibaseQualityServices;
/**
@@ -57,7 +57,7 @@
*/
public static function newFromGlobalState( ApiMain $main, $name,
$prefix = '' ) {
$wikibaseRepo = WikibaseRepo::getDefaultInstance();
- $qualityServices = WikibaseQualityFactory::getDefaultInstance();
+ $qualityServices =
WikibaseQualityServices::getDefaultInstance();
return new self(
$main,
diff --git a/api/GetViolationTypes.php b/api/GetViolationTypes.php
index e8d7ac8..3c7d4ee 100644
--- a/api/GetViolationTypes.php
+++ b/api/GetViolationTypes.php
@@ -7,7 +7,7 @@
use Wikibase\Api\ApiWikibase;
use Wikibase\Repo\WikibaseRepo;
use WikibaseQuality\Violations\DispatchingViolationContext;
-use WikibaseQuality\WikibaseQualityFactory;
+use WikibaseQuality\WikibaseQualityServices;
/**
@@ -32,7 +32,7 @@
* @return GetViolationTypes
*/
public static function newFromGlobalState( ApiMain $main, $name,
$prefix = '' ) {
- $qualityServices = WikibaseQualityFactory::getDefaultInstance();
+ $qualityServices =
WikibaseQualityServices::getDefaultInstance();
return new self(
$main,
diff --git a/api/ModifyViolation.php b/api/ModifyViolation.php
index 4285e8f..2c03f32 100755
--- a/api/ModifyViolation.php
+++ b/api/ModifyViolation.php
@@ -13,7 +13,7 @@
use WikibaseQuality\Violations\ViolationLookup;
use WikibaseQuality\Violations\ViolationQuery;
use WikibaseQuality\Violations\ViolationStore;
-use WikibaseQuality\WikibaseQualityFactory;
+use WikibaseQuality\WikibaseQualityServices;
/**
@@ -60,7 +60,7 @@
*/
public static function newFromGlobalState( ApiMain $main, $name,
$prefix = '' ) {
$wikibaseRepo = WikibaseRepo::getDefaultInstance();
- $qualityServices = WikibaseQualityFactory::getDefaultInstance();
+ $qualityServices =
WikibaseQualityServices::getDefaultInstance();
return new self(
$main,
diff --git a/includes/WikibaseQualityFactory.php
b/includes/WikibaseQualityServices.php
similarity index 97%
rename from includes/WikibaseQualityFactory.php
rename to includes/WikibaseQualityServices.php
index 0894665..097413c 100644
--- a/includes/WikibaseQualityFactory.php
+++ b/includes/WikibaseQualityServices.php
@@ -20,7 +20,7 @@
* @author BP2014N1
* @license GNU GPL v2+
*/
-class WikibaseQualityFactory {
+class WikibaseQualityServices {
/**
* @var SqlViolationRepo
@@ -36,7 +36,7 @@
* Returns the default instance.
* IMPORTANT: Use only when it is not feasible to inject an instance
properly.
*
-* @return WikibaseQualityFactory
+* @return WikibaseQualityServices
*/
public static function getDefaultInstance() {
static $instance = null;
diff --git a/specials/SpecialViolationsPage.php
b/specials/SpecialViolationsPage.php
index 0ab6dd6..530ab82 100644
--- a/specials/SpecialViolationsPage.php
+++ b/specials/SpecialViolationsPage.php
@@ -38,7 +38,7 @@
use WikibaseQuality\Violations\ViolationLookup;
use WikibaseQuality\Violations\ViolationQuery;
use WikibaseQuality\Violations\SqlViolationRepo;
-use WikibaseQuality\WikibaseQualityFactory;
+use WikibaseQuality\WikibaseQualityServices;
/**
@@ -108,7 +108,7 @@
*/
public static function newFromGlobalState() {
$repo = WikibaseRepo::getDefaultInstance();
- $qualityServices = WikibaseQualityFactory::getDefaultInstance();
+ $qualityServices =
WikibaseQualityServices::getDefaultInstance();
return new self(
$repo-getEntityLookup(),
diff --git
[MediaWiki-commits] [Gerrit] Fixed escaping issue. - change (mediawiki...WikibaseQualityConstraints)
Soeren.oldag has uploaded a new change for review.
https://gerrit.wikimedia.org/r/221083
Change subject: Fixed escaping issue.
..
Fixed escaping issue.
Change-Id: I3f0e15835c8393d3633f27752841969d392ac68a
---
M specials/SpecialConstraintReport.php
1 file changed, 5 insertions(+), 3 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikibaseQualityConstraints
refs/changes/83/221083/1
diff --git a/specials/SpecialConstraintReport.php
b/specials/SpecialConstraintReport.php
index 1ca137a..778e65c 100755
--- a/specials/SpecialConstraintReport.php
+++ b/specials/SpecialConstraintReport.php
@@ -2,6 +2,8 @@
namespace WikibaseQuality\ConstraintReport\Specials;
+use UnexpectedValueException;
+use InvalidArgumentException;
use JobQueueGroup;
use SpecialPage;
use ValueFormatters\FormatterOptions;
@@ -372,7 +374,7 @@
if ( $result-getMainSnakType() === 'value' ) {
$value = $this-formatValue( $result-getDataValue() );
} else {
- $value = $result-getMainSnakType();
+ $value = htmlspecialchars( $result-getMainSnakType() );
}
$claimColumn = $this-getClaimLink(
@@ -619,13 +621,13 @@
*
* @param EntityId $entityId
* @param PropertyId $propertyId
-* @param string $text
+* @param string $text HTML
*
* @return string HTML
*/
private function getClaimLink( EntityId $entityId, PropertyId
$propertyId, $text ) {
return
- Html::element(
+ Html::rawElement(
'a',
array (
'href' = $this-getClaimUrl(
$entityId, $propertyId ),
--
To view, visit https://gerrit.wikimedia.org/r/221083
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3f0e15835c8393d3633f27752841969d392ac68a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikibaseQualityConstraints
Gerrit-Branch: v1
Gerrit-Owner: Soeren.oldag soeren_ol...@freenet.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Added constraint version column to violation table. - change (mediawiki...WikibaseQuality)
Soeren.oldag has uploaded a new change for review. https://gerrit.wikimedia.org/r/221080 Change subject: Added constraint version column to violation table. .. Added constraint version column to violation table. Change-Id: Ifc861b5b2488e7135aee49a65977a70a08a25b69 --- M sql/create_wbq_violations.sql 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikibaseQuality refs/changes/80/221080/1 diff --git a/sql/create_wbq_violations.sql b/sql/create_wbq_violations.sql index 90f6414..76603f2 100755 --- a/sql/create_wbq_violations.sql +++ b/sql/create_wbq_violations.sql @@ -6,6 +6,7 @@ constraint_type_entity_id VARBINARY(15) NOT NULL, additional_info TEXT DEFAULT NULL, updated_atVARBINARY(31) NOT NULL, + constraint_versionBINARY(40)NOT NULL, revision_id INT(10) UNSIGNED NOT NULL, statusVARBINARY(31) NOT NULL, PRIMARY KEY (claim_guid, constraint_id) -- To view, visit https://gerrit.wikimedia.org/r/221080 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ifc861b5b2488e7135aee49a65977a70a08a25b69 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/WikibaseQuality Gerrit-Branch: v1 Gerrit-Owner: Soeren.oldag soeren_ol...@freenet.de ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Adaption for latest Wikibase changes. - change (mediawiki...WikibaseQualityExternalValidation)
Soeren.oldag has uploaded a new change for review. https://gerrit.wikimedia.org/r/220928 Change subject: Adaption for latest Wikibase changes. .. Adaption for latest Wikibase changes. Change-Id: I757a0419d3d2de86eb1eead56d3779c35c399b7e --- M includes/ExternalValidationServices.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikibaseQualityExternalValidation refs/changes/28/220928/1 diff --git a/includes/ExternalValidationServices.php b/includes/ExternalValidationServices.php index 94991b6..6ef238e 100755 --- a/includes/ExternalValidationServices.php +++ b/includes/ExternalValidationServices.php @@ -179,7 +179,7 @@ $repo-getTermLookup(), $repo-getEntityTitleLookup(), $repo-getEntityIdParser(), -$repo-getClaimGuidParser(), +$repo-getStatementGuidParser(), $repo-getValueFormatterFactory(), new ValueParserFactory( $GLOBALS['wgValueParsers'] ) ); -- To view, visit https://gerrit.wikimedia.org/r/220928 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I757a0419d3d2de86eb1eead56d3779c35c399b7e Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/WikibaseQualityExternalValidation Gerrit-Branch: master Gerrit-Owner: Soeren.oldag soeren_ol...@freenet.de ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fixed bug that appears, if identifier properties have novalu... - change (mediawiki...WikibaseQualityExternalValidation)
Soeren.oldag has uploaded a new change for review.
https://gerrit.wikimedia.org/r/220915
Change subject: Fixed bug that appears, if identifier properties have
novalue-snaks.
..
Fixed bug that appears, if identifier properties have novalue-snaks.
Change-Id: Ie1beb71ce21b387ff08faa6d24b2226e8d782bdb
---
M includes/CrossCheck/CrossChecker.php
1 file changed, 6 insertions(+), 1 deletion(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikibaseQualityExternalValidation
refs/changes/15/220915/1
diff --git a/includes/CrossCheck/CrossChecker.php
b/includes/CrossCheck/CrossChecker.php
index 4daa541..e980db0 100755
--- a/includes/CrossCheck/CrossChecker.php
+++ b/includes/CrossCheck/CrossChecker.php
@@ -164,7 +164,13 @@
StatementList $statements,
PropertyId $identifierPropertyId,
array $dumpMetaInformationList ) {
+ $resultList = new CrossCheckResultList();
+
$externalIds = $this-getExternalIds( $entity,
$identifierPropertyId );
+ if( !$externalIds ) {
+ return $resultList;
+ }
+
$dumpIds = array_map(
function ( DumpMetaInformation $dumpMetaInformation ) {
return $dumpMetaInformation-getDumpId();
@@ -173,7 +179,6 @@
);
$externalData = $this-externalDataRepo-getExternalData(
$dumpIds, $externalIds, $statements-getPropertyIds() );
- $resultList = new CrossCheckResultList();
foreach ( $externalData as $dumpId = $externalDataPerDump ) {
$dumpMetaInformation = $dumpMetaInformationList[
$dumpId ];
--
To view, visit https://gerrit.wikimedia.org/r/220915
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie1beb71ce21b387ff08faa6d24b2226e8d782bdb
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikibaseQualityExternalValidation
Gerrit-Branch: master
Gerrit-Owner: Soeren.oldag soeren_ol...@freenet.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] fix TimeValueComparer issue - change (mediawiki...WikibaseQualityExternalValidation)
Soeren.oldag has submitted this change and it was merged.
Change subject: fix TimeValueComparer issue
..
fix TimeValueComparer issue
Change-Id: If3582c28cbd32748c41c6f2e85d0c705b6a3
---
M includes/CrossCheck/Comparer/TimeValueComparer.php
M tests/phpunit/CrossCheck/Comparer/TimeValueComparerTest.php
2 files changed, 24 insertions(+), 9 deletions(-)
Approvals:
Soeren.oldag: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/CrossCheck/Comparer/TimeValueComparer.php
b/includes/CrossCheck/Comparer/TimeValueComparer.php
index be4b5a8..085dfd8 100755
--- a/includes/CrossCheck/Comparer/TimeValueComparer.php
+++ b/includes/CrossCheck/Comparer/TimeValueComparer.php
@@ -12,6 +12,7 @@
use WikibaseQuality\ExternalValidation\CrossCheck\Result\ComparisonResult;
use WikibaseQuality\ExternalValidation\DumpMetaInformation\DumpMetaInformation;
use MWTimestamp;
+use TimestampException;
/**
* Class TimeValueComparer
@@ -33,17 +34,26 @@
if( !$this-canCompare( $value, $comparativeValue ) ) {
throw new InvalidArgumentException( 'Given values can
not be compared using this comparer.' );
}
- $localTimestamp = new MWTimestamp( substr( $value-getTime(), 1
) );
- $externalTimestamp = new MWTimestamp( substr(
$comparativeValue-getTime(), 1 ) );
- $diff = $localTimestamp-diff( $externalTimestamp, true );
$result = ComparisonResult::STATUS_MISMATCH;
- if ( $value-getPrecision() ===
$comparativeValue-getPrecision()
-$this-resultOfDiffWithPrecision( $diff,
$value-getPrecision() ) ) {
- $result = ComparisonResult::STATUS_MATCH;
- } elseif ( $this-resultOfDiffWithPrecision( $diff, min(
$value-getPrecision(), $comparativeValue-getPrecision() ) ) ) {
- $result = ComparisonResult::STATUS_PARTIAL_MATCH;
- }
+
+ try {
+ $localTimestamp = new
MWTimestamp(substr($value-getTime(), 1));
+ $externalTimestamp = new
MWTimestamp(substr($comparativeValue-getTime(), 1));
+ $diff = $localTimestamp-diff( $externalTimestamp, true
);
+
+ if ( $value-getPrecision() ===
$comparativeValue-getPrecision()
+$this-resultOfDiffWithPrecision(
$diff, $value-getPrecision() ) ) {
+ $result = ComparisonResult::STATUS_MATCH;
+ } elseif (
+ $this-resultOfDiffWithPrecision(
+ $diff,
+ min( $value-getPrecision(),
$comparativeValue-getPrecision() )
+ )
+ ) {
+ $result =
ComparisonResult::STATUS_PARTIAL_MATCH;
+ }
+ } catch ( TimestampException $e ){ }
return $result;
}
diff --git a/tests/phpunit/CrossCheck/Comparer/TimeValueComparerTest.php
b/tests/phpunit/CrossCheck/Comparer/TimeValueComparerTest.php
index 2fe494f..5c3469a 100755
--- a/tests/phpunit/CrossCheck/Comparer/TimeValueComparerTest.php
+++ b/tests/phpunit/CrossCheck/Comparer/TimeValueComparerTest.php
@@ -82,6 +82,11 @@
ComparisonResult::STATUS_PARTIAL_MATCH,
$localValue2016,
new TimeValue(
'+2016-00-00T00:00:00Z', 0, 0, 0, 9,
'http://www.wikidata.org/entity/Q1985727' )
+ ),
+ array(
+ ComparisonResult::STATUS_MISMATCH,
+ new TimeValue(
'+00011980-08-00T00:00:00Z', 0, 0, 0, 9,
'http://www.wikidata.org/entity/Q1985727' ),
+ new TimeValue(
'+1980-00-00T00:00:00Z', 0, 0, 0, 9,
'http://www.wikidata.org/entity/Q1985727' )
)
);
}
--
To view, visit https://gerrit.wikimedia.org/r/220687
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If3582c28cbd32748c41c6f2e85d0c705b6a3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikibaseQualityExternalValidation
Gerrit-Branch: master
Gerrit-Owner: Dominic.sauer dominic.sa...@yahoo.de
Gerrit-Reviewer: Soeren.oldag soeren_ol...@freenet.de
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fixed bug that appears, if identifier properties have novalu... - change (mediawiki...WikibaseQualityExternalValidation)
Soeren.oldag has uploaded a new change for review.
https://gerrit.wikimedia.org/r/220916
Change subject: Fixed bug that appears, if identifier properties have
novalue-snaks.
..
Fixed bug that appears, if identifier properties have novalue-snaks.
Change-Id: Ie1beb71ce21b387ff08faa6d24b2226e8d782bdb
---
M includes/CrossCheck/CrossChecker.php
1 file changed, 6 insertions(+), 1 deletion(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikibaseQualityExternalValidation
refs/changes/16/220916/1
diff --git a/includes/CrossCheck/CrossChecker.php
b/includes/CrossCheck/CrossChecker.php
index cd1ce3f..8ccba9b 100755
--- a/includes/CrossCheck/CrossChecker.php
+++ b/includes/CrossCheck/CrossChecker.php
@@ -163,7 +163,13 @@
StatementList $statements,
PropertyId $identifierPropertyId,
array $dumpMetaInformationList ) {
+ $resultList = new CrossCheckResultList();
+
$externalIds = $this-getExternalIds( $entity,
$identifierPropertyId );
+ if( !$externalIds ) {
+ return $resultList;
+ }
+
$dumpIds = array_map(
function ( DumpMetaInformation $dumpMetaInformation ) {
return $dumpMetaInformation-getDumpId();
@@ -172,7 +178,6 @@
);
$externalData = $this-externalDataRepo-getExternalData(
$dumpIds, $externalIds, $statements-getPropertyIds() );
- $resultList = new CrossCheckResultList();
foreach ( $externalData as $dumpId = $externalDataPerDump ) {
$dumpMetaInformation = $dumpMetaInformationList[
$dumpId ];
--
To view, visit https://gerrit.wikimedia.org/r/220916
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie1beb71ce21b387ff08faa6d24b2226e8d782bdb
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikibaseQualityExternalValidation
Gerrit-Branch: v1
Gerrit-Owner: Soeren.oldag soeren_ol...@freenet.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Adaption for latest Wikibase changes. - change (mediawiki...WikibaseQualityExternalValidation)
Soeren.oldag has uploaded a new change for review. https://gerrit.wikimedia.org/r/220929 Change subject: Adaption for latest Wikibase changes. .. Adaption for latest Wikibase changes. Change-Id: I3c9a7dfe444b08eb2ce87e2200af4219de2cfe24 --- M includes/ExternalValidationServices.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikibaseQualityExternalValidation refs/changes/29/220929/1 diff --git a/includes/ExternalValidationServices.php b/includes/ExternalValidationServices.php index 41b4e76..b8a112b 100755 --- a/includes/ExternalValidationServices.php +++ b/includes/ExternalValidationServices.php @@ -173,7 +173,7 @@ $repo-getTermLookup(), $repo-getEntityTitleLookup(), $repo-getEntityIdParser(), - $repo-getClaimGuidParser(), + $repo-getStatementGuidParser(), $repo-getValueFormatterFactory(), new ValueParserFactory($GLOBALS['wgValueParsers']) ); -- To view, visit https://gerrit.wikimedia.org/r/220929 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3c9a7dfe444b08eb2ce87e2200af4219de2cfe24 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/WikibaseQualityExternalValidation Gerrit-Branch: v1 Gerrit-Owner: Soeren.oldag soeren_ol...@freenet.de ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Corrected escaping in SpecialExternalDbs. - change (mediawiki...WikibaseQualityExternalValidation)
Soeren.oldag has uploaded a new change for review. https://gerrit.wikimedia.org/r/220431 Change subject: Corrected escaping in SpecialExternalDbs. .. Corrected escaping in SpecialExternalDbs. Change-Id: I617c51aa2de32dd1797c381f2314fac3e259a57f --- M specials/SpecialExternalDbs.php 1 file changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikibaseQualityExternalValidation refs/changes/31/220431/1 diff --git a/specials/SpecialExternalDbs.php b/specials/SpecialExternalDbs.php index 032692a..0a65c3a 100755 --- a/specials/SpecialExternalDbs.php +++ b/specials/SpecialExternalDbs.php @@ -167,11 +167,11 @@ $size = $this-getLanguage()-formatSize( $dumpMetaInformation-getSize() ); $license = $this-entityIdLinkFormatter-formatEntityId( $dumpMetaInformation-getLicenseItemId() ); $rows[] = array( - new HtmlTableCellBuilder( $dumpId, array(), true ), - new HtmlTableCellBuilder( $importDate, array(), true ), - new HtmlTableCellBuilder( $language, array(), true ), + new HtmlTableCellBuilder( $dumpId ), + new HtmlTableCellBuilder( $importDate ), + new HtmlTableCellBuilder( $language ), new HtmlTableCellBuilder( $sourceUrl, array(), true ), - new HtmlTableCellBuilder( $size, array(), true ), + new HtmlTableCellBuilder( $size ), new HtmlTableCellBuilder( $license, array(), true ) ); } -- To view, visit https://gerrit.wikimedia.org/r/220431 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I617c51aa2de32dd1797c381f2314fac3e259a57f Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/WikibaseQualityExternalValidation Gerrit-Branch: v1 Gerrit-Owner: Soeren.oldag soeren_ol...@freenet.de ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Corrected escaping in SpecialExternalDbs. - change (mediawiki...WikibaseQualityExternalValidation)
Soeren.oldag has uploaded a new change for review. https://gerrit.wikimedia.org/r/220430 Change subject: Corrected escaping in SpecialExternalDbs. .. Corrected escaping in SpecialExternalDbs. Change-Id: I617c51aa2de32dd1797c381f2314fac3e259a57f --- M specials/SpecialExternalDbs.php 1 file changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikibaseQualityExternalValidation refs/changes/30/220430/1 diff --git a/specials/SpecialExternalDbs.php b/specials/SpecialExternalDbs.php index 27ade52..8ec904c 100755 --- a/specials/SpecialExternalDbs.php +++ b/specials/SpecialExternalDbs.php @@ -162,11 +162,11 @@ $size = $this-getLanguage()-formatSize( $dumpMetaInformation-getSize() ); $license = $this-entityIdLinkFormatter-formatEntityId( $dumpMetaInformation-getLicenseItemId() ); $rows[] = array( - new HtmlTableCellBuilder( $dumpId, array(), true ), - new HtmlTableCellBuilder( $importDate, array(), true ), - new HtmlTableCellBuilder( $language, array(), true ), + new HtmlTableCellBuilder( $dumpId ), + new HtmlTableCellBuilder( $importDate ), + new HtmlTableCellBuilder( $language ), new HtmlTableCellBuilder( $sourceUrl, array(), true ), - new HtmlTableCellBuilder( $size, array(), true ), + new HtmlTableCellBuilder( $size ), new HtmlTableCellBuilder( $license, array(), true ) ); -- To view, visit https://gerrit.wikimedia.org/r/220430 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I617c51aa2de32dd1797c381f2314fac3e259a57f Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/WikibaseQualityExternalValidation Gerrit-Branch: master Gerrit-Owner: Soeren.oldag soeren_ol...@freenet.de ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Corrected escaping in SpecialExternalDbs (T103633). - change (mediawiki...WikibaseQualityExternalValidation)
Soeren.oldag has submitted this change and it was merged. Change subject: Corrected escaping in SpecialExternalDbs (T103633). .. Corrected escaping in SpecialExternalDbs (T103633). Change-Id: I617c51aa2de32dd1797c381f2314fac3e259a57f --- M specials/SpecialExternalDbs.php 1 file changed, 4 insertions(+), 4 deletions(-) Approvals: Soeren.oldag: Verified Dominic.sauer: Looks good to me, approved diff --git a/specials/SpecialExternalDbs.php b/specials/SpecialExternalDbs.php index 032692a..0a65c3a 100755 --- a/specials/SpecialExternalDbs.php +++ b/specials/SpecialExternalDbs.php @@ -167,11 +167,11 @@ $size = $this-getLanguage()-formatSize( $dumpMetaInformation-getSize() ); $license = $this-entityIdLinkFormatter-formatEntityId( $dumpMetaInformation-getLicenseItemId() ); $rows[] = array( - new HtmlTableCellBuilder( $dumpId, array(), true ), - new HtmlTableCellBuilder( $importDate, array(), true ), - new HtmlTableCellBuilder( $language, array(), true ), + new HtmlTableCellBuilder( $dumpId ), + new HtmlTableCellBuilder( $importDate ), + new HtmlTableCellBuilder( $language ), new HtmlTableCellBuilder( $sourceUrl, array(), true ), - new HtmlTableCellBuilder( $size, array(), true ), + new HtmlTableCellBuilder( $size ), new HtmlTableCellBuilder( $license, array(), true ) ); } -- To view, visit https://gerrit.wikimedia.org/r/220431 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I617c51aa2de32dd1797c381f2314fac3e259a57f Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions/WikibaseQualityExternalValidation Gerrit-Branch: v1 Gerrit-Owner: Soeren.oldag soeren_ol...@freenet.de Gerrit-Reviewer: Dominic.sauer dominic.sa...@yahoo.de Gerrit-Reviewer: Soeren.oldag soeren_ol...@freenet.de ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] fix TimeValueComparer issue - change (mediawiki...WikibaseQualityExternalValidation)
Soeren.oldag has submitted this change and it was merged.
Change subject: fix TimeValueComparer issue
..
fix TimeValueComparer issue
Change-Id: If3582c28cbd32748c41c6f2e85d0c705b6a3
---
M includes/CrossCheck/Comparer/TimeValueComparer.php
M tests/phpunit/CrossCheck/Comparer/TimeValueComparerTest.php
2 files changed, 26 insertions(+), 11 deletions(-)
Approvals:
Soeren.oldag: Verified; Looks good to me, approved
diff --git a/includes/CrossCheck/Comparer/TimeValueComparer.php
b/includes/CrossCheck/Comparer/TimeValueComparer.php
index 6a3e2cd..02435e9 100755
--- a/includes/CrossCheck/Comparer/TimeValueComparer.php
+++ b/includes/CrossCheck/Comparer/TimeValueComparer.php
@@ -12,6 +12,7 @@
use WikibaseQuality\ExternalValidation\CrossCheck\Result\ComparisonResult;
use WikibaseQuality\ExternalValidation\DumpMetaInformation\DumpMetaInformation;
use MWTimestamp;
+use TimestampException;
/**
* Class TimeValueComparer
@@ -33,17 +34,26 @@
if( !$this-canCompare( $value, $comparativeValue ) ) {
throw new InvalidArgumentException( 'Given values can
not be compared using this comparer.' );
}
- $localTimestamp = new MWTimestamp( substr( $value-getTime(), 1
) );
- $externalTimestamp = new MWTimestamp( substr(
$comparativeValue-getTime(), 1 ) );
- $diff = $localTimestamp-diff( $externalTimestamp, true );
$result = ComparisonResult::STATUS_MISMATCH;
- if ( $value-getPrecision() ===
$comparativeValue-getPrecision()
-$this-resultOfDiffWithPrecision( $diff,
$value-getPrecision() ) ) {
- $result = ComparisonResult::STATUS_MATCH;
- } elseif ( $this-resultOfDiffWithPrecision( $diff, min(
$value-getPrecision(), $comparativeValue-getPrecision() ) ) ) {
- $result = ComparisonResult::STATUS_PARTIAL_MATCH;
- }
+
+ try {
+ $localTimestamp = new
MWTimestamp(substr($value-getTime(), 1));
+ $externalTimestamp = new
MWTimestamp(substr($comparativeValue-getTime(), 1));
+ $diff = $localTimestamp-diff( $externalTimestamp, true
);
+
+ if ( $value-getPrecision() ===
$comparativeValue-getPrecision()
+$this-resultOfDiffWithPrecision(
$diff, $value-getPrecision() ) ) {
+ $result = ComparisonResult::STATUS_MATCH;
+ } elseif (
+ $this-resultOfDiffWithPrecision(
+ $diff,
+ min( $value-getPrecision(),
$comparativeValue-getPrecision() )
+ )
+ ) {
+ $result =
ComparisonResult::STATUS_PARTIAL_MATCH;
+ }
+ } catch ( TimestampException $e ){ }
return $result;
}
@@ -119,4 +129,4 @@
public function canCompare( DataValue $value, DataValue
$comparativeValue ) {
return $value instanceof TimeValue $comparativeValue
instanceof TimeValue;
}
-}
\ No newline at end of file
+}
diff --git a/tests/phpunit/CrossCheck/Comparer/TimeValueComparerTest.php
b/tests/phpunit/CrossCheck/Comparer/TimeValueComparerTest.php
index 64cbdfb..92d785e 100755
--- a/tests/phpunit/CrossCheck/Comparer/TimeValueComparerTest.php
+++ b/tests/phpunit/CrossCheck/Comparer/TimeValueComparerTest.php
@@ -83,6 +83,11 @@
ComparisonResult::STATUS_PARTIAL_MATCH,
$localValue2016,
new TimeValue(
'+2016-00-00T00:00:00Z', 0, 0, 0, 9,
'http://www.wikidata.org/entity/Q1985727' )
+ ),
+ array(
+ ComparisonResult::STATUS_MISMATCH,
+ new TimeValue(
'+00011980-08-00T00:00:00Z', 0, 0, 0, 9,
'http://www.wikidata.org/entity/Q1985727' ),
+ new TimeValue(
'+1980-00-00T00:00:00Z', 0, 0, 0, 9,
'http://www.wikidata.org/entity/Q1985727' )
)
);
}
@@ -90,4 +95,4 @@
protected function buildComparer() {
return new TimeValueComparer();
}
-}
\ No newline at end of file
+}
--
To view, visit https://gerrit.wikimedia.org/r/220688
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If3582c28cbd32748c41c6f2e85d0c705b6a3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikibaseQualityExternalValidation
Gerrit-Branch: v1
Gerrit-Owner: Soeren.oldag soeren_ol...@freenet.de
Gerrit-Reviewer: Dominic.sauer dominic.sa...@yahoo.de
[MediaWiki-commits] [Gerrit] fix TimeValueComparer issue - change (mediawiki...WikibaseQualityExternalValidation)
Soeren.oldag has uploaded a new change for review.
https://gerrit.wikimedia.org/r/220688
Change subject: fix TimeValueComparer issue
..
fix TimeValueComparer issue
Change-Id: If3582c28cbd32748c41c6f2e85d0c705b6a3
---
M includes/CrossCheck/Comparer/TimeValueComparer.php
M tests/phpunit/CrossCheck/Comparer/TimeValueComparerTest.php
2 files changed, 26 insertions(+), 11 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikibaseQualityExternalValidation
refs/changes/88/220688/1
diff --git a/includes/CrossCheck/Comparer/TimeValueComparer.php
b/includes/CrossCheck/Comparer/TimeValueComparer.php
index 6a3e2cd..02435e9 100755
--- a/includes/CrossCheck/Comparer/TimeValueComparer.php
+++ b/includes/CrossCheck/Comparer/TimeValueComparer.php
@@ -12,6 +12,7 @@
use WikibaseQuality\ExternalValidation\CrossCheck\Result\ComparisonResult;
use WikibaseQuality\ExternalValidation\DumpMetaInformation\DumpMetaInformation;
use MWTimestamp;
+use TimestampException;
/**
* Class TimeValueComparer
@@ -33,17 +34,26 @@
if( !$this-canCompare( $value, $comparativeValue ) ) {
throw new InvalidArgumentException( 'Given values can
not be compared using this comparer.' );
}
- $localTimestamp = new MWTimestamp( substr( $value-getTime(), 1
) );
- $externalTimestamp = new MWTimestamp( substr(
$comparativeValue-getTime(), 1 ) );
- $diff = $localTimestamp-diff( $externalTimestamp, true );
$result = ComparisonResult::STATUS_MISMATCH;
- if ( $value-getPrecision() ===
$comparativeValue-getPrecision()
-$this-resultOfDiffWithPrecision( $diff,
$value-getPrecision() ) ) {
- $result = ComparisonResult::STATUS_MATCH;
- } elseif ( $this-resultOfDiffWithPrecision( $diff, min(
$value-getPrecision(), $comparativeValue-getPrecision() ) ) ) {
- $result = ComparisonResult::STATUS_PARTIAL_MATCH;
- }
+
+ try {
+ $localTimestamp = new
MWTimestamp(substr($value-getTime(), 1));
+ $externalTimestamp = new
MWTimestamp(substr($comparativeValue-getTime(), 1));
+ $diff = $localTimestamp-diff( $externalTimestamp, true
);
+
+ if ( $value-getPrecision() ===
$comparativeValue-getPrecision()
+$this-resultOfDiffWithPrecision(
$diff, $value-getPrecision() ) ) {
+ $result = ComparisonResult::STATUS_MATCH;
+ } elseif (
+ $this-resultOfDiffWithPrecision(
+ $diff,
+ min( $value-getPrecision(),
$comparativeValue-getPrecision() )
+ )
+ ) {
+ $result =
ComparisonResult::STATUS_PARTIAL_MATCH;
+ }
+ } catch ( TimestampException $e ){ }
return $result;
}
@@ -119,4 +129,4 @@
public function canCompare( DataValue $value, DataValue
$comparativeValue ) {
return $value instanceof TimeValue $comparativeValue
instanceof TimeValue;
}
-}
\ No newline at end of file
+}
diff --git a/tests/phpunit/CrossCheck/Comparer/TimeValueComparerTest.php
b/tests/phpunit/CrossCheck/Comparer/TimeValueComparerTest.php
index 64cbdfb..92d785e 100755
--- a/tests/phpunit/CrossCheck/Comparer/TimeValueComparerTest.php
+++ b/tests/phpunit/CrossCheck/Comparer/TimeValueComparerTest.php
@@ -83,6 +83,11 @@
ComparisonResult::STATUS_PARTIAL_MATCH,
$localValue2016,
new TimeValue(
'+2016-00-00T00:00:00Z', 0, 0, 0, 9,
'http://www.wikidata.org/entity/Q1985727' )
+ ),
+ array(
+ ComparisonResult::STATUS_MISMATCH,
+ new TimeValue(
'+00011980-08-00T00:00:00Z', 0, 0, 0, 9,
'http://www.wikidata.org/entity/Q1985727' ),
+ new TimeValue(
'+1980-00-00T00:00:00Z', 0, 0, 0, 9,
'http://www.wikidata.org/entity/Q1985727' )
)
);
}
@@ -90,4 +95,4 @@
protected function buildComparer() {
return new TimeValueComparer();
}
-}
\ No newline at end of file
+}
--
To view, visit https://gerrit.wikimedia.org/r/220688
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If3582c28cbd32748c41c6f2e85d0c705b6a3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikibaseQualityExternalValidation
Gerrit-Branch: v1
[MediaWiki-commits] [Gerrit] Multiple CSV files are now used to import external data inst... - change (mediawiki...WikibaseQualityExternalValidation)
Soeren.oldag has uploaded a new change for review.
https://gerrit.wikimedia.org/r/220128
Change subject: Multiple CSV files are now used to import external data instead
of a single TAR file (T103438)
..
Multiple CSV files are now used to import external data instead of a single TAR
file (T103438)
Change-Id: Icd234d6c7ab98084e77e900548d2bb6d65ad1741
---
A includes/UpdateTable/CsvImportSettings.php
M includes/UpdateTable/ExternalDataImporter.php
D includes/UpdateTable/TarImportSettings.php
M maintenance/UpdateTable.php
A tests/phpunit/UpdateTable/CsvImportSettingsTest.php
D tests/phpunit/UpdateTable/ImportContextTest.php
M tests/phpunit/UpdateTable/UpdateTableTest.php
A tests/phpunit/UpdateTable/testdata/dump_information.csv
D tests/phpunit/UpdateTable/testdata/external_data.tar
A tests/phpunit/UpdateTable/testdata/external_values.csv
10 files changed, 175 insertions(+), 222 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikibaseQualityExternalValidation
refs/changes/28/220128/1
diff --git a/includes/UpdateTable/CsvImportSettings.php
b/includes/UpdateTable/CsvImportSettings.php
new file mode 100755
index 000..1605499
--- /dev/null
+++ b/includes/UpdateTable/CsvImportSettings.php
@@ -0,0 +1,89 @@
+?php
+
+namespace WikibaseQuality\ExternalValidation\UpdateTable;
+
+use InvalidArgumentException;
+use Wikimedia\Assert\Assert;
+
+
+/**
+ * Class ImportContext
+ *
+ * Context for importing data from csv files to a db table using a
ExternalDataImporter
+ *
+ * @package WikibaseQuality\ExternalValidation\UpdateTable
+ * @author BP2014N1
+ * @licence GNU GPL v2+
+ */
+class CsvImportSettings {
+
+ /**
+* Path of CSV file containing external values.
+*
+* @var string
+*/
+ private $externalValuesFilePath;
+
+ /**
+* Path of the CSV file containing dump meta information.
+*
+* @var string
+*/
+ private $dumpInformationFilePath;
+
+ /**
+* @var int
+*/
+ private $batchSize;
+
+ /**
+* @var boolean
+*/
+ private $quiet;
+
+ /**
+* @param string $externalValuesFilePath
+* @param string $dumpInformationFilePath
+* @param int $batchSize
+* @param bool $quiet
+*/
+ public function __construct( $externalValuesFilePath,
$dumpInformationFilePath, $batchSize, $quiet = false ) {
+ Assert::parameterType( 'string', $externalValuesFilePath,
'$externalValuesFilePath' );
+ Assert::parameterType( 'string', $dumpInformationFilePath,
'$dumpInformationFilePath' );
+ Assert::parameterType( 'integer', $batchSize, '$batchSize' );
+ Assert::parameterType( 'boolean', $quiet, '$quiet' );
+
+ $this-externalValuesFilePath = $externalValuesFilePath;
+ $this-dumpInformationFilePath = $dumpInformationFilePath;
+ $this-batchSize = $batchSize;
+ $this-quiet = $quiet;
+ }
+
+ /**
+* @return string
+*/
+ public function getExternalValuesFilePath() {
+ return $this-externalValuesFilePath;
+ }
+
+ /**
+* @return string
+*/
+ public function getDumpInformationFilePath() {
+ return $this-dumpInformationFilePath;
+ }
+
+ /**
+* @return int
+*/
+ public function getBatchSize() {
+ return $this-batchSize;
+ }
+
+ /**
+* @return boolean
+*/
+ public function isQuiet() {
+ return $this-quiet;
+ }
+}
\ No newline at end of file
diff --git a/includes/UpdateTable/ExternalDataImporter.php
b/includes/UpdateTable/ExternalDataImporter.php
index 06a7bd8..35600f4 100755
--- a/includes/UpdateTable/ExternalDataImporter.php
+++ b/includes/UpdateTable/ExternalDataImporter.php
@@ -20,9 +20,6 @@
*/
class ExternalDataImporter {
- const EXTERNAL_VALUES_FILE_NAME = external_values.csv;
- const DUMP_INFORMATION_FILE_NAME = dump_information.csv;
-
/**
* @var DumpMetaInformationStore
*/
@@ -34,25 +31,15 @@
private $externalDataRepo;
/**
-* @var TarImportSettings
+* @var CsvImportSettings
*/
- private $importContext;
+ private $importSettings;
/**
-* @var string
+* @param CsvImportSettings $importContext
*/
- private $externalValuesFilePath;
-
- /**
-* @var string
-*/
- private $dumpInformationFilePath;
-
- /**
-* @param TarImportSettings $importContext
-*/
- public function __construct( TarImportSettings $importContext,
DumpMetaInformationStore $dumpMetaInformationStore, ExternalDataRepo
$externalDataRepo ) {
- $this-importContext = $importContext;
+
[MediaWiki-commits] [Gerrit] Multiple CSV files are now used to import external data inst... - change (mediawiki...WikibaseQualityExternalValidation)
Soeren.oldag has uploaded a new change for review.
https://gerrit.wikimedia.org/r/220130
Change subject: Multiple CSV files are now used to import external data instead
of a single TAR file (T103438)
..
Multiple CSV files are now used to import external data instead of a single TAR
file (T103438)
Change-Id: Ia02c58762ff34ee5fd91b502baaa2073029054e9
---
A includes/UpdateTable/CsvImportSettings.php
M includes/UpdateTable/ExternalDataImporter.php
D includes/UpdateTable/TarImportSettings.php
M maintenance/UpdateTable.php
A tests/phpunit/UpdateTable/CsvImportSettingsTest.php
D tests/phpunit/UpdateTable/TarTarImportSettingsTest.php
M tests/phpunit/UpdateTable/UpdateTableTest.php
A tests/phpunit/UpdateTable/testdata/dump_information.csv
D tests/phpunit/UpdateTable/testdata/external_data.tar
A tests/phpunit/UpdateTable/testdata/external_values.csv
10 files changed, 175 insertions(+), 231 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikibaseQualityExternalValidation
refs/changes/30/220130/1
diff --git a/includes/UpdateTable/CsvImportSettings.php
b/includes/UpdateTable/CsvImportSettings.php
new file mode 100755
index 000..1605499
--- /dev/null
+++ b/includes/UpdateTable/CsvImportSettings.php
@@ -0,0 +1,89 @@
+?php
+
+namespace WikibaseQuality\ExternalValidation\UpdateTable;
+
+use InvalidArgumentException;
+use Wikimedia\Assert\Assert;
+
+
+/**
+ * Class ImportContext
+ *
+ * Context for importing data from csv files to a db table using a
ExternalDataImporter
+ *
+ * @package WikibaseQuality\ExternalValidation\UpdateTable
+ * @author BP2014N1
+ * @licence GNU GPL v2+
+ */
+class CsvImportSettings {
+
+ /**
+* Path of CSV file containing external values.
+*
+* @var string
+*/
+ private $externalValuesFilePath;
+
+ /**
+* Path of the CSV file containing dump meta information.
+*
+* @var string
+*/
+ private $dumpInformationFilePath;
+
+ /**
+* @var int
+*/
+ private $batchSize;
+
+ /**
+* @var boolean
+*/
+ private $quiet;
+
+ /**
+* @param string $externalValuesFilePath
+* @param string $dumpInformationFilePath
+* @param int $batchSize
+* @param bool $quiet
+*/
+ public function __construct( $externalValuesFilePath,
$dumpInformationFilePath, $batchSize, $quiet = false ) {
+ Assert::parameterType( 'string', $externalValuesFilePath,
'$externalValuesFilePath' );
+ Assert::parameterType( 'string', $dumpInformationFilePath,
'$dumpInformationFilePath' );
+ Assert::parameterType( 'integer', $batchSize, '$batchSize' );
+ Assert::parameterType( 'boolean', $quiet, '$quiet' );
+
+ $this-externalValuesFilePath = $externalValuesFilePath;
+ $this-dumpInformationFilePath = $dumpInformationFilePath;
+ $this-batchSize = $batchSize;
+ $this-quiet = $quiet;
+ }
+
+ /**
+* @return string
+*/
+ public function getExternalValuesFilePath() {
+ return $this-externalValuesFilePath;
+ }
+
+ /**
+* @return string
+*/
+ public function getDumpInformationFilePath() {
+ return $this-dumpInformationFilePath;
+ }
+
+ /**
+* @return int
+*/
+ public function getBatchSize() {
+ return $this-batchSize;
+ }
+
+ /**
+* @return boolean
+*/
+ public function isQuiet() {
+ return $this-quiet;
+ }
+}
\ No newline at end of file
diff --git a/includes/UpdateTable/ExternalDataImporter.php
b/includes/UpdateTable/ExternalDataImporter.php
index 474bebf..0b1b622 100755
--- a/includes/UpdateTable/ExternalDataImporter.php
+++ b/includes/UpdateTable/ExternalDataImporter.php
@@ -22,9 +22,6 @@
*/
class ExternalDataImporter {
- const EXTERNAL_VALUES_FILE_NAME = external_values.csv;
- const DUMP_INFORMATION_FILE_NAME = dump_information.csv;
-
/**
* @var DumpMetaInformationStore
*/
@@ -36,25 +33,15 @@
private $externalDataRepo;
/**
-* @var TarImportSettings
+* @var CsvImportSettings
*/
- private $importContext;
+ private $importSettings;
/**
-* @var string
+* @param CsvImportSettings $importContext
*/
- private $externalValuesFilePath;
-
- /**
-* @var string
-*/
- private $dumpInformationFilePath;
-
- /**
-* @param TarImportSettings $importContext
-*/
- public function __construct( TarImportSettings $importContext,
DumpMetaInformationStore $dumpMetaInformationStore, ExternalDataRepo
$externalDataRepo ) {
- $this-importContext = $importContext;
+
[MediaWiki-commits] [Gerrit] Fixed maintenance script. - change (mediawiki...WikibaseQualityConstraints)
Soeren.oldag has uploaded a new change for review. https://gerrit.wikimedia.org/r/220339 Change subject: Fixed maintenance script. .. Fixed maintenance script. Change-Id: I6ed71482e96e4e9db60f80e7053d7b8df7f2fef5 --- M maintenance/UpdateTable.php 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikibaseQualityConstraints refs/changes/39/220339/1 diff --git a/maintenance/UpdateTable.php b/maintenance/UpdateTable.php index 2bc3a58..7164a26 100644 --- a/maintenance/UpdateTable.php +++ b/maintenance/UpdateTable.php @@ -6,6 +6,9 @@ use WikibaseQuality\ConstraintReport\Constraint; use WikibaseQuality\ConstraintReport\ConstraintReportFactory; +$basePath = getenv( MW_INSTALL_PATH ) !== false ? getenv( MW_INSTALL_PATH ) : __DIR__ . /../../..; +require_once $basePath . /maintenance/Maintenance.php; + /** * Class UpdateTable -- To view, visit https://gerrit.wikimedia.org/r/220339 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6ed71482e96e4e9db60f80e7053d7b8df7f2fef5 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/WikibaseQualityConstraints Gerrit-Branch: v1 Gerrit-Owner: Soeren.oldag soeren_ol...@freenet.de ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Argument type fix for HtmlTableCellBuilder. - change (mediawiki...WikibaseQualityExternalValidation)
Soeren.oldag has uploaded a new change for review. https://gerrit.wikimedia.org/r/219848 Change subject: Argument type fix for HtmlTableCellBuilder. .. Argument type fix for HtmlTableCellBuilder. Change-Id: I47844779e2fbb3672cafe660ab2021eee9c82031 --- M specials/SpecialExternalDbs.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikibaseQualityExternalValidation refs/changes/48/219848/1 diff --git a/specials/SpecialExternalDbs.php b/specials/SpecialExternalDbs.php index fcceb7f..8379cf4 100755 --- a/specials/SpecialExternalDbs.php +++ b/specials/SpecialExternalDbs.php @@ -177,7 +177,7 @@ $rows[0], new HtmlTableCellBuilder( $this-entityIdLinkFormatter-formatEntityId( $dumpMetaInformationGroup[0]-getSourceItemId() ), - array( 'rowspan' = count( $dumpMetaInformationGroup ) ), + array( 'rowspan' = (string)count( $dumpMetaInformationGroup ) ), true ) ); -- To view, visit https://gerrit.wikimedia.org/r/219848 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I47844779e2fbb3672cafe660ab2021eee9c82031 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/WikibaseQualityExternalValidation Gerrit-Branch: master Gerrit-Owner: Soeren.oldag soeren_ol...@freenet.de ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Improved dependency injection for special page and API modules. - change (mediawiki...WikibaseQuality)
Soeren.oldag has uploaded a new change for review.
https://gerrit.wikimedia.org/r/219835
Change subject: Improved dependency injection for special page and API modules.
..
Improved dependency injection for special page and API modules.
Change-Id: I028930e003a32ee092e1c31d6cc35d2cbc6f99f6
---
M WikibaseQuality.php
M api/GetViolationMessages.php
M api/GetViolationTypes.php
M api/ModifyViolation.php
D includes/ApiModuleFactory.php
D includes/SpecialPageFactory.php
M specials/SpecialViolationsPage.php
D tests/phpunit/ApiModuleFactoryTest.php
D tests/phpunit/SpecialPageFactoryTest.php
M tests/phpunit/Specials/SpecialViolationsPageTest.php
10 files changed, 187 insertions(+), 555 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikibaseQuality
refs/changes/35/219835/1
diff --git a/WikibaseQuality.php b/WikibaseQuality.php
index 68430be..8e29d95 100755
--- a/WikibaseQuality.php
+++ b/WikibaseQuality.php
@@ -28,7 +28,7 @@
$GLOBALS['wgHooks']['BeforePageDisplay'][] =
'WikibaseQualityHooks::onBeforePageDisplay';
// Initialize special pages
- $GLOBALS['wgSpecialPages']['Violations'] = array(
'WikibaseQuality\SpecialPageFactory', 'newSpecialViolationsPage' );
+ $GLOBALS['wgSpecialPages']['Violations'] =
'WikibaseQuality\Specials\SpecialViolationsPage::newFromGlobalState';
// Define modules
$remoteExtPathParts = explode(
@@ -60,15 +60,15 @@
// Define API modules
$GLOBALS['wgAPIModules']['wbqgetviolationmessages'] = array(
'class' = 'WikibaseQuality\Api\GetViolationMessages',
- 'factory' =
'WikibaseQuality\ApiModuleFactory::newGetViolationMessages'
+ 'factory' =
'WikibaseQuality\Api\GetViolationMessages::newFromGlobalState'
);
$GLOBALS['wgAPIModules']['wbqmodifyviolation'] = array(
'class' = 'WikibaseQuality\Api\ModifyViolation',
- 'factory' =
'WikibaseQuality\ApiModuleFactory::newModifyViolation'
+ 'factory' =
'WikibaseQuality\Api\ModifyViolation::newFromGlobalState'
);
$GLOBALS['wgAPIModules']['wbqgetviolationtypes'] = array(
'class' = 'WikibaseQuality\Api\GetViolationTypes',
- 'factory' =
'WikibaseQuality\ApiModuleFactory::newGetViolationTypes'
+ 'factory' =
'WikibaseQuality\Api\GetViolationTypes::newFromGlobalState'
);
// Define user right
diff --git a/api/GetViolationMessages.php b/api/GetViolationMessages.php
index 9af10fe..f8eb2d2 100755
--- a/api/GetViolationMessages.php
+++ b/api/GetViolationMessages.php
@@ -10,10 +10,12 @@
use Wikibase\DataModel\Entity\EntityId;
use Wikibase\DataModel\Entity\EntityIdParser;
use Wikibase\Repo\Store\EntityPermissionChecker;
+use Wikibase\Repo\WikibaseRepo;
use WikibaseQuality\Violations\DispatchingViolationFormatter;
use WikibaseQuality\Violations\Violation;
use WikibaseQuality\Violations\ViolationLookup;
use WikibaseQuality\Violations\ViolationQuery;
+use WikibaseQuality\WikibaseQualityFactory;
/**
@@ -49,6 +51,27 @@
/**
* @param ApiMain $main
+* @param $name
+* @param string $prefix
+* @return GetViolationMessages
+*/
+ public static function newFromGlobalState( ApiMain $main, $name,
$prefix = '' ) {
+ $wikibaseRepo = WikibaseRepo::getDefaultInstance();
+ $qualityServices = WikibaseQualityFactory::getDefaultInstance();
+
+ return new self(
+ $main,
+ $name,
+ $prefix,
+ $wikibaseRepo-getEntityIdParser(),
+ $wikibaseRepo-getEntityPermissionChecker(),
+ $qualityServices-getViolationLookup(),
+ $qualityServices-getDispatchingViolationFormatter()
+ );
+ }
+
+ /**
+* @param ApiMain $main
* @param string $name
* @param string $prefix
* @param EntityIdParser $entityIdParser
@@ -56,9 +79,15 @@
* @param ViolationLookup $violationLookup
* @param DispatchingViolationFormatter $dispatchingViolationFormatter
*/
- public function __construct( ApiMain $main, $name, $prefix = '',
-EntityIdParser
$entityIdParser, EntityPermissionChecker $permissionChecker,
-
ViolationLookup $violationLookup, DispatchingViolationFormatter
$dispatchingViolationFormatter ) {
+ public function __construct(
+ ApiMain $main,
+ $name,
+ $prefix = '',
+ EntityIdParser $entityIdParser,
+ EntityPermissionChecker $permissionChecker,
+ ViolationLookup $violationLookup,
+
[MediaWiki-commits] [Gerrit] Fixed escaping issue in SpecialExternalDbs. - change (mediawiki...WikibaseQualityExternalValidation)
Soeren.oldag has uploaded a new change for review.
https://gerrit.wikimedia.org/r/219812
Change subject: Fixed escaping issue in SpecialExternalDbs.
..
Fixed escaping issue in SpecialExternalDbs.
Change-Id: I15c40ca957e957b37cab318c5cb29766a112af2c
---
M specials/SpecialExternalDbs.php
1 file changed, 22 insertions(+), 11 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikibaseQualityExternalValidation
refs/changes/12/219812/1
diff --git a/specials/SpecialExternalDbs.php b/specials/SpecialExternalDbs.php
index 008439c..fcceb7f 100755
--- a/specials/SpecialExternalDbs.php
+++ b/specials/SpecialExternalDbs.php
@@ -150,24 +150,35 @@
$rows = array();
foreach ( $dumpMetaInformationGroup as $dumpMetaInformation ) {
- $rows[] = array(
- $dumpMetaInformation-getDumpId(),
- $this-getLanguage()-timeanddate(
$dumpMetaInformation-getImportDate() ),
- Language::fetchLanguageName(
- $dumpMetaInformation-getLanguageCode(),
- $this-getLanguage()-getCode()
- ),
- Linker::makeExternalLink(
$dumpMetaInformation-getSourceUrl(), $dumpMetaInformation-getSourceUrl() ),
- $this-getLanguage()-formatSize(
$dumpMetaInformation-getSize() ),
- $this-entityIdLinkFormatter-formatEntityId(
$dumpMetaInformation-getLicenseItemId() )
+ $dumpId = $dumpMetaInformation-getDumpId();
+ $importDate = $this-getLanguage()-timeanddate(
$dumpMetaInformation-getImportDate() );
+ $language = Language::fetchLanguageName(
+ $dumpMetaInformation-getLanguageCode(),
+ $this-getLanguage()-getCode()
);
+ $sourceUrl = Linker::makeExternalLink(
+ $dumpMetaInformation-getSourceUrl(),
+ $dumpMetaInformation-getSourceUrl()
+ );
+ $size = $this-getLanguage()-formatSize(
$dumpMetaInformation-getSize() );
+ $license =
$this-entityIdLinkFormatter-formatEntityId(
$dumpMetaInformation-getLicenseItemId() );
+ $rows[] = array(
+ new HtmlTableCellBuilder( $dumpId, array(),
true ),
+ new HtmlTableCellBuilder( $importDate, array(),
true ),
+ new HtmlTableCellBuilder( $language, array(),
true ),
+ new HtmlTableCellBuilder( $sourceUrl, array(),
true ),
+ new HtmlTableCellBuilder( $size, array(), true
),
+ new HtmlTableCellBuilder( $license, array(),
true )
+ );
+
}
array_unshift(
$rows[0],
new HtmlTableCellBuilder(
$this-entityIdLinkFormatter-formatEntityId(
$dumpMetaInformationGroup[0]-getSourceItemId() ),
- array( 'rowspan' = count(
$dumpMetaInformationGroup ) )
+ array( 'rowspan' = count(
$dumpMetaInformationGroup ) ),
+ true
)
);
--
To view, visit https://gerrit.wikimedia.org/r/219812
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I15c40ca957e957b37cab318c5cb29766a112af2c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikibaseQualityExternalValidation
Gerrit-Branch: master
Gerrit-Owner: Soeren.oldag soeren_ol...@freenet.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fixed bug, that appears when requesting the same constraint ... - change (mediawiki...WikibaseQualityConstraints)
Soeren.oldag has uploaded a new change for review.
https://gerrit.wikimedia.org/r/219824
Change subject: Fixed bug, that appears when requesting the same constraint
report repeatedly.
..
Fixed bug, that appears when requesting the same constraint report repeatedly.
Change-Id: I5cf6c415e160213bbf6e60bb97682df1ad7db760
---
M specials/SpecialConstraintReport.php
1 file changed, 1 insertion(+), 1 deletion(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikibaseQualityConstraints
refs/changes/24/219824/1
diff --git a/specials/SpecialConstraintReport.php
b/specials/SpecialConstraintReport.php
index d860273..daf5d4d 100644
--- a/specials/SpecialConstraintReport.php
+++ b/specials/SpecialConstraintReport.php
@@ -739,7 +739,7 @@
private function saveResultsInViolationsTable( $entity, $results ) {
$violations =
$this-checkResultToViolationTranslator-translateToViolation( $entity,
$results );
foreach( $violations as $violation ) {
-$this-violationStore-insert( $violation );
+$this-violationStore-insert( $violation, true );
}
}
--
To view, visit https://gerrit.wikimedia.org/r/219824
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5cf6c415e160213bbf6e60bb97682df1ad7db760
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikibaseQualityConstraints
Gerrit-Branch: master
Gerrit-Owner: Soeren.oldag soeren_ol...@freenet.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Removed unnecessary files. - change (mediawiki...WikibaseQualityExternalValidation)
Soeren.oldag has uploaded a new change for review.
https://gerrit.wikimedia.org/r/219831
Change subject: Removed unnecessary files.
..
Removed unnecessary files.
Change-Id: I8f2a91859dafc159655bf9a297cff7486a356541
---
D
includes/CrossCheck/ComparativeValueParser/ComparativeGlobeCoordinateParser.php
D
includes/CrossCheck/ComparativeValueParser/ComparativeMonolingualTextParser.php
D includes/CrossCheck/ComparativeValueParser/ComparativeQuantityParser.php
D includes/CrossCheck/ComparativeValueParser/ComparativeStringParser.php
D includes/CrossCheck/ComparativeValueParser/ComparativeTimeParser.php
5 files changed, 0 insertions(+), 191 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikibaseQualityExternalValidation
refs/changes/31/219831/1
diff --git
a/includes/CrossCheck/ComparativeValueParser/ComparativeGlobeCoordinateParser.php
b/includes/CrossCheck/ComparativeValueParser/ComparativeGlobeCoordinateParser.php
deleted file mode 100755
index d7aa4ae..000
---
a/includes/CrossCheck/ComparativeValueParser/ComparativeGlobeCoordinateParser.php
+++ /dev/null
@@ -1,36 +0,0 @@
-?php
-
-namespace WikibaseQuality\ExternalValidation\CrossCheck\ValueParser;
-
-use DataValues\DataValue;
-use DataValues\Geo\Parsers\GlobeCoordinateParser;
-use WikibaseQuality\ExternalValidation\DumpMetaInformation\DumpMetaInformation;
-
-/**
- * Class ExternalGlobeCoordinateParser
- * @package WikibaseQuality\ExternalValidation\CrossCheck\ValueParser
- * @author BP2014N1
- * @license GNU GPL v2+
- */
-class ComparativeGlobeCoordinateParser implements ComparativeValueParser {
-
- /**
-* @param DataValue $dataValue
-* @return bool
-*/
- public function isParserFor( DataValue $dataValue ) {
- return $dataValue-getType() === 'globecoordinate';
- }
-
- /**
-* @param DataValue $dataValue
-* @param string $comparativeValue
-* @param DumpMetaInformation $dumpMetaInformation
-* @return DataValue
-*/
- public function parse( DataValue $dataValue, $comparativeValue,
DumpMetaInformation $dumpMetaInformation ) {
- $globeCoordinateValue = new GlobeCoordinateParser();
-
- return $globeCoordinateValue-parse( $comparativeValue );
- }
-}
\ No newline at end of file
diff --git
a/includes/CrossCheck/ComparativeValueParser/ComparativeMonolingualTextParser.php
b/includes/CrossCheck/ComparativeValueParser/ComparativeMonolingualTextParser.php
deleted file mode 100755
index 01893ad..000
---
a/includes/CrossCheck/ComparativeValueParser/ComparativeMonolingualTextParser.php
+++ /dev/null
@@ -1,40 +0,0 @@
-?php
-
-namespace WikibaseQuality\ExternalValidation\CrossCheck\ValueParser;
-
-use ValueParsers\ParserOptions;
-use Wikibase\Parsers\MonolingualTextParser;
-use
WikibaseQuality\ExternalValidation\CrossCheck\ComparativeValueParser\ComparativeValueParser;
-use WikibaseQuality\ExternalValidation\DumpMetaInformation\DumpMetaInformation;
-use DataValues\DataValue;
-
-/**
- * Class MonolingualStringParser
- * @package WikibaseQuality\ExternalValidation\CrossCheck\ValueParser
- * @author BP2014N1
- * @license GNU GPL v2+
- */
-class ComparativeMonolingualTextParser implements ComparativeValueParser {
-
- /**
-* @param DataValue $dataValue
-* @return bool
-*/
- public function isParserFor( DataValue $dataValue ) {
- return $dataValue-getType() === 'monolingualtext';
- }
-
- /**
-* @param DataValue $dataValue
-* @param string $comparativeValue
-* @param DumpMetaInformation $dumpMetaInformation
-* @return DataValue
-*/
- public function parseForComparison( DataValue $dataValue,
$comparativeValue, DumpMetaInformation $dumpMetaInformation ) {
- $options = new ParserOptions();
- $options-setOption( 'valuelang',
$dumpMetaInformation-getLanguageCode() );
- $monolingualTextParser = new MonolingualTextParser( $options );
-
- return $monolingualTextParser-parse( $comparativeValue );
- }
-}
\ No newline at end of file
diff --git
a/includes/CrossCheck/ComparativeValueParser/ComparativeQuantityParser.php
b/includes/CrossCheck/ComparativeValueParser/ComparativeQuantityParser.php
deleted file mode 100755
index 5ba1ac7..000
--- a/includes/CrossCheck/ComparativeValueParser/ComparativeQuantityParser.php
+++ /dev/null
@@ -1,40 +0,0 @@
-?php
-
-namespace WikibaseQuality\ExternalValidation\CrossCheck\ValueParser;
-
-use DataValues\DataValue;
-use ValueParsers\ParserOptions;
-use ValueParsers\QuantityParser;
-use ValueParsers\ValueParser;
-use WikibaseQuality\ExternalValidation\DumpMetaInformation\DumpMetaInformation;
-
-/**
- * Class ExternalQuantityParser
- * @package WikibaseQuality\ExternalValidation\CrossCheck\ValueParser
- * @author BP2014N1
- *
[MediaWiki-commits] [Gerrit] Removed unnecessary files. - change (mediawiki...WikibaseQualityExternalValidation)
Soeren.oldag has uploaded a new change for review.
https://gerrit.wikimedia.org/r/219832
Change subject: Removed unnecessary files.
..
Removed unnecessary files.
Change-Id: I8f2a91859dafc159655bf9a297cff7486a356541
---
D
includes/CrossCheck/ComparativeValueParser/ComparativeGlobeCoordinateParser.php
D
includes/CrossCheck/ComparativeValueParser/ComparativeMonolingualTextParser.php
D includes/CrossCheck/ComparativeValueParser/ComparativeQuantityParser.php
D includes/CrossCheck/ComparativeValueParser/ComparativeStringParser.php
D includes/CrossCheck/ComparativeValueParser/ComparativeTimeParser.php
5 files changed, 0 insertions(+), 191 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikibaseQualityExternalValidation
refs/changes/32/219832/1
diff --git
a/includes/CrossCheck/ComparativeValueParser/ComparativeGlobeCoordinateParser.php
b/includes/CrossCheck/ComparativeValueParser/ComparativeGlobeCoordinateParser.php
deleted file mode 100755
index d7aa4ae..000
---
a/includes/CrossCheck/ComparativeValueParser/ComparativeGlobeCoordinateParser.php
+++ /dev/null
@@ -1,36 +0,0 @@
-?php
-
-namespace WikibaseQuality\ExternalValidation\CrossCheck\ValueParser;
-
-use DataValues\DataValue;
-use DataValues\Geo\Parsers\GlobeCoordinateParser;
-use WikibaseQuality\ExternalValidation\DumpMetaInformation\DumpMetaInformation;
-
-/**
- * Class ExternalGlobeCoordinateParser
- * @package WikibaseQuality\ExternalValidation\CrossCheck\ValueParser
- * @author BP2014N1
- * @license GNU GPL v2+
- */
-class ComparativeGlobeCoordinateParser implements ComparativeValueParser {
-
- /**
-* @param DataValue $dataValue
-* @return bool
-*/
- public function isParserFor( DataValue $dataValue ) {
- return $dataValue-getType() === 'globecoordinate';
- }
-
- /**
-* @param DataValue $dataValue
-* @param string $comparativeValue
-* @param DumpMetaInformation $dumpMetaInformation
-* @return DataValue
-*/
- public function parse( DataValue $dataValue, $comparativeValue,
DumpMetaInformation $dumpMetaInformation ) {
- $globeCoordinateValue = new GlobeCoordinateParser();
-
- return $globeCoordinateValue-parse( $comparativeValue );
- }
-}
\ No newline at end of file
diff --git
a/includes/CrossCheck/ComparativeValueParser/ComparativeMonolingualTextParser.php
b/includes/CrossCheck/ComparativeValueParser/ComparativeMonolingualTextParser.php
deleted file mode 100755
index 01893ad..000
---
a/includes/CrossCheck/ComparativeValueParser/ComparativeMonolingualTextParser.php
+++ /dev/null
@@ -1,40 +0,0 @@
-?php
-
-namespace WikibaseQuality\ExternalValidation\CrossCheck\ValueParser;
-
-use ValueParsers\ParserOptions;
-use Wikibase\Parsers\MonolingualTextParser;
-use
WikibaseQuality\ExternalValidation\CrossCheck\ComparativeValueParser\ComparativeValueParser;
-use WikibaseQuality\ExternalValidation\DumpMetaInformation\DumpMetaInformation;
-use DataValues\DataValue;
-
-/**
- * Class MonolingualStringParser
- * @package WikibaseQuality\ExternalValidation\CrossCheck\ValueParser
- * @author BP2014N1
- * @license GNU GPL v2+
- */
-class ComparativeMonolingualTextParser implements ComparativeValueParser {
-
- /**
-* @param DataValue $dataValue
-* @return bool
-*/
- public function isParserFor( DataValue $dataValue ) {
- return $dataValue-getType() === 'monolingualtext';
- }
-
- /**
-* @param DataValue $dataValue
-* @param string $comparativeValue
-* @param DumpMetaInformation $dumpMetaInformation
-* @return DataValue
-*/
- public function parseForComparison( DataValue $dataValue,
$comparativeValue, DumpMetaInformation $dumpMetaInformation ) {
- $options = new ParserOptions();
- $options-setOption( 'valuelang',
$dumpMetaInformation-getLanguageCode() );
- $monolingualTextParser = new MonolingualTextParser( $options );
-
- return $monolingualTextParser-parse( $comparativeValue );
- }
-}
\ No newline at end of file
diff --git
a/includes/CrossCheck/ComparativeValueParser/ComparativeQuantityParser.php
b/includes/CrossCheck/ComparativeValueParser/ComparativeQuantityParser.php
deleted file mode 100755
index 5ba1ac7..000
--- a/includes/CrossCheck/ComparativeValueParser/ComparativeQuantityParser.php
+++ /dev/null
@@ -1,40 +0,0 @@
-?php
-
-namespace WikibaseQuality\ExternalValidation\CrossCheck\ValueParser;
-
-use DataValues\DataValue;
-use ValueParsers\ParserOptions;
-use ValueParsers\QuantityParser;
-use ValueParsers\ValueParser;
-use WikibaseQuality\ExternalValidation\DumpMetaInformation\DumpMetaInformation;
-
-/**
- * Class ExternalQuantityParser
- * @package WikibaseQuality\ExternalValidation\CrossCheck\ValueParser
- * @author BP2014N1
- *
[MediaWiki-commits] [Gerrit] Fixed renaming issue. - change (mediawiki...WikibaseQualityExternalValidation)
Soeren.oldag has uploaded a new change for review.
https://gerrit.wikimedia.org/r/219332
Change subject: Fixed renaming issue.
..
Fixed renaming issue.
Change-Id: I76c09e5d50bf94946d84056d226af64c2c9374da
---
M
tests/phpunit/CrossCheck/ComparativeValueParser/BasicComparativeValueParserTest.php
M
tests/phpunit/CrossCheck/ComparativeValueParser/ComparativeMultilingualTextValueParserTest.php
M
tests/phpunit/CrossCheck/ComparativeValueParser/ComparativeStringValueParserTest.php
M
tests/phpunit/CrossCheck/ComparativeValueParser/DispatchingComparativeValueParserTest.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/StringValueComparerTest.php
M tests/phpunit/CrossCheck/Comparer/TimeValueComparerTest.php
M tests/phpunit/Serializer/ComparisonResultSerializerTest.php
M tests/phpunit/Serializer/CrossCheckResultSerializerTest.php
M tests/phpunit/Serializer/DumpMetaInformationSerializerTest.php
M tests/phpunit/Serializer/ReferenceResultSerializerTest.php
16 files changed, 16 insertions(+), 16 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikibaseQualityExternalValidation
refs/changes/32/219332/1
diff --git
a/tests/phpunit/CrossCheck/ComparativeValueParser/BasicComparativeValueParserTest.php
b/tests/phpunit/CrossCheck/ComparativeValueParser/BasicComparativeValueParserTest.php
index cfd8890..9fadaad 100644
---
a/tests/phpunit/CrossCheck/ComparativeValueParser/BasicComparativeValueParserTest.php
+++
b/tests/phpunit/CrossCheck/ComparativeValueParser/BasicComparativeValueParserTest.php
@@ -12,7 +12,7 @@
* @author BP2014N1
* @license GNU GPL v2+
*/
-class BasicComparativeValueParserTestBase extends
ComparativeValueParserTestBase {
+class BasicComparativeValueParserTest extends ComparativeValueParserTestBase {
public function parseableProvider() {
return array(
diff --git
a/tests/phpunit/CrossCheck/ComparativeValueParser/ComparativeMultilingualTextValueParserTest.php
b/tests/phpunit/CrossCheck/ComparativeValueParser/ComparativeMultilingualTextValueParserTest.php
index 9b95e81..2cae965 100644
---
a/tests/phpunit/CrossCheck/ComparativeValueParser/ComparativeMultilingualTextValueParserTest.php
+++
b/tests/phpunit/CrossCheck/ComparativeValueParser/ComparativeMultilingualTextValueParserTest.php
@@ -14,7 +14,7 @@
* @author BP2014N1
* @license GNU GPL v2+
*/
-class ComparativeMultilingualTextValueParserTestBase extends
ComparativeValueParserTestBase {
+class ComparativeMultilingualTextValueParserTest extends
ComparativeValueParserTestBase {
public function parseableProvider() {
return array(
diff --git
a/tests/phpunit/CrossCheck/ComparativeValueParser/ComparativeStringValueParserTest.php
b/tests/phpunit/CrossCheck/ComparativeValueParser/ComparativeStringValueParserTest.php
index f9f285b..7bad9d5 100644
---
a/tests/phpunit/CrossCheck/ComparativeValueParser/ComparativeStringValueParserTest.php
+++
b/tests/phpunit/CrossCheck/ComparativeValueParser/ComparativeStringValueParserTest.php
@@ -12,7 +12,7 @@
* @author BP2014N1
* @license GNU GPL v2+
*/
-class ComparativeStringValueParserTestBase extends
ComparativeValueParserTestBase {
+class ComparativeStringValueParserTest extends ComparativeValueParserTestBase {
public function parseableProvider() {
return array(
diff --git
a/tests/phpunit/CrossCheck/ComparativeValueParser/DispatchingComparativeValueParserTest.php
b/tests/phpunit/CrossCheck/ComparativeValueParser/DispatchingComparativeValueParserTest.php
index 7419a2f..d182154 100644
---
a/tests/phpunit/CrossCheck/ComparativeValueParser/DispatchingComparativeValueParserTest.php
+++
b/tests/phpunit/CrossCheck/ComparativeValueParser/DispatchingComparativeValueParserTest.php
@@ -12,7 +12,7 @@
* @author BP2014N1
* @license GNU GPL v2+
*/
-class DispatchingComparativeValueParserTestBase extends
ComparativeValueParserTestBase {
+class DispatchingComparativeValueParserTest extends
ComparativeValueParserTestBase {
public function parseableProvider() {
return array(
diff --git
a/tests/phpunit/CrossCheck/Comparer/DispatchingDataValueComparerTest.php
b/tests/phpunit/CrossCheck/Comparer/DispatchingDataValueComparerTest.php
index ea8d20d..f5a5eea 100755
--- a/tests/phpunit/CrossCheck/Comparer/DispatchingDataValueComparerTest.php
+++ b/tests/phpunit/CrossCheck/Comparer/DispatchingDataValueComparerTest.php
@@ -24,7 +24,7 @@
* @author BP2014N1
* @license GNU GPL v2+
*/
[MediaWiki-commits] [Gerrit] Adopted tests for phpunit 3.7. Removed wrong exception names... - change (mediawiki...WikibaseQualityExternalValidation)
Soeren.oldag has uploaded a new change for review. https://gerrit.wikimedia.org/r/219330 Change subject: Adopted tests for phpunit 3.7. Removed wrong exception namespaces. .. Adopted tests for phpunit 3.7. Removed wrong exception namespaces. Change-Id: I73f2be7a499662ea09c012fff41c536d11555604 --- M includes/CrossCheck/Comparer/TimeValueComparer.php M includes/CrossCheck/ReferenceChecker.php M includes/CrossCheck/Result/CrossCheckResult.php M includes/CrossCheck/Result/CrossCheckResultList.php M includes/Serializer/IndexedTagsSerializer.php M includes/UpdateTable/TarImportSettings.php M specials/SpecialCrossCheck.php M tests/phpunit/CrossCheck/ComparativeValueParser/BasicComparativeValueParserTest.php M tests/phpunit/CrossCheck/ComparativeValueParser/ComparativeMultilingualTextValueParserTest.php M tests/phpunit/CrossCheck/ComparativeValueParser/ComparativeStringValueParserTest.php M tests/phpunit/CrossCheck/ComparativeValueParser/ComparativeValueParserTestBase.php M tests/phpunit/CrossCheck/ComparativeValueParser/DispatchingComparativeValueParserTest.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/StringValueComparerTest.php M tests/phpunit/CrossCheck/CrossCheckInteractorTest.php M tests/phpunit/CrossCheck/CrossCheckerTest.php M tests/phpunit/CrossCheck/ReferenceCheckerTest.php M tests/phpunit/CrossCheck/Result/CrossCheckResultListTest.php M tests/phpunit/CrossCheck/Result/CrossCheckResultTest.php M tests/phpunit/ExternalValidationServicesTest.php M tests/phpunit/Serializer/ComparisonResultSerializerTest.php M tests/phpunit/Serializer/CrossCheckResultListSerializerTest.php M tests/phpunit/Serializer/CrossCheckResultSerializerTest.php M tests/phpunit/Serializer/ReferenceResultSerializerTest.php 29 files changed, 189 insertions(+), 172 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikibaseQualityExternalValidation refs/changes/30/219330/1 diff --git a/includes/CrossCheck/Comparer/TimeValueComparer.php b/includes/CrossCheck/Comparer/TimeValueComparer.php index 4ae9f14..6a3e2cd 100755 --- a/includes/CrossCheck/Comparer/TimeValueComparer.php +++ b/includes/CrossCheck/Comparer/TimeValueComparer.php @@ -2,10 +2,10 @@ namespace WikibaseQuality\ExternalValidation\CrossCheck\Comparer; +use InvalidArgumentException; use DateInterval; use DataValues\DataValue; use DataValues\TimeValue; -use Doctrine\Instantiator\Exception\InvalidArgumentException; use ValueParsers\ParserOptions; use ValueParsers\ValueParser; use Wikibase\Lib\Parsers\TimeParserFactory; diff --git a/includes/CrossCheck/ReferenceChecker.php b/includes/CrossCheck/ReferenceChecker.php index 5a5eebf..9226f01 100755 --- a/includes/CrossCheck/ReferenceChecker.php +++ b/includes/CrossCheck/ReferenceChecker.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/CrossCheckResult.php b/includes/CrossCheck/Result/CrossCheckResult.php index 5f235d3..0f43590 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; use Wikimedia\Assert\Assert; diff --git a/includes/CrossCheck/Result/CrossCheckResultList.php b/includes/CrossCheck/Result/CrossCheckResultList.php index baf8bb9..9738ac8 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; use Wikimedia\Assert\Assert; diff --git a/includes/Serializer/IndexedTagsSerializer.php b/includes/Serializer/IndexedTagsSerializer.php index c0c4d21..dbaaad6 100755 --- a/includes/Serializer/IndexedTagsSerializer.php +++ b/includes/Serializer/IndexedTagsSerializer.php @@ -3,7 +3,7 @@ namespace WikibaseQuality\ExternalValidation\Serializer; use
[MediaWiki-commits] [Gerrit] Adopted tests for phpunit 3.7. - change (mediawiki...WikibaseQualityExternalValidation)
Soeren.oldag has submitted this change and it was merged.
Change subject: Adopted tests for phpunit 3.7.
..
Adopted tests for phpunit 3.7.
Change-Id: Icda20478cc022958475a3f839afd6554440fb129
---
M
tests/phpunit/CrossCheck/ComparativeValueParser/BasicComparativeValueParserTest.php
M
tests/phpunit/CrossCheck/ComparativeValueParser/ComparativeMultilingualTextValueParserTest.php
M
tests/phpunit/CrossCheck/ComparativeValueParser/ComparativeStringValueParserTest.php
M
tests/phpunit/CrossCheck/ComparativeValueParser/ComparativeValueParserTestBase.php
M
tests/phpunit/CrossCheck/ComparativeValueParser/DispatchingComparativeValueParserTest.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/MonolingualTextValueComparerTest.php
M tests/phpunit/CrossCheck/Comparer/MultilingualTextValueComparerTest.php
M tests/phpunit/CrossCheck/Comparer/StringValueComparerTest.php
M tests/phpunit/CrossCheck/CrossCheckInteractorTest.php
M tests/phpunit/CrossCheck/CrossCheckerTest.php
M tests/phpunit/CrossCheck/ReferenceCheckerTest.php
M tests/phpunit/CrossCheck/Result/CrossCheckResultListTest.php
M tests/phpunit/CrossCheck/Result/CrossCheckResultTest.php
M tests/phpunit/ExternalDataRepoTest.php
M tests/phpunit/ExternalValidationServicesTest.php
M tests/phpunit/Serializer/CompareResultSerializerTest.php
M tests/phpunit/Serializer/CrossCheckResultListSerializerTest.php
M tests/phpunit/Serializer/CrossCheckResultSerializerTest.php
M tests/phpunit/Serializer/ReferenceResultSerializerTest.php
M tests/phpunit/Violations/CrossCheckResultToViolationTranslatorTest.php
M tests/phpunit/Violations/CrossCheckViolationFormatterTest.php
24 files changed, 830 insertions(+), 783 deletions(-)
Approvals:
Dominic.sauer: Looks good to me, approved
jenkins-bot: Verified
diff --git
a/tests/phpunit/CrossCheck/ComparativeValueParser/BasicComparativeValueParserTest.php
b/tests/phpunit/CrossCheck/ComparativeValueParser/BasicComparativeValueParserTest.php
index f187273..fdd4b72 100644
---
a/tests/phpunit/CrossCheck/ComparativeValueParser/BasicComparativeValueParserTest.php
+++
b/tests/phpunit/CrossCheck/ComparativeValueParser/BasicComparativeValueParserTest.php
@@ -81,9 +81,9 @@
-getMock();
$valueParserFactory-expects( $this-any() )
-method( 'newParser' )
- -willReturnCallback( function( $parserId,
$parserOptions ) use ( $parserFoo, $parserBar ) {
+ -will( $this-returnCallback( function( $parserId,
$parserOptions ) use ( $parserFoo, $parserBar ) {
return $parserId === 'foo' ? $parserFoo :
$parserBar;
- } );
+ } ) );
return new BasicComparativeValueParser(
diff --git
a/tests/phpunit/CrossCheck/ComparativeValueParser/ComparativeMultilingualTextValueParserTest.php
b/tests/phpunit/CrossCheck/ComparativeValueParser/ComparativeMultilingualTextValueParserTest.php
index c19c62e..9b95e81 100644
---
a/tests/phpunit/CrossCheck/ComparativeValueParser/ComparativeMultilingualTextValueParserTest.php
+++
b/tests/phpunit/CrossCheck/ComparativeValueParser/ComparativeMultilingualTextValueParserTest.php
@@ -65,7 +65,7 @@
-getMock();
$valueParserFactory-expects( $this-any() )
-method( 'newParser' )
- -willReturn( $this-getValueParserMock( new
MonolingualTextValue( 'en', 'foo' ) ) );
+ -will( $this-returnValue( $this-getValueParserMock(
new MonolingualTextValue( 'en', 'foo' ) ) ) );
return new ComparativeMultilingualTextValueParser(
$valueParserFactory );
diff --git
a/tests/phpunit/CrossCheck/ComparativeValueParser/ComparativeStringValueParserTest.php
b/tests/phpunit/CrossCheck/ComparativeValueParser/ComparativeStringValueParserTest.php
index b6c3669..f9f285b 100644
---
a/tests/phpunit/CrossCheck/ComparativeValueParser/ComparativeStringValueParserTest.php
+++
b/tests/phpunit/CrossCheck/ComparativeValueParser/ComparativeStringValueParserTest.php
@@ -62,7 +62,7 @@
-getMock();
$stringNormalizer-expects( $this-any() )
-method( 'trimToNFC' )
- -willReturnArgument( 0 );
+ -will( $this-returnArgument( 0 ) );
return new ComparativeStringValueParser( $stringNormalizer );
}
diff --git
a/tests/phpunit/CrossCheck/ComparativeValueParser/ComparativeValueParserTestBase.php
b/tests/phpunit/CrossCheck/ComparativeValueParser/ComparativeValueParserTestBase.php
index f142126..e6fd12a 100755
---
[MediaWiki-commits] [Gerrit] Fixed missing dependency injection. - change (mediawiki...WikibaseQualityConstraints)
Soeren.oldag has uploaded a new change for review.
https://gerrit.wikimedia.org/r/219356
Change subject: Fixed missing dependency injection.
..
Fixed missing dependency injection.
Change-Id: I5246eac6d499711183cc87aa0de8f286fe101cbb
---
M specials/SpecialConstraintReport.php
M tests/phpunit/Specials/SpecialConstraintReportTest.php
2 files changed, 21 insertions(+), 11 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikibaseQualityConstraints
refs/changes/56/219356/1
diff --git a/specials/SpecialConstraintReport.php
b/specials/SpecialConstraintReport.php
index 8fbffc1..1ca137a 100755
--- a/specials/SpecialConstraintReport.php
+++ b/specials/SpecialConstraintReport.php
@@ -7,11 +7,8 @@
use ValueFormatters\FormatterOptions;
use ValueFormatters\ValueFormatter;
use Wikibase\Lib\EntityIdFormatter;
-use Wikibase\Lib\EntityIdHtmlLinkFormatter;
-use Wikibase\Lib\EntityIdLabelFormatter;
use HTMLForm;
use Wikibase\DataModel\Entity\EntityIdParser;
-use Wikibase\Lib\LanguageNameLookup;
use Wikibase\Lib\OutputFormatValueFormatterFactory;
use Wikibase\Lib\SnakFormatter;
use Wikibase\Lib\Store\EntityLookup;
@@ -28,6 +25,8 @@
use Wikibase\DataModel\Entity\ItemId;
use Wikibase\DataModel\Entity\PropertyId;
use Wikibase\Lib\Store\EntityTitleLookup;
+use Wikibase\Repo\EntityIdHtmlLinkFormatterFactory;
+use Wikibase\Repo\EntityIdLabelFormatterFactory;
use Wikibase\Repo\WikibaseRepo;
use
WikibaseQuality\ConstraintReport\ConstraintCheck\DelegatingConstraintChecker;
use WikibaseQuality\ConstraintReport\ConstraintReportFactory;
@@ -102,6 +101,8 @@
$wikibaseRepo-getEntityLookup(),
$wikibaseRepo-getTermLookup(),
$wikibaseRepo-getEntityTitleLookup(),
+ new EntityIdLabelFormatterFactory(),
+ $wikibaseRepo-getEntityIdHtmlLinkFormatterFactory(),
$wikibaseRepo-getEntityIdParser(),
$wikibaseRepo-getValueFormatterFactory(),
$constraintReportFactory-getConstraintChecker()
@@ -112,12 +113,22 @@
* @param EntityLookup $entityLookup
* @param TermLookup $termLookup
* @param EntityTitleLookup $entityTitleLookup
+* @param EntityIdLabelFormatterFactory $entityIdLabelFormatterFactory
+* @param EntityIdHtmlLinkFormatterFactory
$entityIdHtmlLinkFormatterFactory
* @param EntityIdParser $entityIdParser
* @param OutputFormatValueFormatterFactory $valueFormatterFactory
* @param DelegatingConstraintChecker $constraintChecker
*/
- public function __construct( EntityLookup $entityLookup, TermLookup
$termLookup, EntityTitleLookup $entityTitleLookup, EntityIdParser
$entityIdParser,
-
OutputFormatValueFormatterFactory $valueFormatterFactory,
DelegatingConstraintChecker $constraintChecker ) {
+ public function __construct(
+ EntityLookup $entityLookup,
+ TermLookup $termLookup,
+ EntityTitleLookup $entityTitleLookup,
+ EntityIdLabelFormatterFactory $entityIdLabelFormatterFactory,
+ EntityIdHtmlLinkFormatterFactory
$entityIdHtmlLinkFormatterFactory,
+ EntityIdParser $entityIdParser,
+ OutputFormatValueFormatterFactory $valueFormatterFactory,
+ DelegatingConstraintChecker $constraintChecker
+ ) {
parent::__construct( 'ConstraintReport' );
$this-entityLookup = $entityLookup;
@@ -129,12 +140,8 @@
$this-dataValueFormatter =
$valueFormatterFactory-getValueFormatter( SnakFormatter::FORMAT_HTML,
$formatterOptions );
$labelLookup = new LanguageLabelDescriptionLookup( $termLookup,
$this-getLanguage()-getCode() );
- $this-entityIdLabelFormatter = new EntityIdLabelFormatter(
$labelLookup );
- $this-entityIdLinkFormatter = new EntityIdHtmlLinkFormatter(
- $labelLookup,
- $this-entityTitleLookup,
- new LanguageNameLookup()
- );
+ $this-entityIdLabelFormatter =
$entityIdLabelFormatterFactory-getEntityIdFormater( $labelLookup );
+ $this-entityIdLinkFormatter =
$entityIdHtmlLinkFormatterFactory-getEntityIdFormater( $labelLookup );
$this-constraintChecker = $constraintChecker;
}
diff --git a/tests/phpunit/Specials/SpecialConstraintReportTest.php
b/tests/phpunit/Specials/SpecialConstraintReportTest.php
index 7a87af8..f6e6e00 100755
--- a/tests/phpunit/Specials/SpecialConstraintReportTest.php
+++ b/tests/phpunit/Specials/SpecialConstraintReportTest.php
@@ -2,6 +2,7 @@
namespace
WikibaseQuality\ConstraintReport\Tests\Specials\SpecialConstraintReport;
+use
[MediaWiki-commits] [Gerrit] Fixed renaming issue. - change (mediawiki...WikibaseQualityExternalValidation)
Soeren.oldag has uploaded a new change for review.
https://gerrit.wikimedia.org/r/219334
Change subject: Fixed renaming issue.
..
Fixed renaming issue.
Change-Id: I76c09e5d50bf94946d84056d226af64c2c9374da
---
M
tests/phpunit/CrossCheck/ComparativeValueParser/BasicComparativeValueParserTest.php
M
tests/phpunit/CrossCheck/ComparativeValueParser/ComparativeMultilingualTextValueParserTest.php
M
tests/phpunit/CrossCheck/ComparativeValueParser/ComparativeStringValueParserTest.php
M
tests/phpunit/CrossCheck/ComparativeValueParser/DispatchingComparativeValueParserTest.php
M tests/phpunit/CrossCheck/Comparer/DispatchingDataValueComparerTest.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/StringValueComparerTest.php
M tests/phpunit/CrossCheck/Comparer/TimeValueComparerTest.php
M tests/phpunit/Serializer/CompareResultSerializerTest.php
M tests/phpunit/Serializer/CrossCheckResultSerializerTest.php
M tests/phpunit/Serializer/DumpMetaInformationSerializerTest.php
M tests/phpunit/Serializer/ReferenceResultSerializerTest.php
15 files changed, 15 insertions(+), 15 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikibaseQualityExternalValidation
refs/changes/34/219334/1
diff --git
a/tests/phpunit/CrossCheck/ComparativeValueParser/BasicComparativeValueParserTest.php
b/tests/phpunit/CrossCheck/ComparativeValueParser/BasicComparativeValueParserTest.php
index fdd4b72..de97958 100644
---
a/tests/phpunit/CrossCheck/ComparativeValueParser/BasicComparativeValueParserTest.php
+++
b/tests/phpunit/CrossCheck/ComparativeValueParser/BasicComparativeValueParserTest.php
@@ -12,7 +12,7 @@
* @author BP2014N1
* @license GNU GPL v2+
*/
-class BasicComparativeValueParserTestBase extends
ComparativeValueParserTestBase {
+class BasicComparativeValueParserTest extends ComparativeValueParserTestBase {
public function parseableProvider() {
return array(
diff --git
a/tests/phpunit/CrossCheck/ComparativeValueParser/ComparativeMultilingualTextValueParserTest.php
b/tests/phpunit/CrossCheck/ComparativeValueParser/ComparativeMultilingualTextValueParserTest.php
index 9b95e81..2cae965 100644
---
a/tests/phpunit/CrossCheck/ComparativeValueParser/ComparativeMultilingualTextValueParserTest.php
+++
b/tests/phpunit/CrossCheck/ComparativeValueParser/ComparativeMultilingualTextValueParserTest.php
@@ -14,7 +14,7 @@
* @author BP2014N1
* @license GNU GPL v2+
*/
-class ComparativeMultilingualTextValueParserTestBase extends
ComparativeValueParserTestBase {
+class ComparativeMultilingualTextValueParserTest extends
ComparativeValueParserTestBase {
public function parseableProvider() {
return array(
diff --git
a/tests/phpunit/CrossCheck/ComparativeValueParser/ComparativeStringValueParserTest.php
b/tests/phpunit/CrossCheck/ComparativeValueParser/ComparativeStringValueParserTest.php
index f9f285b..7bad9d5 100644
---
a/tests/phpunit/CrossCheck/ComparativeValueParser/ComparativeStringValueParserTest.php
+++
b/tests/phpunit/CrossCheck/ComparativeValueParser/ComparativeStringValueParserTest.php
@@ -12,7 +12,7 @@
* @author BP2014N1
* @license GNU GPL v2+
*/
-class ComparativeStringValueParserTestBase extends
ComparativeValueParserTestBase {
+class ComparativeStringValueParserTest extends ComparativeValueParserTestBase {
public function parseableProvider() {
return array(
diff --git
a/tests/phpunit/CrossCheck/ComparativeValueParser/DispatchingComparativeValueParserTest.php
b/tests/phpunit/CrossCheck/ComparativeValueParser/DispatchingComparativeValueParserTest.php
index a5a3bb5..21f58e7 100644
---
a/tests/phpunit/CrossCheck/ComparativeValueParser/DispatchingComparativeValueParserTest.php
+++
b/tests/phpunit/CrossCheck/ComparativeValueParser/DispatchingComparativeValueParserTest.php
@@ -12,7 +12,7 @@
* @author BP2014N1
* @license GNU GPL v2+
*/
-class DispatchingComparativeValueParserTestBase extends
ComparativeValueParserTestBase {
+class DispatchingComparativeValueParserTest extends
ComparativeValueParserTestBase {
public function parseableProvider() {
return array(
diff --git
a/tests/phpunit/CrossCheck/Comparer/DispatchingDataValueComparerTest.php
b/tests/phpunit/CrossCheck/Comparer/DispatchingDataValueComparerTest.php
index 940bd86..2a953ad 100755
--- a/tests/phpunit/CrossCheck/Comparer/DispatchingDataValueComparerTest.php
+++ b/tests/phpunit/CrossCheck/Comparer/DispatchingDataValueComparerTest.php
@@ -23,7 +23,7 @@
* @author BP2014N1
* @license GNU GPL v2+
*/
-class DispatchingDataValueComparerTestBase extends
[MediaWiki-commits] [Gerrit] Adopted tests for phpunit 3.7. Removed wrong exception names... - change (mediawiki...WikibaseQualityExternalValidation)
Soeren.oldag has submitted this change and it was merged. Change subject: Adopted tests for phpunit 3.7. Removed wrong exception namespaces. .. Adopted tests for phpunit 3.7. Removed wrong exception namespaces. Change-Id: I73f2be7a499662ea09c012fff41c536d11555604 --- M includes/CrossCheck/Comparer/TimeValueComparer.php M includes/CrossCheck/ReferenceChecker.php M includes/CrossCheck/Result/CrossCheckResult.php M includes/CrossCheck/Result/CrossCheckResultList.php M includes/Serializer/IndexedTagsSerializer.php M includes/UpdateTable/TarImportSettings.php M maintenance/UpdateTable.php M specials/SpecialCrossCheck.php M tests/phpunit/CrossCheck/ComparativeValueParser/BasicComparativeValueParserTest.php M tests/phpunit/CrossCheck/ComparativeValueParser/ComparativeMultilingualTextValueParserTest.php M tests/phpunit/CrossCheck/ComparativeValueParser/ComparativeStringValueParserTest.php M tests/phpunit/CrossCheck/ComparativeValueParser/ComparativeValueParserTestBase.php M tests/phpunit/CrossCheck/ComparativeValueParser/DispatchingComparativeValueParserTest.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/StringValueComparerTest.php M tests/phpunit/CrossCheck/CrossCheckInteractorTest.php M tests/phpunit/CrossCheck/CrossCheckerTest.php M tests/phpunit/CrossCheck/ReferenceCheckerTest.php M tests/phpunit/CrossCheck/Result/CrossCheckResultListTest.php M tests/phpunit/CrossCheck/Result/CrossCheckResultTest.php M tests/phpunit/ExternalValidationServicesTest.php M tests/phpunit/Serializer/ComparisonResultSerializerTest.php M tests/phpunit/Serializer/CrossCheckResultListSerializerTest.php M tests/phpunit/Serializer/CrossCheckResultSerializerTest.php M tests/phpunit/Serializer/ReferenceResultSerializerTest.php 30 files changed, 189 insertions(+), 178 deletions(-) Approvals: Soeren.oldag: Verified; Looks good to me, approved diff --git a/includes/CrossCheck/Comparer/TimeValueComparer.php b/includes/CrossCheck/Comparer/TimeValueComparer.php index 4ae9f14..6a3e2cd 100755 --- a/includes/CrossCheck/Comparer/TimeValueComparer.php +++ b/includes/CrossCheck/Comparer/TimeValueComparer.php @@ -2,10 +2,10 @@ namespace WikibaseQuality\ExternalValidation\CrossCheck\Comparer; +use InvalidArgumentException; use DateInterval; use DataValues\DataValue; use DataValues\TimeValue; -use Doctrine\Instantiator\Exception\InvalidArgumentException; use ValueParsers\ParserOptions; use ValueParsers\ValueParser; use Wikibase\Lib\Parsers\TimeParserFactory; diff --git a/includes/CrossCheck/ReferenceChecker.php b/includes/CrossCheck/ReferenceChecker.php index 5a5eebf..9226f01 100755 --- a/includes/CrossCheck/ReferenceChecker.php +++ b/includes/CrossCheck/ReferenceChecker.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/CrossCheckResult.php b/includes/CrossCheck/Result/CrossCheckResult.php index 5f235d3..0f43590 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; use Wikimedia\Assert\Assert; diff --git a/includes/CrossCheck/Result/CrossCheckResultList.php b/includes/CrossCheck/Result/CrossCheckResultList.php index baf8bb9..9738ac8 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; use Wikimedia\Assert\Assert; diff --git a/includes/Serializer/IndexedTagsSerializer.php b/includes/Serializer/IndexedTagsSerializer.php index c0c4d21..dbaaad6 100755 --- a/includes/Serializer/IndexedTagsSerializer.php +++ b/includes/Serializer/IndexedTagsSerializer.php @@ -3,7 +3,7 @@ namespace WikibaseQuality\ExternalValidation\Serializer; use ApiResult; -use
[MediaWiki-commits] [Gerrit] Fixed missing dependency injection. - change (mediawiki...WikibaseQualityExternalValidation)
Soeren.oldag has uploaded a new change for review. https://gerrit.wikimedia.org/r/219348 Change subject: Fixed missing dependency injection. .. Fixed missing dependency injection. Change-Id: I5fb3c51a14b5618d58c7e30e00b251b554818c0b --- M specials/SpecialCrossCheck.php M specials/SpecialExternalDbs.php M tests/phpunit/Specials/SpecialCrossCheckTest.php M tests/phpunit/Specials/SpecialExternalDbsTest.php 4 files changed, 26 insertions(+), 26 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikibaseQualityExternalValidation refs/changes/48/219348/1 diff --git a/specials/SpecialCrossCheck.php b/specials/SpecialCrossCheck.php index 12fb48a..0792930 100755 --- a/specials/SpecialCrossCheck.php +++ b/specials/SpecialCrossCheck.php @@ -4,7 +4,7 @@ use DataValues\DataValue; use InvalidArgumentException; -use Doctrine\Instantiator\Exception\UnexpectedValueException; +use UnexpectedValueException; use Html; use HTMLForm; use JobQueueGroup; @@ -13,7 +13,6 @@ use Traversable; use ValueFormatters\FormatterOptions; use ValueFormatters\ValueFormatter; -use Wikibase\DataModel\Entity\Entity; use Wikibase\DataModel\Entity\EntityId; use Wikibase\DataModel\Entity\EntityIdParser; use Wikibase\DataModel\Entity\EntityIdParsingException; @@ -28,6 +27,8 @@ use Wikibase\Lib\Store\EntityTitleLookup; use Wikibase\Lib\Store\LanguageLabelDescriptionLookup; use Wikibase\Lib\Store\TermLookup; +use Wikibase\Repo\EntityIdHtmlLinkFormatterFactory; +use Wikibase\Repo\EntityIdLabelFormatterFactory; use Wikibase\Repo\WikibaseRepo; use WikibaseQuality\ExternalValidation\CrossCheck\CrossCheckInteractor; use WikibaseQuality\ExternalValidation\CrossCheck\Result\CrossCheckResultList; @@ -84,7 +85,8 @@ return new self( $repo-getEntityLookup(), $repo-getTermLookup(), - $repo-getEntityTitleLookup(), + new EntityIdLabelFormatterFactory(), + $repo-getEntityIdHtmlLinkFormatterFactory(), $repo-getEntityIdParser(), $repo-getValueFormatterFactory(), $externalValidationServices-getCrossCheckInteractor() @@ -103,7 +105,8 @@ public function __construct( EntityLookup $entityLookup, TermLookup $termLookup, - EntityTitleLookup $entityTitleLookup, + EntityIdLabelFormatterFactory $entityIdLabelFormatterFactory, + EntityIdHtmlLinkFormatterFactory $entityIdHtmlLinkFormatterFactory, EntityIdParser $entityIdParser, OutputFormatValueFormatterFactory $valueFormatterFactory, CrossCheckInteractor $crossCheckInteractor @@ -119,12 +122,8 @@ $this-dataValueFormatter = $valueFormatterFactory-getValueFormatter(SnakFormatter::FORMAT_HTML, $formatterOptions); $labelLookup = new LanguageLabelDescriptionLookup($termLookup, $this-getLanguage()-getCode()); - $this-entityIdLabelFormatter = new EntityIdLabelFormatter($labelLookup); - $this-entityIdLinkFormatter = new EntityIdHtmlLinkFormatter( - $labelLookup, - $entityTitleLookup, - new LanguageNameLookup() - ); + $this-entityIdLabelFormatter = $entityIdLabelFormatterFactory-getEntityIdFormater( $labelLookup ); + $this-entityIdLinkFormatter = $entityIdHtmlLinkFormatterFactory-getEntityIdFormater( $labelLookup ); $this-crossCheckInteractor = $crossCheckInteractor; } diff --git a/specials/SpecialExternalDbs.php b/specials/SpecialExternalDbs.php index 383e87c..032692a 100755 --- a/specials/SpecialExternalDbs.php +++ b/specials/SpecialExternalDbs.php @@ -16,6 +16,7 @@ use Wikibase\Lib\Store\EntityTitleLookup; use Wikibase\Lib\Store\LanguageLabelDescriptionLookup; use Wikibase\Lib\Store\TermLookup; +use Wikibase\Repo\EntityIdHtmlLinkFormatterFactory; use Wikibase\Repo\WikibaseRepo; use WikibaseQuality\ExternalValidation\DumpMetaInformation\DumpMetaInformation; use WikibaseQuality\ExternalValidation\DumpMetaInformation\DumpMetaInformationLookup; @@ -47,7 +48,7 @@ return new self( $repo-getTermLookup(), - $repo-getEntityTitleLookup(), + $repo-getEntityIdHtmlLinkFormatterFactory(), $externalValidationServices-getDumpMetaInformationLookup() ); } @@ -57,15 +58,14 @@ * @param EntityTitleLookup $entityTitleLookup * @param DumpMetaInformationLookup $dumpMetaInformationRepo */ - public function __construct( TermLookup $termLookup, EntityTitleLookup $entityTitleLookup, -
[MediaWiki-commits] [Gerrit] Fixed missing dependency injection. - change (mediawiki...WikibaseQualityExternalValidation)
Soeren.oldag has uploaded a new change for review.
https://gerrit.wikimedia.org/r/219349
Change subject: Fixed missing dependency injection.
..
Fixed missing dependency injection.
Change-Id: I8571d619b364f1894035558ca85a459920ab
---
M specials/SpecialCrossCheck.php
M specials/SpecialExternalDbs.php
M tests/phpunit/Specials/SpecialCrossCheckTest.php
M tests/phpunit/Specials/SpecialExternalDbsTest.php
4 files changed, 48 insertions(+), 46 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikibaseQualityExternalValidation
refs/changes/49/219349/1
diff --git a/specials/SpecialCrossCheck.php b/specials/SpecialCrossCheck.php
index 308e5bf..a5324b3 100755
--- a/specials/SpecialCrossCheck.php
+++ b/specials/SpecialCrossCheck.php
@@ -2,32 +2,29 @@
namespace WikibaseQuality\ExternalValidation\Specials;
+use DataValues\DataValue;
+use InvalidArgumentException;
+use UnexpectedValueException;
+use Html;
+use HTMLForm;
+use JobQueueGroup;
+use Linker;
use SpecialPage;
use ValueFormatters\FormatterOptions;
use ValueFormatters\ValueFormatter;
use Wikibase\DataModel\Entity\Entity;
+use Wikibase\DataModel\Entity\EntityId;
use Wikibase\DataModel\Entity\EntityIdParser;
+use Wikibase\DataModel\Entity\EntityIdParsingException;
use Wikibase\Lib\EntityIdFormatter;
-use Wikibase\Lib\EntityIdLabelFormatter;
-use Wikibase\Lib\EntityIdHtmlLinkFormatter;
-use Wikibase\Lib\LanguageNameLookup;
use Wikibase\Lib\OutputFormatValueFormatterFactory;
use Wikibase\Lib\SnakFormatter;
use Wikibase\Lib\Store\EntityLookup;
use Wikibase\Lib\Store\EntityTitleLookup;
use Wikibase\Lib\Store\LanguageLabelDescriptionLookup;
use Wikibase\Lib\Store\TermLookup;
-use Html;
-use HTMLForm;
-use Linker;
-use JobQueueGroup;
-use Traversable;
-use Wikibase\DataModel\Entity\EntityId;
-use DataValues\DataValue;
-use InvalidArgumentException;
-use UnexpectedValueException;
-use Wikibase\DataModel\Entity\EntityIdParsingException;
-use Wikibase\DataModel\Entity\EntityIdValue;
+use Wikibase\Repo\EntityIdHtmlLinkFormatterFactory;
+use Wikibase\Repo\EntityIdLabelFormatterFactory;
use Wikibase\Repo\WikibaseRepo;
use WikibaseQuality\ExternalValidation\CrossCheck\CrossCheckInteractor;
use WikibaseQuality\ExternalValidation\CrossCheck\Result\CrossCheckResultList;
@@ -96,7 +93,8 @@
return new self(
$repo-getEntityLookup(),
$repo-getTermLookup(),
- $repo-getEntityTitleLookup(),
+ new EntityIdLabelFormatterFactory(),
+ $repo-getEntityIdHtmlLinkFormatterFactory(),
$repo-getEntityIdParser(),
$repo-getValueFormatterFactory(),
$externalValidationServices-getCrossCheckInteractor(),
@@ -107,23 +105,27 @@
/**
* @param EntityLookup $entityLookup
+* @param TermLookup $termLookup
+* @param EntityIdLabelFormatterFactory $entityIdLabelFormatterFactory
+* @param EntityIdHtmlLinkFormatterFactory
$entityIdHtmlLinkFormatterFactory
* @param EntityIdParser $entityIdParser
* @param OutputFormatValueFormatterFactory $valueFormatterFactory
-* @param TermLookup $termLookup
-* @param EntityTitleLookup $entityTitleLookup
* @param CrossCheckInteractor $crossCheckInteractor
* @param CrossCheckResultToViolationTranslator
$checkResultToViolationTranslator
* @param ViolationStore $violationStore
*/
- public function __construct( EntityLookup $entityLookup,
-TermLookup
$termLookup,
-
EntityTitleLookup $entityTitleLookup,
-EntityIdParser
$entityIdParser,
-
OutputFormatValueFormatterFactory $valueFormatterFactory,
-
CrossCheckInteractor $crossCheckInteractor,
-
CrossCheckResultToViolationTranslator $checkResultToViolationTranslator,
-ViolationStore
$violationStore ) {
- parent::__construct( 'CrossCheck' );
+ public function __construct(
+ EntityLookup $entityLookup,
+ TermLookup $termLookup,
+ EntityIdLabelFormatterFactory $entityIdLabelFormatterFactory,
+ EntityIdHtmlLinkFormatterFactory
$entityIdHtmlLinkFormatterFactory,
+ EntityIdParser $entityIdParser,
+ OutputFormatValueFormatterFactory $valueFormatterFactory,
+ CrossCheckInteractor $crossCheckInteractor,
+
[MediaWiki-commits] [Gerrit] Adopted tests for phpunit 3.7. - change (mediawiki...WikibaseQualityExternalValidation)
Soeren.oldag has uploaded a new change for review.
https://gerrit.wikimedia.org/r/219326
Change subject: Adopted tests for phpunit 3.7.
..
Adopted tests for phpunit 3.7.
Change-Id: Icda20478cc022958475a3f839afd6554440fb129
---
M
tests/phpunit/CrossCheck/ComparativeValueParser/BasicComparativeValueParserTest.php
M
tests/phpunit/CrossCheck/ComparativeValueParser/ComparativeMultilingualTextValueParserTest.php
M
tests/phpunit/CrossCheck/ComparativeValueParser/ComparativeStringValueParserTest.php
M
tests/phpunit/CrossCheck/ComparativeValueParser/ComparativeValueParserTestBase.php
M
tests/phpunit/CrossCheck/ComparativeValueParser/DispatchingComparativeValueParserTest.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/MonolingualTextValueComparerTest.php
M tests/phpunit/CrossCheck/Comparer/MultilingualTextValueComparerTest.php
M tests/phpunit/CrossCheck/Comparer/StringValueComparerTest.php
M tests/phpunit/CrossCheck/CrossCheckInteractorTest.php
M tests/phpunit/CrossCheck/CrossCheckerTest.php
M tests/phpunit/CrossCheck/ReferenceCheckerTest.php
M tests/phpunit/CrossCheck/Result/CrossCheckResultListTest.php
M tests/phpunit/CrossCheck/Result/CrossCheckResultTest.php
M tests/phpunit/ExternalDataRepoTest.php
M tests/phpunit/ExternalValidationServicesTest.php
M tests/phpunit/Serializer/CompareResultSerializerTest.php
M tests/phpunit/Serializer/CrossCheckResultListSerializerTest.php
M tests/phpunit/Serializer/CrossCheckResultSerializerTest.php
M tests/phpunit/Serializer/ReferenceResultSerializerTest.php
M tests/phpunit/Violations/CrossCheckResultToViolationTranslatorTest.php
M tests/phpunit/Violations/CrossCheckViolationFormatterTest.php
24 files changed, 830 insertions(+), 783 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikibaseQualityExternalValidation
refs/changes/26/219326/1
diff --git
a/tests/phpunit/CrossCheck/ComparativeValueParser/BasicComparativeValueParserTest.php
b/tests/phpunit/CrossCheck/ComparativeValueParser/BasicComparativeValueParserTest.php
index f187273..fdd4b72 100644
---
a/tests/phpunit/CrossCheck/ComparativeValueParser/BasicComparativeValueParserTest.php
+++
b/tests/phpunit/CrossCheck/ComparativeValueParser/BasicComparativeValueParserTest.php
@@ -81,9 +81,9 @@
-getMock();
$valueParserFactory-expects( $this-any() )
-method( 'newParser' )
- -willReturnCallback( function( $parserId,
$parserOptions ) use ( $parserFoo, $parserBar ) {
+ -will( $this-returnCallback( function( $parserId,
$parserOptions ) use ( $parserFoo, $parserBar ) {
return $parserId === 'foo' ? $parserFoo :
$parserBar;
- } );
+ } ) );
return new BasicComparativeValueParser(
diff --git
a/tests/phpunit/CrossCheck/ComparativeValueParser/ComparativeMultilingualTextValueParserTest.php
b/tests/phpunit/CrossCheck/ComparativeValueParser/ComparativeMultilingualTextValueParserTest.php
index c19c62e..9b95e81 100644
---
a/tests/phpunit/CrossCheck/ComparativeValueParser/ComparativeMultilingualTextValueParserTest.php
+++
b/tests/phpunit/CrossCheck/ComparativeValueParser/ComparativeMultilingualTextValueParserTest.php
@@ -65,7 +65,7 @@
-getMock();
$valueParserFactory-expects( $this-any() )
-method( 'newParser' )
- -willReturn( $this-getValueParserMock( new
MonolingualTextValue( 'en', 'foo' ) ) );
+ -will( $this-returnValue( $this-getValueParserMock(
new MonolingualTextValue( 'en', 'foo' ) ) ) );
return new ComparativeMultilingualTextValueParser(
$valueParserFactory );
diff --git
a/tests/phpunit/CrossCheck/ComparativeValueParser/ComparativeStringValueParserTest.php
b/tests/phpunit/CrossCheck/ComparativeValueParser/ComparativeStringValueParserTest.php
index b6c3669..f9f285b 100644
---
a/tests/phpunit/CrossCheck/ComparativeValueParser/ComparativeStringValueParserTest.php
+++
b/tests/phpunit/CrossCheck/ComparativeValueParser/ComparativeStringValueParserTest.php
@@ -62,7 +62,7 @@
-getMock();
$stringNormalizer-expects( $this-any() )
-method( 'trimToNFC' )
- -willReturnArgument( 0 );
+ -will( $this-returnArgument( 0 ) );
return new ComparativeStringValueParser( $stringNormalizer );
}
diff --git
a/tests/phpunit/CrossCheck/ComparativeValueParser/ComparativeValueParserTestBase.php
b/tests/phpunit/CrossCheck/ComparativeValueParser/ComparativeValueParserTestBase.php
index
[MediaWiki-commits] [Gerrit] Fixed autoloading problem for base tests. - change (mediawiki...WikibaseQualityExternalValidation)
Soeren.oldag has submitted this change and it was merged.
Change subject: Fixed autoloading problem for base tests.
..
Fixed autoloading problem for base tests.
Change-Id: Ie16e3be4315e37f35e4cedb782fa60fd90cc5a9d
---
M
tests/phpunit/CrossCheck/ComparativeValueParser/BasicComparativeValueParserTest.php
M
tests/phpunit/CrossCheck/ComparativeValueParser/ComparativeMultilingualTextValueParserTest.php
M
tests/phpunit/CrossCheck/ComparativeValueParser/ComparativeStringValueParserTest.php
R
tests/phpunit/CrossCheck/ComparativeValueParser/ComparativeValueParserTestBase.php
M
tests/phpunit/CrossCheck/ComparativeValueParser/DispatchingComparativeValueParserTest.php
R tests/phpunit/CrossCheck/Comparer/DataValueComparerTestBase.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/StringValueComparerTest.php
M tests/phpunit/CrossCheck/Comparer/TimeValueComparerTest.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/ReferenceResultSerializerTest.php
R tests/phpunit/Serializer/SerializerTestBase.php
20 files changed, 20 insertions(+), 20 deletions(-)
Approvals:
Soeren.oldag: Verified; Looks good to me, approved
diff --git
a/tests/phpunit/CrossCheck/ComparativeValueParser/BasicComparativeValueParserTest.php
b/tests/phpunit/CrossCheck/ComparativeValueParser/BasicComparativeValueParserTest.php
index 7a15ffc..f187273 100644
---
a/tests/phpunit/CrossCheck/ComparativeValueParser/BasicComparativeValueParserTest.php
+++
b/tests/phpunit/CrossCheck/ComparativeValueParser/BasicComparativeValueParserTest.php
@@ -12,7 +12,7 @@
* @author BP2014N1
* @license GNU GPL v2+
*/
-class BasicComparativeValueParserTest extends ComparativeValueParserBaseTest {
+class BasicComparativeValueParserTestBase extends
ComparativeValueParserTestBase {
public function parseableProvider() {
return array(
diff --git
a/tests/phpunit/CrossCheck/ComparativeValueParser/ComparativeMultilingualTextValueParserTest.php
b/tests/phpunit/CrossCheck/ComparativeValueParser/ComparativeMultilingualTextValueParserTest.php
index 5d3654a..c19c62e 100644
---
a/tests/phpunit/CrossCheck/ComparativeValueParser/ComparativeMultilingualTextValueParserTest.php
+++
b/tests/phpunit/CrossCheck/ComparativeValueParser/ComparativeMultilingualTextValueParserTest.php
@@ -14,7 +14,7 @@
* @author BP2014N1
* @license GNU GPL v2+
*/
-class ComparativeMultilingualTextValueParserTest extends
ComparativeValueParserBaseTest {
+class ComparativeMultilingualTextValueParserTestBase extends
ComparativeValueParserTestBase {
public function parseableProvider() {
return array(
diff --git
a/tests/phpunit/CrossCheck/ComparativeValueParser/ComparativeStringValueParserTest.php
b/tests/phpunit/CrossCheck/ComparativeValueParser/ComparativeStringValueParserTest.php
index 3b9697f..b6c3669 100644
---
a/tests/phpunit/CrossCheck/ComparativeValueParser/ComparativeStringValueParserTest.php
+++
b/tests/phpunit/CrossCheck/ComparativeValueParser/ComparativeStringValueParserTest.php
@@ -12,7 +12,7 @@
* @author BP2014N1
* @license GNU GPL v2+
*/
-class ComparativeStringValueParserTest extends ComparativeValueParserBaseTest {
+class ComparativeStringValueParserTestBase extends
ComparativeValueParserTestBase {
public function parseableProvider() {
return array(
diff --git
a/tests/phpunit/CrossCheck/ComparativeValueParser/ComparativeValueParserBaseTest.php
b/tests/phpunit/CrossCheck/ComparativeValueParser/ComparativeValueParserTestBase.php
similarity index 97%
rename from
tests/phpunit/CrossCheck/ComparativeValueParser/ComparativeValueParserBaseTest.php
rename to
tests/phpunit/CrossCheck/ComparativeValueParser/ComparativeValueParserTestBase.php
index 1881db5..f142126 100755
---
a/tests/phpunit/CrossCheck/ComparativeValueParser/ComparativeValueParserBaseTest.php
+++
b/tests/phpunit/CrossCheck/ComparativeValueParser/ComparativeValueParserTestBase.php
@@ -14,7 +14,7 @@
* @author BP2014N1
* @license GNU GPL v2+
*/
-abstract class ComparativeValueParserBaseTest extends \MediaWikiTestCase {
+abstract class ComparativeValueParserTestBase extends \MediaWikiTestCase {
/**
* @return ComparativeValueParser
diff --git
[MediaWiki-commits] [Gerrit] Fixed autoloading problem for base tests. - change (mediawiki...WikibaseQualityExternalValidation)
Soeren.oldag has submitted this change and it was merged.
Change subject: Fixed autoloading problem for base tests.
..
Fixed autoloading problem for base tests.
Change-Id: I4e8cc062adcc3cc25b9b369f8728e1d01cc62e22
---
M
tests/phpunit/CrossCheck/ComparativeValueParser/BasicComparativeValueParserTest.php
M
tests/phpunit/CrossCheck/ComparativeValueParser/ComparativeMultilingualTextValueParserTest.php
M
tests/phpunit/CrossCheck/ComparativeValueParser/ComparativeStringValueParserTest.php
R
tests/phpunit/CrossCheck/ComparativeValueParser/ComparativeValueParserTestBase.php
M
tests/phpunit/CrossCheck/ComparativeValueParser/DispatchingComparativeValueParserTest.php
R tests/phpunit/CrossCheck/Comparer/DataValueComparerTestBase.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/StringValueComparerTest.php
M tests/phpunit/CrossCheck/Comparer/TimeValueComparerTest.php
M tests/phpunit/Serializer/ComparisonResultSerializerTest.php
M tests/phpunit/Serializer/CrossCheckResultListSerializerTest.php
M tests/phpunit/Serializer/CrossCheckResultSerializerTest.php
M tests/phpunit/Serializer/DumpMetaInformationSerializerTest.php
M tests/phpunit/Serializer/ReferenceResultSerializerTest.php
R tests/phpunit/Serializer/SerializerTestBase.php
20 files changed, 20 insertions(+), 20 deletions(-)
Approvals:
Soeren.oldag: Verified; Looks good to me, approved
diff --git
a/tests/phpunit/CrossCheck/ComparativeValueParser/BasicComparativeValueParserTest.php
b/tests/phpunit/CrossCheck/ComparativeValueParser/BasicComparativeValueParserTest.php
index 7a15ffc..f187273 100644
---
a/tests/phpunit/CrossCheck/ComparativeValueParser/BasicComparativeValueParserTest.php
+++
b/tests/phpunit/CrossCheck/ComparativeValueParser/BasicComparativeValueParserTest.php
@@ -12,7 +12,7 @@
* @author BP2014N1
* @license GNU GPL v2+
*/
-class BasicComparativeValueParserTest extends ComparativeValueParserBaseTest {
+class BasicComparativeValueParserTestBase extends
ComparativeValueParserTestBase {
public function parseableProvider() {
return array(
diff --git
a/tests/phpunit/CrossCheck/ComparativeValueParser/ComparativeMultilingualTextValueParserTest.php
b/tests/phpunit/CrossCheck/ComparativeValueParser/ComparativeMultilingualTextValueParserTest.php
index 5d3654a..c19c62e 100644
---
a/tests/phpunit/CrossCheck/ComparativeValueParser/ComparativeMultilingualTextValueParserTest.php
+++
b/tests/phpunit/CrossCheck/ComparativeValueParser/ComparativeMultilingualTextValueParserTest.php
@@ -14,7 +14,7 @@
* @author BP2014N1
* @license GNU GPL v2+
*/
-class ComparativeMultilingualTextValueParserTest extends
ComparativeValueParserBaseTest {
+class ComparativeMultilingualTextValueParserTestBase extends
ComparativeValueParserTestBase {
public function parseableProvider() {
return array(
diff --git
a/tests/phpunit/CrossCheck/ComparativeValueParser/ComparativeStringValueParserTest.php
b/tests/phpunit/CrossCheck/ComparativeValueParser/ComparativeStringValueParserTest.php
index 3b9697f..b6c3669 100644
---
a/tests/phpunit/CrossCheck/ComparativeValueParser/ComparativeStringValueParserTest.php
+++
b/tests/phpunit/CrossCheck/ComparativeValueParser/ComparativeStringValueParserTest.php
@@ -12,7 +12,7 @@
* @author BP2014N1
* @license GNU GPL v2+
*/
-class ComparativeStringValueParserTest extends ComparativeValueParserBaseTest {
+class ComparativeStringValueParserTestBase extends
ComparativeValueParserTestBase {
public function parseableProvider() {
return array(
diff --git
a/tests/phpunit/CrossCheck/ComparativeValueParser/ComparativeValueParserBaseTest.php
b/tests/phpunit/CrossCheck/ComparativeValueParser/ComparativeValueParserTestBase.php
similarity index 97%
rename from
tests/phpunit/CrossCheck/ComparativeValueParser/ComparativeValueParserBaseTest.php
rename to
tests/phpunit/CrossCheck/ComparativeValueParser/ComparativeValueParserTestBase.php
index 1881db5..f142126 100755
---
a/tests/phpunit/CrossCheck/ComparativeValueParser/ComparativeValueParserBaseTest.php
+++
b/tests/phpunit/CrossCheck/ComparativeValueParser/ComparativeValueParserTestBase.php
@@ -14,7 +14,7 @@
* @author BP2014N1
* @license GNU GPL v2+
*/
-abstract class ComparativeValueParserBaseTest extends \MediaWikiTestCase {
+abstract class ComparativeValueParserTestBase extends \MediaWikiTestCase {
/**
* @return ComparativeValueParser
diff --git
[MediaWiki-commits] [Gerrit] please work - change (mediawiki...WikibaseQualityExternalValidation)
Soeren.oldag has submitted this change and it was merged.
Change subject: please work
..
please work
Change-Id: Iacba18ac5ce7145876eb5434dc87345ca50c05ba
---
M composer.json
M maintenance/UpdateTable.php
2 files changed, 2 insertions(+), 7 deletions(-)
Approvals:
Soeren.oldag: Verified; Looks good to me, approved
diff --git a/composer.json b/composer.json
index 041e4d6..b4699a6 100755
--- a/composer.json
+++ b/composer.json
@@ -21,8 +21,8 @@
wikimedia/assert: ~0.2.2
},
require-dev: {
- phpunit/phpunit: ~3.7,=3.7.37,
- satooshi/php-coveralls: dev-master
+ phpunit/phpunit: ~3.7,=3.7.37|~4.5,
+ satooshi/php-coveralls: master-dev
},
autoload: {
psr-4: {
diff --git a/maintenance/UpdateTable.php b/maintenance/UpdateTable.php
index 33f2c3d..114e8fc 100755
--- a/maintenance/UpdateTable.php
+++ b/maintenance/UpdateTable.php
@@ -8,11 +8,6 @@
use WikibaseQuality\ExternalValidation\UpdateTable\ExternalDataImporter;
-// @codeCoverageIgnoreStart
-$basePath = getenv( MW_INSTALL_PATH ) !== false ? getenv( MW_INSTALL_PATH
) : __DIR__ . /../../..;
-require_once $basePath . /maintenance/Maintenance.php;
-// @codeCoverageIgnoreEnd
-
/**
* Class UpdateTable
*
--
To view, visit https://gerrit.wikimedia.org/r/219273
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iacba18ac5ce7145876eb5434dc87345ca50c05ba
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikibaseQualityExternalValidation
Gerrit-Branch: master
Gerrit-Owner: Andreasburmeister andreas.burmeis...@student.hpi.de
Gerrit-Reviewer: Legoktm legoktm.wikipe...@gmail.com
Gerrit-Reviewer: Soeren.oldag soeren_ol...@freenet.de
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] T102649 Allow raw content for html builder, escape content b... - change (mediawiki...WikidataQuality)
Soeren.oldag has uploaded a new change for review.
https://gerrit.wikimedia.org/r/219180
Change subject: T102649 Allow raw content for html builder, escape content by
default
..
T102649 Allow raw content for html builder, escape content by default
Change-Id: I30a40b02b5fbd673468dbc0218f0263915fe20ed
---
M includes/Html/HtmlTableCellBuilder.php
M includes/Html/HtmlTableHeaderBuilder.php
2 files changed, 49 insertions(+), 11 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikidataQuality
refs/changes/80/219180/1
diff --git a/includes/Html/HtmlTableCellBuilder.php
b/includes/Html/HtmlTableCellBuilder.php
index 348451d..c840949 100755
--- a/includes/Html/HtmlTableCellBuilder.php
+++ b/includes/Html/HtmlTableCellBuilder.php
@@ -25,17 +25,31 @@
private $attributes;
/**
-* @param $content Html
-* @param array $attributes
+* Determines, whether the content is raw html or should be escaped.
+*
+* @var bool
*/
- public function __construct( $content, array $attributes = array() ) {
+ private $isRawContent;
+
+ /**
+* @param string HTML $content
+* @param array $attributes
+* @param bool $isRawContent
+*
+* @throws InvalidArgumentException
+*/
+ public function __construct( $content, array $attributes = array(),
$isRawContent = false ) {
// Check parameters
if ( !is_string( $content ) ) {
throw new InvalidArgumentException( '$content must be
string.' );
}
+ if ( !is_bool( $isRawContent ) ) {
+ throw new InvalidArgumentException( '$isRawContent must
be boolean.' );
+ }
$this-content = $content;
$this-attributes = $attributes;
+ $this-isRawContent = $isRawContent;
}
/**
@@ -58,12 +72,17 @@
* @return string HTML
*/
public function toHtml() {
+ $content = $this-content;
+ if ( !$this-isRawContent ) {
+ $content = htmlspecialchars( $this-content );
+ }
+
return
Html::openElement(
'td',
$this-getAttributes()
)
- . $this-content
+ . $content
. Html::closeElement( 'td' );
}
-}
\ No newline at end of file
+}
diff --git a/includes/Html/HtmlTableHeaderBuilder.php
b/includes/Html/HtmlTableHeaderBuilder.php
index 10a004b..6814278 100755
--- a/includes/Html/HtmlTableHeaderBuilder.php
+++ b/includes/Html/HtmlTableHeaderBuilder.php
@@ -27,19 +27,33 @@
private $isSortable;
/**
-* @param string $content HTML
-* @param bool $isSortable
+* Determines, whether the content is raw html or should be escaped.
+*
+* @var bool
*/
- public function __construct( $content, $isSortable = false ) {
+ private $isRawContent;
+
+ /**
+* @param string HTML $content
+* @param bool $isSortable
+* @param bool $isRawContent
+*
+* @throws InvalidArgumentException
+*/
+ public function __construct( $content, $isSortable = false,
$isRawContent = false ) {
if ( !is_string( $content ) ) {
throw new InvalidArgumentException( '$content must be
string.' );
}
if ( !is_bool( $isSortable ) ) {
throw new InvalidArgumentException( '$isSortable must
be boolean.' );
}
+ if ( !is_bool( $isRawContent ) ) {
+ throw new InvalidArgumentException( '$isRawContent must
be boolean.' );
+ }
$this-content = $content;
$this-isSortable = $isSortable;
+ $this-isRawContent = $isRawContent;
}
/**
@@ -69,12 +83,17 @@
$attributes['class'] = 'unsortable';
}
+ $content = $this-content;
+ if ( !$this-isRawContent ) {
+ $content = htmlspecialchars( $this-content );
+ }
+
return
Html::openElement(
'th',
$attributes
)
- . $this-content
- . Html::closeElement( 'th' );
+ . $content
+ . Html::closeElement('th');
}
-}
\ No newline at end of file
+}
--
To view, visit https://gerrit.wikimedia.org/r/219180
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType:
[MediaWiki-commits] [Gerrit] T102649 Allow raw content for html builder, escape content b... - change (mediawiki...WikidataQuality)
Soeren.oldag has submitted this change and it was merged.
Change subject: T102649 Allow raw content for html builder, escape content by
default
..
T102649 Allow raw content for html builder, escape content by default
Change-Id: I30a40b02b5fbd673468dbc0218f0263915fe20ed
---
M includes/Html/HtmlTableCellBuilder.php
M includes/Html/HtmlTableHeaderBuilder.php
2 files changed, 49 insertions(+), 11 deletions(-)
Approvals:
Soeren.oldag: Verified; Looks good to me, approved
diff --git a/includes/Html/HtmlTableCellBuilder.php
b/includes/Html/HtmlTableCellBuilder.php
index 348451d..c840949 100755
--- a/includes/Html/HtmlTableCellBuilder.php
+++ b/includes/Html/HtmlTableCellBuilder.php
@@ -25,17 +25,31 @@
private $attributes;
/**
-* @param $content Html
-* @param array $attributes
+* Determines, whether the content is raw html or should be escaped.
+*
+* @var bool
*/
- public function __construct( $content, array $attributes = array() ) {
+ private $isRawContent;
+
+ /**
+* @param string HTML $content
+* @param array $attributes
+* @param bool $isRawContent
+*
+* @throws InvalidArgumentException
+*/
+ public function __construct( $content, array $attributes = array(),
$isRawContent = false ) {
// Check parameters
if ( !is_string( $content ) ) {
throw new InvalidArgumentException( '$content must be
string.' );
}
+ if ( !is_bool( $isRawContent ) ) {
+ throw new InvalidArgumentException( '$isRawContent must
be boolean.' );
+ }
$this-content = $content;
$this-attributes = $attributes;
+ $this-isRawContent = $isRawContent;
}
/**
@@ -58,12 +72,17 @@
* @return string HTML
*/
public function toHtml() {
+ $content = $this-content;
+ if ( !$this-isRawContent ) {
+ $content = htmlspecialchars( $this-content );
+ }
+
return
Html::openElement(
'td',
$this-getAttributes()
)
- . $this-content
+ . $content
. Html::closeElement( 'td' );
}
-}
\ No newline at end of file
+}
diff --git a/includes/Html/HtmlTableHeaderBuilder.php
b/includes/Html/HtmlTableHeaderBuilder.php
index 10a004b..6814278 100755
--- a/includes/Html/HtmlTableHeaderBuilder.php
+++ b/includes/Html/HtmlTableHeaderBuilder.php
@@ -27,19 +27,33 @@
private $isSortable;
/**
-* @param string $content HTML
-* @param bool $isSortable
+* Determines, whether the content is raw html or should be escaped.
+*
+* @var bool
*/
- public function __construct( $content, $isSortable = false ) {
+ private $isRawContent;
+
+ /**
+* @param string HTML $content
+* @param bool $isSortable
+* @param bool $isRawContent
+*
+* @throws InvalidArgumentException
+*/
+ public function __construct( $content, $isSortable = false,
$isRawContent = false ) {
if ( !is_string( $content ) ) {
throw new InvalidArgumentException( '$content must be
string.' );
}
if ( !is_bool( $isSortable ) ) {
throw new InvalidArgumentException( '$isSortable must
be boolean.' );
}
+ if ( !is_bool( $isRawContent ) ) {
+ throw new InvalidArgumentException( '$isRawContent must
be boolean.' );
+ }
$this-content = $content;
$this-isSortable = $isSortable;
+ $this-isRawContent = $isRawContent;
}
/**
@@ -69,12 +83,17 @@
$attributes['class'] = 'unsortable';
}
+ $content = $this-content;
+ if ( !$this-isRawContent ) {
+ $content = htmlspecialchars( $this-content );
+ }
+
return
Html::openElement(
'th',
$attributes
)
- . $this-content
- . Html::closeElement( 'th' );
+ . $content
+ . Html::closeElement('th');
}
-}
\ No newline at end of file
+}
--
To view, visit https://gerrit.wikimedia.org/r/219180
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I30a40b02b5fbd673468dbc0218f0263915fe20ed
[MediaWiki-commits] [Gerrit] T102649 Allow raw content for html builder, escape content b... - change (mediawiki...WikidataQuality)
Soeren.oldag has submitted this change and it was merged.
Change subject: T102649 Allow raw content for html builder, escape content by
default
..
T102649 Allow raw content for html builder, escape content by default
Change-Id: I30a40b02b5fbd673468dbc0218f0263915fe20ed
---
M includes/Html/HtmlTableCellBuilder.php
M includes/Html/HtmlTableHeaderBuilder.php
2 files changed, 49 insertions(+), 11 deletions(-)
Approvals:
Soeren.oldag: Verified; Looks good to me, approved
diff --git a/includes/Html/HtmlTableCellBuilder.php
b/includes/Html/HtmlTableCellBuilder.php
index 348451d..c840949 100755
--- a/includes/Html/HtmlTableCellBuilder.php
+++ b/includes/Html/HtmlTableCellBuilder.php
@@ -25,17 +25,31 @@
private $attributes;
/**
-* @param $content Html
-* @param array $attributes
+* Determines, whether the content is raw html or should be escaped.
+*
+* @var bool
*/
- public function __construct( $content, array $attributes = array() ) {
+ private $isRawContent;
+
+ /**
+* @param string HTML $content
+* @param array $attributes
+* @param bool $isRawContent
+*
+* @throws InvalidArgumentException
+*/
+ public function __construct( $content, array $attributes = array(),
$isRawContent = false ) {
// Check parameters
if ( !is_string( $content ) ) {
throw new InvalidArgumentException( '$content must be
string.' );
}
+ if ( !is_bool( $isRawContent ) ) {
+ throw new InvalidArgumentException( '$isRawContent must
be boolean.' );
+ }
$this-content = $content;
$this-attributes = $attributes;
+ $this-isRawContent = $isRawContent;
}
/**
@@ -58,12 +72,17 @@
* @return string HTML
*/
public function toHtml() {
+ $content = $this-content;
+ if ( !$this-isRawContent ) {
+ $content = htmlspecialchars( $this-content );
+ }
+
return
Html::openElement(
'td',
$this-getAttributes()
)
- . $this-content
+ . $content
. Html::closeElement( 'td' );
}
-}
\ No newline at end of file
+}
diff --git a/includes/Html/HtmlTableHeaderBuilder.php
b/includes/Html/HtmlTableHeaderBuilder.php
index 10a004b..6814278 100755
--- a/includes/Html/HtmlTableHeaderBuilder.php
+++ b/includes/Html/HtmlTableHeaderBuilder.php
@@ -27,19 +27,33 @@
private $isSortable;
/**
-* @param string $content HTML
-* @param bool $isSortable
+* Determines, whether the content is raw html or should be escaped.
+*
+* @var bool
*/
- public function __construct( $content, $isSortable = false ) {
+ private $isRawContent;
+
+ /**
+* @param string HTML $content
+* @param bool $isSortable
+* @param bool $isRawContent
+*
+* @throws InvalidArgumentException
+*/
+ public function __construct( $content, $isSortable = false,
$isRawContent = false ) {
if ( !is_string( $content ) ) {
throw new InvalidArgumentException( '$content must be
string.' );
}
if ( !is_bool( $isSortable ) ) {
throw new InvalidArgumentException( '$isSortable must
be boolean.' );
}
+ if ( !is_bool( $isRawContent ) ) {
+ throw new InvalidArgumentException( '$isRawContent must
be boolean.' );
+ }
$this-content = $content;
$this-isSortable = $isSortable;
+ $this-isRawContent = $isRawContent;
}
/**
@@ -69,12 +83,17 @@
$attributes['class'] = 'unsortable';
}
+ $content = $this-content;
+ if ( !$this-isRawContent ) {
+ $content = htmlspecialchars( $this-content );
+ }
+
return
Html::openElement(
'th',
$attributes
)
- . $this-content
- . Html::closeElement( 'th' );
+ . $content
+ . Html::closeElement('th');
}
-}
\ No newline at end of file
+}
--
To view, visit https://gerrit.wikimedia.org/r/219174
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I30a40b02b5fbd673468dbc0218f0263915fe20ed
[MediaWiki-commits] [Gerrit] Added overwrite switch for SqlViolationRepo. - change (mediawiki...WikidataQuality)
Soeren.oldag has uploaded a new change for review.
https://gerrit.wikimedia.org/r/219178
Change subject: Added overwrite switch for SqlViolationRepo.
..
Added overwrite switch for SqlViolationRepo.
Change-Id: I404db9ce415649c0b52bc2be5b52b018935f7b91
---
M includes/Violations/SqlViolationRepo.php
M includes/Violations/ViolationStore.php
2 files changed, 7 insertions(+), 2 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikidataQuality
refs/changes/78/219178/1
diff --git a/includes/Violations/SqlViolationRepo.php
b/includes/Violations/SqlViolationRepo.php
index 54f6e35..40d5181 100755
--- a/includes/Violations/SqlViolationRepo.php
+++ b/includes/Violations/SqlViolationRepo.php
@@ -106,12 +106,16 @@
/**
* @param Violation $violation
+* @param bool $overwriteExisting
* @return bool
*/
- public function insert( Violation $violation ) {
+ public function insert( Violation $violation, $overwriteExisting =
false ) {
$db = wfGetDB( DB_MASTER );
if( $this-violationExists( $db, $violation ) ) {
+ if( $overwriteExisting ) {
+ return $this-update( $violation, false );
+ }
throw new InvalidArgumentException( 'Given violation
already exists in database.' );
}
diff --git a/includes/Violations/ViolationStore.php
b/includes/Violations/ViolationStore.php
index 8893cd5..0c586e8 100644
--- a/includes/Violations/ViolationStore.php
+++ b/includes/Violations/ViolationStore.php
@@ -15,9 +15,10 @@
* Inserts given violation into database.
*
* @param Violation $violation
+* @param bool $overwriteExisting
* @return mixed
*/
- public function insert( Violation $violation );
+ public function insert( Violation $violation, $overwriteExisting =
false );
/**
* Updates given violation in database.
--
To view, visit https://gerrit.wikimedia.org/r/219178
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I404db9ce415649c0b52bc2be5b52b018935f7b91
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikidataQuality
Gerrit-Branch: master
Gerrit-Owner: Soeren.oldag soeren_ol...@freenet.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Added Wikimedia/Assert dependency. - change (mediawiki...WikibaseQuality)
Soeren.oldag has uploaded a new change for review.
https://gerrit.wikimedia.org/r/219207
Change subject: Added Wikimedia/Assert dependency.
..
Added Wikimedia/Assert dependency.
Change-Id: I5dc4a9ea121278adb603106e3cde63410bba997c
---
M composer.json
1 file changed, 2 insertions(+), 1 deletion(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikibaseQuality
refs/changes/07/219207/1
diff --git a/composer.json b/composer.json
index c1b91e2..a18 100755
--- a/composer.json
+++ b/composer.json
@@ -16,7 +16,8 @@
require: {
php: =5.3.0,
wikibase/data-model: ~3.0,
- serialization/serialization: 3.*,=3.2.1
+ serialization/serialization: 3.*,=3.2.1,
+ wikimedia/assert: ~0.2.2
},
require-dev: {
phpunit/phpunit: ~3.7,=3.7.37|~4.5,
--
To view, visit https://gerrit.wikimedia.org/r/219207
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5dc4a9ea121278adb603106e3cde63410bba997c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikibaseQuality
Gerrit-Branch: master
Gerrit-Owner: Soeren.oldag soeren_ol...@freenet.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Minor fixes regarding daniels review. - change (mediawiki...WikibaseQualityExternalValidation)
Soeren.oldag has uploaded a new change for review.
https://gerrit.wikimedia.org/r/219223
Change subject: Minor fixes regarding daniels review.
..
Minor fixes regarding daniels review.
Change-Id: I6e3ebe30061fa8cce849c9f7b6a2d8daf510b02e
---
M includes/CrossCheck/CrossChecker.php
M specials/SpecialCrossCheck.php
M tests/phpunit/Specials/SpecialCrossCheckTest.php
3 files changed, 352 insertions(+), 335 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikibaseQualityExternalValidation
refs/changes/23/219223/1
diff --git a/includes/CrossCheck/CrossChecker.php
b/includes/CrossCheck/CrossChecker.php
index cd1ce3f..4daa541 100755
--- a/includes/CrossCheck/CrossChecker.php
+++ b/includes/CrossCheck/CrossChecker.php
@@ -74,11 +74,12 @@
* @param ExternalDataRepo $externalDataRepo
*/
public function __construct( EntityLookup $entityLookup,
-
ComparativeValueParser $comparativeValueParser,
-
DataValueComparer $dataValueComparer,
-
ReferenceChecker $referenceHandler,
-
DumpMetaInformationLookup $dumpMetaInformationLookup,
-
ExternalDataRepo $externalDataRepo ) {
+ ComparativeValueParser $comparativeValueParser,
+ DataValueComparer $dataValueComparer,
+ ReferenceChecker $referenceHandler,
+ DumpMetaInformationLookup $dumpMetaInformationLookup,
+ ExternalDataRepo $externalDataRepo
+ ) {
$this-entityLookup = $entityLookup;
$this-comparativeValueParser = $comparativeValueParser;
$this-dataValueComparer = $dataValueComparer;
diff --git a/specials/SpecialCrossCheck.php b/specials/SpecialCrossCheck.php
index f71c3a7..308e5bf 100755
--- a/specials/SpecialCrossCheck.php
+++ b/specials/SpecialCrossCheck.php
@@ -36,6 +36,7 @@
use WikibaseQuality\ExternalValidation\ExternalValidationServices;
use
WikibaseQuality\ExternalValidation\Violations\CrossCheckResultToViolationTranslator;
use WikibaseQuality\Html\HtmlTableBuilder;
+use WikibaseQuality\Html\HtmlTableCellBuilder;
use WikibaseQuality\Html\HtmlTableHeaderBuilder;
use WikibaseQuality\Violations\ViolationStore;
use WikibaseQuality\WikibaseQualityFactory;
@@ -157,7 +158,7 @@
/**
* @see SpecialPage::getDescription
*
-* @return string
+* @return string (plain text)
*/
public function getDescription() {
return $this-msg( 'wbqev-crosscheck' )-text();
@@ -262,11 +263,11 @@
'div',
array( 'class' = 'wbqev-infobox' )
)
- . $this-msg( 'wbqev-crosscheck-explanation-general'
)-escaped()
+ . $this-msg( 'wbqev-crosscheck-explanation-general'
)-parse()
. sprintf( ' %s.', $externalDbLink )
. Html::element( 'br' )
. Html::element( 'br' )
- . $this-msg( 'wbqev-crosscheck-explanation-detail'
)-escaped()
+ . $this-msg( 'wbqev-crosscheck-explanation-detail'
)-parse()
. Html::closeElement( 'div' );
return $infoBox;
@@ -275,14 +276,14 @@
/**
* Builds notice with given message. Optionally notice can be handles
as error by settings $error to true
*
-* @param string $message
+* @param string $messageKey
* @param bool $error
*
* @throws InvalidArgumentException
*
* @return string HTML
*/
- private function buildNotice( $message, $error = false ) {
+ private function buildNotice( $messageKey, $error = false ) {
$cssClasses = 'wbqev-crosscheck-notice';
if ( $error ) {
$cssClasses .= ' wbqev-crosscheck-notice-error';
@@ -294,7 +295,7 @@
array (
'class' = $cssClasses
),
- $this-msg( $message )-text()
+ $this-msg( $messageKey )-text()
);
}
@@ -356,22 +357,22 @@
/**
* Formats given status to html
*
-* @param string $status
+* @param string $status (plain text)
*
* @throws InvalidArgumentException
*
* @return string HTML
*/
private function formatStatus( $status ) {
- $messageName = wbqev-crosscheck-status- .
[MediaWiki-commits] [Gerrit] Implemented further hints from review from Daniel. - change (mediawiki...WikibaseQualityExternalValidation)
Soeren.oldag has submitted this change and it was merged. Change subject: Implemented further hints from review from Daniel. .. Implemented further hints from review from Daniel. Change-Id: I6e3ebe30061fa8cce849c9f7b6a2d8daf510b02e Conflicts: includes/CrossCheck/CrossChecker.php specials/SpecialCrossCheck.php tests/phpunit/Specials/SpecialCrossCheckTest.php (+1 squashed commit) Squashed commits: [6437ec0] Implemented further hints from review from Daniel. (Cherry Pick) Change-Id: I16d712949101aaa6ff7a770466317aa4ef0157d5 --- M WikibaseQualityExternalValidation.php M WikibaseQualityExternalValidationHooks.php R api/RunCrossCheck.php M composer.json M i18n/en.json M i18n/qqq.json D includes/ApiModuleFactory.php A includes/CrossCheck/ComparativeValueParser/BasicComparativeValueParser.php A includes/CrossCheck/ComparativeValueParser/ComparativeGlobeCoordinateParser.php A includes/CrossCheck/ComparativeValueParser/ComparativeMonolingualTextParser.php A includes/CrossCheck/ComparativeValueParser/ComparativeMultilingualTextValueParser.php A includes/CrossCheck/ComparativeValueParser/ComparativeQuantityParser.php A includes/CrossCheck/ComparativeValueParser/ComparativeStringParser.php A includes/CrossCheck/ComparativeValueParser/ComparativeStringValueParser.php A includes/CrossCheck/ComparativeValueParser/ComparativeTimeParser.php A includes/CrossCheck/ComparativeValueParser/ComparativeValueParser.php A includes/CrossCheck/ComparativeValueParser/ComparativeValueParserFactory.php A includes/CrossCheck/ComparativeValueParser/DispatchingComparativeValueParser.php M includes/CrossCheck/Comparer/DataValueComparer.php D 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 R includes/CrossCheck/ReferenceChecker.php R includes/CrossCheck/Result/ComparisonResult.php M includes/CrossCheck/Result/CrossCheckResult.php M includes/CrossCheck/Result/CrossCheckResultList.php M includes/CrossCheck/Result/ReferenceResult.php M includes/DumpMetaInformation/DumpMetaInformation.php A includes/DumpMetaInformation/DumpMetaInformationLookup.php D includes/DumpMetaInformation/DumpMetaInformationRepo.php A includes/DumpMetaInformation/DumpMetaInformationStore.php A includes/DumpMetaInformation/SqlDumpMetaInformationRepo.php M includes/EvaluateCrossCheckJob.php M includes/EvaluateCrossCheckJobService.php M includes/ExternalDataRepo.php D includes/ExternalValidationFactory.php A includes/ExternalValidationServices.php R includes/Serializer/ComparisonResultSerializer.php M includes/Serializer/CrossCheckResultSerializer.php M includes/Serializer/DumpMetaInformationSerializer.php M includes/Serializer/SerializerFactory.php D includes/SpecialPageFactory.php A includes/UpdateTable/ExternalDataImporter.php D includes/UpdateTable/Importer.php R includes/UpdateTable/TarImportSettings.php M maintenance/UpdateTable.php M specials/SpecialCrossCheck.php M specials/SpecialExternalDbs.php M sql/create_wbqev_dump_information.sql R tests/phpunit/Api/RunCrossCheckTest.php D tests/phpunit/ApiModuleFactoryTest.php A tests/phpunit/CrossCheck/ComparativeValueParser/BasicComparativeValueParserTest.php A tests/phpunit/CrossCheck/ComparativeValueParser/ComparativeMultilingualTextValueParserTest.php A tests/phpunit/CrossCheck/ComparativeValueParser/ComparativeStringValueParserTest.php A tests/phpunit/CrossCheck/ComparativeValueParser/ComparativeValueParserBaseTest.php A tests/phpunit/CrossCheck/ComparativeValueParser/ComparativeValueParserFactoryTest.php A tests/phpunit/CrossCheck/ComparativeValueParser/DispatchingComparativeValueParserTest.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
[MediaWiki-commits] [Gerrit] Minor fixes regarding daniels review. - change (mediawiki...WikibaseQualityExternalValidation)
Soeren.oldag has submitted this change and it was merged.
Change subject: Minor fixes regarding daniels review.
..
Minor fixes regarding daniels review.
Change-Id: I6e3ebe30061fa8cce849c9f7b6a2d8daf510b02e
---
M includes/CrossCheck/CrossChecker.php
M specials/SpecialCrossCheck.php
M tests/phpunit/Specials/SpecialCrossCheckTest.php
3 files changed, 352 insertions(+), 335 deletions(-)
Approvals:
Soeren.oldag: Verified; Looks good to me, approved
diff --git a/includes/CrossCheck/CrossChecker.php
b/includes/CrossCheck/CrossChecker.php
index cd1ce3f..4daa541 100755
--- a/includes/CrossCheck/CrossChecker.php
+++ b/includes/CrossCheck/CrossChecker.php
@@ -74,11 +74,12 @@
* @param ExternalDataRepo $externalDataRepo
*/
public function __construct( EntityLookup $entityLookup,
-
ComparativeValueParser $comparativeValueParser,
-
DataValueComparer $dataValueComparer,
-
ReferenceChecker $referenceHandler,
-
DumpMetaInformationLookup $dumpMetaInformationLookup,
-
ExternalDataRepo $externalDataRepo ) {
+ ComparativeValueParser $comparativeValueParser,
+ DataValueComparer $dataValueComparer,
+ ReferenceChecker $referenceHandler,
+ DumpMetaInformationLookup $dumpMetaInformationLookup,
+ ExternalDataRepo $externalDataRepo
+ ) {
$this-entityLookup = $entityLookup;
$this-comparativeValueParser = $comparativeValueParser;
$this-dataValueComparer = $dataValueComparer;
diff --git a/specials/SpecialCrossCheck.php b/specials/SpecialCrossCheck.php
index f71c3a7..308e5bf 100755
--- a/specials/SpecialCrossCheck.php
+++ b/specials/SpecialCrossCheck.php
@@ -36,6 +36,7 @@
use WikibaseQuality\ExternalValidation\ExternalValidationServices;
use
WikibaseQuality\ExternalValidation\Violations\CrossCheckResultToViolationTranslator;
use WikibaseQuality\Html\HtmlTableBuilder;
+use WikibaseQuality\Html\HtmlTableCellBuilder;
use WikibaseQuality\Html\HtmlTableHeaderBuilder;
use WikibaseQuality\Violations\ViolationStore;
use WikibaseQuality\WikibaseQualityFactory;
@@ -157,7 +158,7 @@
/**
* @see SpecialPage::getDescription
*
-* @return string
+* @return string (plain text)
*/
public function getDescription() {
return $this-msg( 'wbqev-crosscheck' )-text();
@@ -262,11 +263,11 @@
'div',
array( 'class' = 'wbqev-infobox' )
)
- . $this-msg( 'wbqev-crosscheck-explanation-general'
)-escaped()
+ . $this-msg( 'wbqev-crosscheck-explanation-general'
)-parse()
. sprintf( ' %s.', $externalDbLink )
. Html::element( 'br' )
. Html::element( 'br' )
- . $this-msg( 'wbqev-crosscheck-explanation-detail'
)-escaped()
+ . $this-msg( 'wbqev-crosscheck-explanation-detail'
)-parse()
. Html::closeElement( 'div' );
return $infoBox;
@@ -275,14 +276,14 @@
/**
* Builds notice with given message. Optionally notice can be handles
as error by settings $error to true
*
-* @param string $message
+* @param string $messageKey
* @param bool $error
*
* @throws InvalidArgumentException
*
* @return string HTML
*/
- private function buildNotice( $message, $error = false ) {
+ private function buildNotice( $messageKey, $error = false ) {
$cssClasses = 'wbqev-crosscheck-notice';
if ( $error ) {
$cssClasses .= ' wbqev-crosscheck-notice-error';
@@ -294,7 +295,7 @@
array (
'class' = $cssClasses
),
- $this-msg( $message )-text()
+ $this-msg( $messageKey )-text()
);
}
@@ -356,22 +357,22 @@
/**
* Formats given status to html
*
-* @param string $status
+* @param string $status (plain text)
*
* @throws InvalidArgumentException
*
* @return string HTML
*/
private function formatStatus( $status ) {
- $messageName = wbqev-crosscheck-status- . strtolower( $status
);
+ $messageKey = wbqev-crosscheck-status- . strtolower(
[MediaWiki-commits] [Gerrit] Adopted table on special page to solve escaping issue. - change (mediawiki...WikibaseQualityConstraints)
Soeren.oldag has uploaded a new change for review. https://gerrit.wikimedia.org/r/219256 Change subject: Adopted table on special page to solve escaping issue. .. Adopted table on special page to solve escaping issue. Change-Id: I4a5dd56aa0bfd908016ea71cd0fbd6a34a2ad833 --- M specials/SpecialConstraintReport.php 1 file changed, 16 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikibaseQualityConstraints refs/changes/56/219256/1 diff --git a/specials/SpecialConstraintReport.php b/specials/SpecialConstraintReport.php index 15f7c1c..5b6f01a 100644 --- a/specials/SpecialConstraintReport.php +++ b/specials/SpecialConstraintReport.php @@ -36,6 +36,7 @@ use WikibaseQuality\ConstraintReport\EvaluateConstraintReportJobService; use WikibaseQuality\ConstraintReport\Violations\CheckResultToViolationTranslator; use WikibaseQuality\Html\HtmlTableBuilder; +use WikibaseQuality\Html\HtmlTableCellBuilder; use WikibaseQuality\Html\HtmlTableHeaderBuilder; use WikibaseQuality\Violations\ViolationStore; @@ -382,9 +383,21 @@ // Append cells $table-appendRow( array ( - $statusColumn, - $claimColumn, - $constraintColumn + new HtmlTableCellBuilder( + $statusColumn, + array(), + true + ), + new HtmlTableCellBuilder( + $claimColumn, + array(), + true + ), + new HtmlTableCellBuilder( + $constraintColumn, + array(), + true + ) ) ); } -- To view, visit https://gerrit.wikimedia.org/r/219256 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4a5dd56aa0bfd908016ea71cd0fbd6a34a2ad833 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/WikibaseQualityConstraints Gerrit-Branch: master Gerrit-Owner: Soeren.oldag soeren_ol...@freenet.de ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Refactored special page dependency injection. Adopted table ... - change (mediawiki...WikibaseQualityConstraints)
Soeren.oldag has uploaded a new change for review.
https://gerrit.wikimedia.org/r/219260
Change subject: Refactored special page dependency injection. Adopted table on
special page to solve escaping issue.
..
Refactored special page dependency injection. Adopted table on special page to
solve escaping issue.
Change-Id: I3a739d454005c23d0ee5f137d3e3bb8d54d26db0
---
M WikibaseQualityConstraints.php
D includes/SpecialPageFactory.php
M specials/SpecialConstraintReport.php
D tests/phpunit/SpecialPageFactoryTest.php
4 files changed, 33 insertions(+), 170 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikibaseQualityConstraints
refs/changes/60/219260/1
diff --git a/WikibaseQualityConstraints.php b/WikibaseQualityConstraints.php
index 6a64371..a4338d7 100755
--- a/WikibaseQualityConstraints.php
+++ b/WikibaseQualityConstraints.php
@@ -26,7 +26,7 @@
$GLOBALS['wgHooks']['UnitTestsList'][] =
'WikibaseQualityConstraintsHooks::onUnitTestsList';
// Initialize special pages
- $GLOBALS['wgSpecialPages']['ConstraintReport'] = array(
'WikibaseQuality\ConstraintReport\SpecialPageFactory',
'newSpecialConstraintReport' );
+ $GLOBALS['wgSpecialPages']['ConstraintReport'] =
'WikibaseQuality\ConstraintReport\Specials\SpecialConstraintReport::newFromGlobalState';
// Define modules
$remoteExtPathParts = explode(
diff --git a/includes/SpecialPageFactory.php b/includes/SpecialPageFactory.php
deleted file mode 100644
index b81b12f..000
--- a/includes/SpecialPageFactory.php
+++ /dev/null
@@ -1,108 +0,0 @@
-?php
-
-namespace WikibaseQuality\ConstraintReport;
-
-use Wikibase\DataModel\Entity\EntityIdParser;
-use Wikibase\Lib\OutputFormatValueFormatterFactory;
-use Wikibase\Lib\Store\EntityLookup;
-use Wikibase\Lib\Store\EntityTitleLookup;
-use Wikibase\Lib\Store\TermLookup;
-use Wikibase\Repo\WikibaseRepo;
-use
WikibaseQuality\ConstraintReport\ConstraintCheck\DelegatingConstraintChecker;
-use WikibaseQuality\ConstraintReport\Specials\SpecialConstraintReport;
-use WikibaseQuality\ExternalValidation\Specials\SpecialCrossCheck;
-
-
-/**
- * Class SpecialPageFactory
- * @package WikibaseQuality\ConstraintReport
- * @author BP2014N1
- * @license GNU GPL v2+
- */
-class SpecialPageFactory {
-
- /**
-* @var EntityLookup
-*/
- private $entityLookup;
-
- /**
-* @var EntityTitleLookup
-*/
- private $entityTitleLookup;
-
- /**
-* @var TermLookup
-*/
- private $termLookup;
-
- /**
-* @var EntityIdParser
-*/
- private $entityIdParser;
-
- /**
-* @var OutputFormatValueFormatterFactory
-*/
- private $valueFormatterFactory;
-
- /**
-* @var DelegatingConstraintChecker
-*/
- private $constraintChecker;
-
-
- private static function newFromGlobalState() {
- $constraintReportFactory =
ConstraintReportFactory::getDefaultInstance();
- $wikibaseRepo = WikibaseRepo::getDefaultInstance();
-
- return new self(
- $wikibaseRepo-getEntityLookup(),
- $wikibaseRepo-getTermLookup(),
- $wikibaseRepo-getEntityTitleLookup(),
- $wikibaseRepo-getEntityIdParser(),
- $wikibaseRepo-getValueFormatterFactory(),
- $constraintReportFactory-getConstraintChecker()
- );
- }
-
- /**
-* @return SpecialCrossCheck
-*/
- public static function newSpecialConstraintReport() {
- return
self::newFromGlobalState()-createSpecialConstraintReport();
- }
-
- /**
-* @param EntityLookup $entityLookup
-* @param TermLookup $termLookup
-* @param EntityTitleLookup $entityTitleLookup
-* @param EntityIdParser $entityIdParser
-* @param OutputFormatValueFormatterFactory $valueFormatterFactory
-* @param DelegatingConstraintChecker $constraintChecker
-*/
- public function __construct( EntityLookup $entityLookup, TermLookup
$termLookup, EntityTitleLookup $entityTitleLookup,
-EntityIdParser
$entityIdParser, OutputFormatValueFormatterFactory $valueFormatterFactory,
-
DelegatingConstraintChecker $constraintChecker ) {
- $this-entityLookup = $entityLookup;
- $this-termLookup = $termLookup;
- $this-entityTitleLookup = $entityTitleLookup;
- $this-entityIdParser = $entityIdParser;
- $this-valueFormatterFactory = $valueFormatterFactory;
- $this-constraintChecker = $constraintChecker;
- }
-
- /**
-* @return SpecialCrossCheck
-*/
-
[MediaWiki-commits] [Gerrit] Implemented further hints from review from Daniel. - change (mediawiki...WikibaseQualityExternalValidation)
Soeren.oldag has uploaded a new change for review. https://gerrit.wikimedia.org/r/219243 Change subject: Implemented further hints from review from Daniel. .. Implemented further hints from review from Daniel. Change-Id: I6e3ebe30061fa8cce849c9f7b6a2d8daf510b02e Conflicts: includes/CrossCheck/CrossChecker.php specials/SpecialCrossCheck.php tests/phpunit/Specials/SpecialCrossCheckTest.php (+1 squashed commit) Squashed commits: [6437ec0] Implemented further hints from review from Daniel. (Cherry Pick) Change-Id: I16d712949101aaa6ff7a770466317aa4ef0157d5 --- M WikibaseQualityExternalValidation.php M WikibaseQualityExternalValidationHooks.php R api/RunCrossCheck.php M composer.json M i18n/en.json M i18n/qqq.json D includes/ApiModuleFactory.php A includes/CrossCheck/ComparativeValueParser/BasicComparativeValueParser.php A includes/CrossCheck/ComparativeValueParser/ComparativeGlobeCoordinateParser.php A includes/CrossCheck/ComparativeValueParser/ComparativeMonolingualTextParser.php A includes/CrossCheck/ComparativeValueParser/ComparativeMultilingualTextValueParser.php A includes/CrossCheck/ComparativeValueParser/ComparativeQuantityParser.php A includes/CrossCheck/ComparativeValueParser/ComparativeStringParser.php A includes/CrossCheck/ComparativeValueParser/ComparativeStringValueParser.php A includes/CrossCheck/ComparativeValueParser/ComparativeTimeParser.php A includes/CrossCheck/ComparativeValueParser/ComparativeValueParser.php A includes/CrossCheck/ComparativeValueParser/ComparativeValueParserFactory.php A includes/CrossCheck/ComparativeValueParser/DispatchingComparativeValueParser.php M includes/CrossCheck/Comparer/DataValueComparer.php D 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 R includes/CrossCheck/ReferenceChecker.php R includes/CrossCheck/Result/ComparisonResult.php M includes/CrossCheck/Result/CrossCheckResult.php M includes/CrossCheck/Result/CrossCheckResultList.php M includes/CrossCheck/Result/ReferenceResult.php M includes/DumpMetaInformation/DumpMetaInformation.php A includes/DumpMetaInformation/DumpMetaInformationLookup.php D includes/DumpMetaInformation/DumpMetaInformationRepo.php A includes/DumpMetaInformation/DumpMetaInformationStore.php A includes/DumpMetaInformation/SqlDumpMetaInformationRepo.php M includes/EvaluateCrossCheckJob.php M includes/EvaluateCrossCheckJobService.php M includes/ExternalDataRepo.php D includes/ExternalValidationFactory.php A includes/ExternalValidationServices.php R includes/Serializer/ComparisonResultSerializer.php M includes/Serializer/CrossCheckResultSerializer.php M includes/Serializer/DumpMetaInformationSerializer.php M includes/Serializer/SerializerFactory.php D includes/SpecialPageFactory.php A includes/UpdateTable/ExternalDataImporter.php D includes/UpdateTable/Importer.php R includes/UpdateTable/TarImportSettings.php M maintenance/UpdateTable.php M specials/SpecialCrossCheck.php M specials/SpecialExternalDbs.php M sql/create_wbqev_dump_information.sql R tests/phpunit/Api/RunCrossCheckTest.php D tests/phpunit/ApiModuleFactoryTest.php A tests/phpunit/CrossCheck/ComparativeValueParser/BasicComparativeValueParserTest.php A tests/phpunit/CrossCheck/ComparativeValueParser/ComparativeMultilingualTextValueParserTest.php A tests/phpunit/CrossCheck/ComparativeValueParser/ComparativeStringValueParserTest.php A tests/phpunit/CrossCheck/ComparativeValueParser/ComparativeValueParserBaseTest.php A tests/phpunit/CrossCheck/ComparativeValueParser/ComparativeValueParserFactoryTest.php A tests/phpunit/CrossCheck/ComparativeValueParser/DispatchingComparativeValueParserTest.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
[MediaWiki-commits] [Gerrit] Changed phpunit dependency. - change (mediawiki...WikibaseQualityExternalValidation)
Soeren.oldag has uploaded a new change for review.
https://gerrit.wikimedia.org/r/219245
Change subject: Changed phpunit dependency.
..
Changed phpunit dependency.
Change-Id: I543f2fcb32525dcf8c5d455480ed8c8afa41c49c
---
M composer.json
1 file changed, 1 insertion(+), 1 deletion(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikibaseQualityExternalValidation
refs/changes/45/219245/1
diff --git a/composer.json b/composer.json
index 89ef907..418868a 100755
--- a/composer.json
+++ b/composer.json
@@ -21,7 +21,7 @@
wikimedia/assert: ~0.2.2
},
require-dev: {
- phpunit/phpunit: ~4.5,
+ phpunit/phpunit: ~3.7,=3.7.37,
satooshi/php-coveralls: dev-master
},
autoload: {
--
To view, visit https://gerrit.wikimedia.org/r/219245
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I543f2fcb32525dcf8c5d455480ed8c8afa41c49c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikibaseQualityExternalValidation
Gerrit-Branch: v1
Gerrit-Owner: Soeren.oldag soeren_ol...@freenet.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Changed phpunit dependency. - change (mediawiki...WikibaseQualityExternalValidation)
Soeren.oldag has uploaded a new change for review.
https://gerrit.wikimedia.org/r/219247
Change subject: Changed phpunit dependency.
..
Changed phpunit dependency.
Change-Id: I543f2fcb32525dcf8c5d455480ed8c8afa41c49c
---
M composer.json
1 file changed, 1 insertion(+), 1 deletion(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikibaseQualityExternalValidation
refs/changes/47/219247/1
diff --git a/composer.json b/composer.json
index 89ef907..418868a 100755
--- a/composer.json
+++ b/composer.json
@@ -21,7 +21,7 @@
wikimedia/assert: ~0.2.2
},
require-dev: {
- phpunit/phpunit: ~4.5,
+ phpunit/phpunit: ~3.7,=3.7.37,
satooshi/php-coveralls: dev-master
},
autoload: {
--
To view, visit https://gerrit.wikimedia.org/r/219247
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I543f2fcb32525dcf8c5d455480ed8c8afa41c49c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikibaseQualityExternalValidation
Gerrit-Branch: master
Gerrit-Owner: Soeren.oldag soeren_ol...@freenet.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Changed phpunit dependency. - change (mediawiki...WikibaseQualityExternalValidation)
Soeren.oldag has submitted this change and it was merged.
Change subject: Changed phpunit dependency.
..
Changed phpunit dependency.
Change-Id: I543f2fcb32525dcf8c5d455480ed8c8afa41c49c
---
M composer.json
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Soeren.oldag: Verified; Looks good to me, approved
diff --git a/composer.json b/composer.json
index 89ef907..418868a 100755
--- a/composer.json
+++ b/composer.json
@@ -21,7 +21,7 @@
wikimedia/assert: ~0.2.2
},
require-dev: {
- phpunit/phpunit: ~4.5,
+ phpunit/phpunit: ~3.7,=3.7.37,
satooshi/php-coveralls: dev-master
},
autoload: {
--
To view, visit https://gerrit.wikimedia.org/r/219245
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I543f2fcb32525dcf8c5d455480ed8c8afa41c49c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikibaseQualityExternalValidation
Gerrit-Branch: v1
Gerrit-Owner: Soeren.oldag soeren_ol...@freenet.de
Gerrit-Reviewer: Soeren.oldag soeren_ol...@freenet.de
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Changed phpunit dependency. - change (mediawiki...WikibaseQualityExternalValidation)
Soeren.oldag has submitted this change and it was merged.
Change subject: Changed phpunit dependency.
..
Changed phpunit dependency.
Change-Id: I543f2fcb32525dcf8c5d455480ed8c8afa41c49c
---
M composer.json
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Soeren.oldag: Verified; Looks good to me, approved
diff --git a/composer.json b/composer.json
index 89ef907..418868a 100755
--- a/composer.json
+++ b/composer.json
@@ -21,7 +21,7 @@
wikimedia/assert: ~0.2.2
},
require-dev: {
- phpunit/phpunit: ~4.5,
+ phpunit/phpunit: ~3.7,=3.7.37,
satooshi/php-coveralls: dev-master
},
autoload: {
--
To view, visit https://gerrit.wikimedia.org/r/219247
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I543f2fcb32525dcf8c5d455480ed8c8afa41c49c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikibaseQualityExternalValidation
Gerrit-Branch: master
Gerrit-Owner: Soeren.oldag soeren_ol...@freenet.de
Gerrit-Reviewer: Soeren.oldag soeren_ol...@freenet.de
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] please work - change (mediawiki...WikibaseQualityExternalValidation)
Soeren.oldag has submitted this change and it was merged.
Change subject: please work
..
please work
Change-Id: Ibf64a886029fd74b01908a09ae7489d03a51a4ca
---
A .jscsrc
A .jshintignore
A .jshintrc
M composer.json
A package.json
5 files changed, 88 insertions(+), 1 deletion(-)
Approvals:
Soeren.oldag: Verified; Looks good to me, approved
diff --git a/.jscsrc b/.jscsrc
new file mode 100644
index 000..78c92c0
--- /dev/null
+++ b/.jscsrc
@@ -0,0 +1,20 @@
+{
+ //
https://github.com/jscs-dev/node-jscs/blob/master/presets/wikimedia.json
+ preset: wikimedia,
+
+ //
+ // Own rules
+
+ disallowSpaceAfterKeywords: [
+ catch,
+ for,
+// if,
+ switch,
+ while
+ ],
+ requireSpaceAfterKeywords: [
+ else
+ ],
+
+ excludeFiles: [ node_modules/**, vendor/** ]
+}
\ No newline at end of file
diff --git a/.jshintignore b/.jshintignore
new file mode 100644
index 000..394522f
--- /dev/null
+++ b/.jshintignore
@@ -0,0 +1 @@
+node_modules/**
\ No newline at end of file
diff --git a/.jshintrc b/.jshintrc
new file mode 100644
index 000..a984a17
--- /dev/null
+++ b/.jshintrc
@@ -0,0 +1,49 @@
+{
+ camelcase: true,
+ curly: true,
+ eqeqeq: true,
+ immed: true,
+ latedef: true,
+ newcap: true,
+ supernew: true,
+ shadow: false,
+ noarg: true,
+ noempty: true,
+ nonew: true,
+ quotmark: false, // sometimes double quotes make sense, e.g. foo's
is better readable than 'foo\'s'
+ trailing: true,
+ undef: true,
+ unused: vars, // we want to allow unused function parameters
+ laxbreak: true,
+ laxcomma: false,
+ onevar: false,
+ bitwise: true,
+ forin: false,
+ regexp: true,
+ strict: true,
+ scripturl: true,
+
+ // Environment
+ browser: true,
+
+ // Globals
+ globals: {
+ jQuery: false,
+ mediaWiki: false,
+ wikibase: true,
+ dataValues: false,
+ dataTypes: false,
+ util: false,
+ valueFormatters: false,
+ valueParsers: false
+ },
+
+ overrides: {
+ */tests/qunit/**/*.tests.js: {
+ globals: {
+ sinon: false,
+ QUnit: false
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/composer.json b/composer.json
index 418868a..041e4d6 100755
--- a/composer.json
+++ b/composer.json
@@ -16,8 +16,8 @@
require: {
php: =5.3.0,
wikibase/data-model: ~3.0,
- wikibase/data-model-serialization: ~1.3,
serialization/serialization: 3.*,=3.2.1,
+ wikibase/data-model-serialization: ~1.3,
wikimedia/assert: ~0.2.2
},
require-dev: {
diff --git a/package.json b/package.json
new file mode 100644
index 000..b7ea5e1
--- /dev/null
+++ b/package.json
@@ -0,0 +1,17 @@
+{
+ name: WikibaseQualityExternalValidation,
+ version: 0.0.0,
+ scripts: {
+ test: jshint . jscs .
+ },
+ repository: {
+ type: git,
+ url:
https://gerrit.wikimedia.org/r/mediawiki/extensions/WikibaseQualityExternalValidation;
+ },
+ author: BP2014N1,
+ license: GPL-2.0+,
+ devDependencies: {
+ jscs: ,
+ jshint:
+ }
+}
\ No newline at end of file
--
To view, visit https://gerrit.wikimedia.org/r/219259
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ibf64a886029fd74b01908a09ae7489d03a51a4ca
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/WikibaseQualityExternalValidation
Gerrit-Branch: master
Gerrit-Owner: Andreasburmeister andreas.burmeis...@student.hpi.de
Gerrit-Reviewer: Soeren.oldag soeren_ol...@freenet.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] please work - change (mediawiki...WikibaseQualityExternalValidation)
Soeren.oldag has uploaded a new change for review.
https://gerrit.wikimedia.org/r/219267
Change subject: please work
..
please work
Change-Id: Ibf64a886029fd74b01908a09ae7489d03a51a4ca
(cherry picked from commit 3cc9c2452291771fa1432a8128e3f3337b36fc10)
---
A .jscsrc
A .jshintignore
A .jshintrc
M composer.json
A package.json
5 files changed, 88 insertions(+), 1 deletion(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikibaseQualityExternalValidation
refs/changes/67/219267/1
diff --git a/.jscsrc b/.jscsrc
new file mode 100644
index 000..78c92c0
--- /dev/null
+++ b/.jscsrc
@@ -0,0 +1,20 @@
+{
+ //
https://github.com/jscs-dev/node-jscs/blob/master/presets/wikimedia.json
+ preset: wikimedia,
+
+ //
+ // Own rules
+
+ disallowSpaceAfterKeywords: [
+ catch,
+ for,
+// if,
+ switch,
+ while
+ ],
+ requireSpaceAfterKeywords: [
+ else
+ ],
+
+ excludeFiles: [ node_modules/**, vendor/** ]
+}
\ No newline at end of file
diff --git a/.jshintignore b/.jshintignore
new file mode 100644
index 000..394522f
--- /dev/null
+++ b/.jshintignore
@@ -0,0 +1 @@
+node_modules/**
\ No newline at end of file
diff --git a/.jshintrc b/.jshintrc
new file mode 100644
index 000..a984a17
--- /dev/null
+++ b/.jshintrc
@@ -0,0 +1,49 @@
+{
+ camelcase: true,
+ curly: true,
+ eqeqeq: true,
+ immed: true,
+ latedef: true,
+ newcap: true,
+ supernew: true,
+ shadow: false,
+ noarg: true,
+ noempty: true,
+ nonew: true,
+ quotmark: false, // sometimes double quotes make sense, e.g. foo's
is better readable than 'foo\'s'
+ trailing: true,
+ undef: true,
+ unused: vars, // we want to allow unused function parameters
+ laxbreak: true,
+ laxcomma: false,
+ onevar: false,
+ bitwise: true,
+ forin: false,
+ regexp: true,
+ strict: true,
+ scripturl: true,
+
+ // Environment
+ browser: true,
+
+ // Globals
+ globals: {
+ jQuery: false,
+ mediaWiki: false,
+ wikibase: true,
+ dataValues: false,
+ dataTypes: false,
+ util: false,
+ valueFormatters: false,
+ valueParsers: false
+ },
+
+ overrides: {
+ */tests/qunit/**/*.tests.js: {
+ globals: {
+ sinon: false,
+ QUnit: false
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/composer.json b/composer.json
index 418868a..041e4d6 100755
--- a/composer.json
+++ b/composer.json
@@ -16,8 +16,8 @@
require: {
php: =5.3.0,
wikibase/data-model: ~3.0,
- wikibase/data-model-serialization: ~1.3,
serialization/serialization: 3.*,=3.2.1,
+ wikibase/data-model-serialization: ~1.3,
wikimedia/assert: ~0.2.2
},
require-dev: {
diff --git a/package.json b/package.json
new file mode 100644
index 000..b7ea5e1
--- /dev/null
+++ b/package.json
@@ -0,0 +1,17 @@
+{
+ name: WikibaseQualityExternalValidation,
+ version: 0.0.0,
+ scripts: {
+ test: jshint . jscs .
+ },
+ repository: {
+ type: git,
+ url:
https://gerrit.wikimedia.org/r/mediawiki/extensions/WikibaseQualityExternalValidation;
+ },
+ author: BP2014N1,
+ license: GPL-2.0+,
+ devDependencies: {
+ jscs: ,
+ jshint:
+ }
+}
\ No newline at end of file
--
To view, visit https://gerrit.wikimedia.org/r/219267
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibf64a886029fd74b01908a09ae7489d03a51a4ca
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikibaseQualityExternalValidation
Gerrit-Branch: v1
Gerrit-Owner: Soeren.oldag soeren_ol...@freenet.de
Gerrit-Reviewer: Andreasburmeister andreas.burmeis...@student.hpi.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] please work - change (mediawiki...WikibaseQualityExternalValidation)
Soeren.oldag has submitted this change and it was merged.
Change subject: please work
..
please work
Change-Id: Ibf64a886029fd74b01908a09ae7489d03a51a4ca
(cherry picked from commit 3cc9c2452291771fa1432a8128e3f3337b36fc10)
---
A .jscsrc
A .jshintignore
A .jshintrc
M composer.json
A package.json
5 files changed, 88 insertions(+), 1 deletion(-)
Approvals:
Soeren.oldag: Verified; Looks good to me, approved
diff --git a/.jscsrc b/.jscsrc
new file mode 100644
index 000..78c92c0
--- /dev/null
+++ b/.jscsrc
@@ -0,0 +1,20 @@
+{
+ //
https://github.com/jscs-dev/node-jscs/blob/master/presets/wikimedia.json
+ preset: wikimedia,
+
+ //
+ // Own rules
+
+ disallowSpaceAfterKeywords: [
+ catch,
+ for,
+// if,
+ switch,
+ while
+ ],
+ requireSpaceAfterKeywords: [
+ else
+ ],
+
+ excludeFiles: [ node_modules/**, vendor/** ]
+}
\ No newline at end of file
diff --git a/.jshintignore b/.jshintignore
new file mode 100644
index 000..394522f
--- /dev/null
+++ b/.jshintignore
@@ -0,0 +1 @@
+node_modules/**
\ No newline at end of file
diff --git a/.jshintrc b/.jshintrc
new file mode 100644
index 000..a984a17
--- /dev/null
+++ b/.jshintrc
@@ -0,0 +1,49 @@
+{
+ camelcase: true,
+ curly: true,
+ eqeqeq: true,
+ immed: true,
+ latedef: true,
+ newcap: true,
+ supernew: true,
+ shadow: false,
+ noarg: true,
+ noempty: true,
+ nonew: true,
+ quotmark: false, // sometimes double quotes make sense, e.g. foo's
is better readable than 'foo\'s'
+ trailing: true,
+ undef: true,
+ unused: vars, // we want to allow unused function parameters
+ laxbreak: true,
+ laxcomma: false,
+ onevar: false,
+ bitwise: true,
+ forin: false,
+ regexp: true,
+ strict: true,
+ scripturl: true,
+
+ // Environment
+ browser: true,
+
+ // Globals
+ globals: {
+ jQuery: false,
+ mediaWiki: false,
+ wikibase: true,
+ dataValues: false,
+ dataTypes: false,
+ util: false,
+ valueFormatters: false,
+ valueParsers: false
+ },
+
+ overrides: {
+ */tests/qunit/**/*.tests.js: {
+ globals: {
+ sinon: false,
+ QUnit: false
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/composer.json b/composer.json
index 418868a..041e4d6 100755
--- a/composer.json
+++ b/composer.json
@@ -16,8 +16,8 @@
require: {
php: =5.3.0,
wikibase/data-model: ~3.0,
- wikibase/data-model-serialization: ~1.3,
serialization/serialization: 3.*,=3.2.1,
+ wikibase/data-model-serialization: ~1.3,
wikimedia/assert: ~0.2.2
},
require-dev: {
diff --git a/package.json b/package.json
new file mode 100644
index 000..b7ea5e1
--- /dev/null
+++ b/package.json
@@ -0,0 +1,17 @@
+{
+ name: WikibaseQualityExternalValidation,
+ version: 0.0.0,
+ scripts: {
+ test: jshint . jscs .
+ },
+ repository: {
+ type: git,
+ url:
https://gerrit.wikimedia.org/r/mediawiki/extensions/WikibaseQualityExternalValidation;
+ },
+ author: BP2014N1,
+ license: GPL-2.0+,
+ devDependencies: {
+ jscs: ,
+ jshint:
+ }
+}
\ No newline at end of file
--
To view, visit https://gerrit.wikimedia.org/r/219267
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ibf64a886029fd74b01908a09ae7489d03a51a4ca
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikibaseQualityExternalValidation
Gerrit-Branch: v1
Gerrit-Owner: Soeren.oldag soeren_ol...@freenet.de
Gerrit-Reviewer: Andreasburmeister andreas.burmeis...@student.hpi.de
Gerrit-Reviewer: Soeren.oldag soeren_ol...@freenet.de
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fixed autoloading problem for base tests. - change (mediawiki...WikibaseQualityExternalValidation)
Soeren.oldag has uploaded a new change for review.
https://gerrit.wikimedia.org/r/219270
Change subject: Fixed autoloading problem for base tests.
..
Fixed autoloading problem for base tests.
Change-Id: Ie16e3be4315e37f35e4cedb782fa60fd90cc5a9d
---
M
tests/phpunit/CrossCheck/ComparativeValueParser/BasicComparativeValueParserTest.php
M
tests/phpunit/CrossCheck/ComparativeValueParser/ComparativeMultilingualTextValueParserTest.php
M
tests/phpunit/CrossCheck/ComparativeValueParser/ComparativeStringValueParserTest.php
R
tests/phpunit/CrossCheck/ComparativeValueParser/ComparativeValueParserTestBase.php
M
tests/phpunit/CrossCheck/ComparativeValueParser/DispatchingComparativeValueParserTest.php
R tests/phpunit/CrossCheck/Comparer/DataValueComparerTestBase.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/StringValueComparerTest.php
M tests/phpunit/CrossCheck/Comparer/TimeValueComparerTest.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/ReferenceResultSerializerTest.php
R tests/phpunit/Serializer/SerializerTestBase.php
20 files changed, 20 insertions(+), 20 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikibaseQualityExternalValidation
refs/changes/70/219270/1
diff --git
a/tests/phpunit/CrossCheck/ComparativeValueParser/BasicComparativeValueParserTest.php
b/tests/phpunit/CrossCheck/ComparativeValueParser/BasicComparativeValueParserTest.php
index 7a15ffc..f187273 100644
---
a/tests/phpunit/CrossCheck/ComparativeValueParser/BasicComparativeValueParserTest.php
+++
b/tests/phpunit/CrossCheck/ComparativeValueParser/BasicComparativeValueParserTest.php
@@ -12,7 +12,7 @@
* @author BP2014N1
* @license GNU GPL v2+
*/
-class BasicComparativeValueParserTest extends ComparativeValueParserBaseTest {
+class BasicComparativeValueParserTestBase extends
ComparativeValueParserTestBase {
public function parseableProvider() {
return array(
diff --git
a/tests/phpunit/CrossCheck/ComparativeValueParser/ComparativeMultilingualTextValueParserTest.php
b/tests/phpunit/CrossCheck/ComparativeValueParser/ComparativeMultilingualTextValueParserTest.php
index 5d3654a..c19c62e 100644
---
a/tests/phpunit/CrossCheck/ComparativeValueParser/ComparativeMultilingualTextValueParserTest.php
+++
b/tests/phpunit/CrossCheck/ComparativeValueParser/ComparativeMultilingualTextValueParserTest.php
@@ -14,7 +14,7 @@
* @author BP2014N1
* @license GNU GPL v2+
*/
-class ComparativeMultilingualTextValueParserTest extends
ComparativeValueParserBaseTest {
+class ComparativeMultilingualTextValueParserTestBase extends
ComparativeValueParserTestBase {
public function parseableProvider() {
return array(
diff --git
a/tests/phpunit/CrossCheck/ComparativeValueParser/ComparativeStringValueParserTest.php
b/tests/phpunit/CrossCheck/ComparativeValueParser/ComparativeStringValueParserTest.php
index 3b9697f..b6c3669 100644
---
a/tests/phpunit/CrossCheck/ComparativeValueParser/ComparativeStringValueParserTest.php
+++
b/tests/phpunit/CrossCheck/ComparativeValueParser/ComparativeStringValueParserTest.php
@@ -12,7 +12,7 @@
* @author BP2014N1
* @license GNU GPL v2+
*/
-class ComparativeStringValueParserTest extends ComparativeValueParserBaseTest {
+class ComparativeStringValueParserTestBase extends
ComparativeValueParserTestBase {
public function parseableProvider() {
return array(
diff --git
a/tests/phpunit/CrossCheck/ComparativeValueParser/ComparativeValueParserBaseTest.php
b/tests/phpunit/CrossCheck/ComparativeValueParser/ComparativeValueParserTestBase.php
similarity index 97%
rename from
tests/phpunit/CrossCheck/ComparativeValueParser/ComparativeValueParserBaseTest.php
rename to
tests/phpunit/CrossCheck/ComparativeValueParser/ComparativeValueParserTestBase.php
index 1881db5..f142126 100755
---
a/tests/phpunit/CrossCheck/ComparativeValueParser/ComparativeValueParserBaseTest.php
+++
b/tests/phpunit/CrossCheck/ComparativeValueParser/ComparativeValueParserTestBase.php
@@ -14,7 +14,7 @@
* @author BP2014N1
* @license GNU GPL v2+
*/
-abstract class ComparativeValueParserBaseTest extends \MediaWikiTestCase {
+abstract class ComparativeValueParserTestBase extends \MediaWikiTestCase {
/**
* @return
[MediaWiki-commits] [Gerrit] Fixed autoloading problem for base tests. - change (mediawiki...WikibaseQualityExternalValidation)
Soeren.oldag has uploaded a new change for review.
https://gerrit.wikimedia.org/r/219271
Change subject: Fixed autoloading problem for base tests.
..
Fixed autoloading problem for base tests.
Change-Id: I4e8cc062adcc3cc25b9b369f8728e1d01cc62e22
---
M
tests/phpunit/CrossCheck/ComparativeValueParser/BasicComparativeValueParserTest.php
M
tests/phpunit/CrossCheck/ComparativeValueParser/ComparativeMultilingualTextValueParserTest.php
M
tests/phpunit/CrossCheck/ComparativeValueParser/ComparativeStringValueParserTest.php
R
tests/phpunit/CrossCheck/ComparativeValueParser/ComparativeValueParserTestBase.php
M
tests/phpunit/CrossCheck/ComparativeValueParser/DispatchingComparativeValueParserTest.php
R tests/phpunit/CrossCheck/Comparer/DataValueComparerTestBase.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/StringValueComparerTest.php
M tests/phpunit/CrossCheck/Comparer/TimeValueComparerTest.php
M tests/phpunit/Serializer/ComparisonResultSerializerTest.php
M tests/phpunit/Serializer/CrossCheckResultListSerializerTest.php
M tests/phpunit/Serializer/CrossCheckResultSerializerTest.php
M tests/phpunit/Serializer/DumpMetaInformationSerializerTest.php
M tests/phpunit/Serializer/ReferenceResultSerializerTest.php
R tests/phpunit/Serializer/SerializerTestBase.php
20 files changed, 20 insertions(+), 20 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikibaseQualityExternalValidation
refs/changes/71/219271/1
diff --git
a/tests/phpunit/CrossCheck/ComparativeValueParser/BasicComparativeValueParserTest.php
b/tests/phpunit/CrossCheck/ComparativeValueParser/BasicComparativeValueParserTest.php
index 7a15ffc..f187273 100644
---
a/tests/phpunit/CrossCheck/ComparativeValueParser/BasicComparativeValueParserTest.php
+++
b/tests/phpunit/CrossCheck/ComparativeValueParser/BasicComparativeValueParserTest.php
@@ -12,7 +12,7 @@
* @author BP2014N1
* @license GNU GPL v2+
*/
-class BasicComparativeValueParserTest extends ComparativeValueParserBaseTest {
+class BasicComparativeValueParserTestBase extends
ComparativeValueParserTestBase {
public function parseableProvider() {
return array(
diff --git
a/tests/phpunit/CrossCheck/ComparativeValueParser/ComparativeMultilingualTextValueParserTest.php
b/tests/phpunit/CrossCheck/ComparativeValueParser/ComparativeMultilingualTextValueParserTest.php
index 5d3654a..c19c62e 100644
---
a/tests/phpunit/CrossCheck/ComparativeValueParser/ComparativeMultilingualTextValueParserTest.php
+++
b/tests/phpunit/CrossCheck/ComparativeValueParser/ComparativeMultilingualTextValueParserTest.php
@@ -14,7 +14,7 @@
* @author BP2014N1
* @license GNU GPL v2+
*/
-class ComparativeMultilingualTextValueParserTest extends
ComparativeValueParserBaseTest {
+class ComparativeMultilingualTextValueParserTestBase extends
ComparativeValueParserTestBase {
public function parseableProvider() {
return array(
diff --git
a/tests/phpunit/CrossCheck/ComparativeValueParser/ComparativeStringValueParserTest.php
b/tests/phpunit/CrossCheck/ComparativeValueParser/ComparativeStringValueParserTest.php
index 3b9697f..b6c3669 100644
---
a/tests/phpunit/CrossCheck/ComparativeValueParser/ComparativeStringValueParserTest.php
+++
b/tests/phpunit/CrossCheck/ComparativeValueParser/ComparativeStringValueParserTest.php
@@ -12,7 +12,7 @@
* @author BP2014N1
* @license GNU GPL v2+
*/
-class ComparativeStringValueParserTest extends ComparativeValueParserBaseTest {
+class ComparativeStringValueParserTestBase extends
ComparativeValueParserTestBase {
public function parseableProvider() {
return array(
diff --git
a/tests/phpunit/CrossCheck/ComparativeValueParser/ComparativeValueParserBaseTest.php
b/tests/phpunit/CrossCheck/ComparativeValueParser/ComparativeValueParserTestBase.php
similarity index 97%
rename from
tests/phpunit/CrossCheck/ComparativeValueParser/ComparativeValueParserBaseTest.php
rename to
tests/phpunit/CrossCheck/ComparativeValueParser/ComparativeValueParserTestBase.php
index 1881db5..f142126 100755
---
a/tests/phpunit/CrossCheck/ComparativeValueParser/ComparativeValueParserBaseTest.php
+++
b/tests/phpunit/CrossCheck/ComparativeValueParser/ComparativeValueParserTestBase.php
@@ -14,7 +14,7 @@
* @author BP2014N1
* @license GNU GPL v2+
*/
-abstract class ComparativeValueParserBaseTest extends \MediaWikiTestCase {
+abstract class ComparativeValueParserTestBase extends \MediaWikiTestCase {
/**
*
[MediaWiki-commits] [Gerrit] Phasing out of claims - change (mediawiki...WikidataQualityExternalValidation)
Soeren.oldag has submitted this change and it was merged.
Change subject: Phasing out of claims
..
Phasing out of claims
Change-Id: I057b88d9e569604007c7502c8737043a6f2200d7
---
M api/CrossCheck.php
M includes/CrossCheck/CrossCheckInteractor.php
M includes/CrossCheck/CrossChecker.php
M includes/CrossCheck/Result/CrossCheckResultList.php
M includes/ExternalValidationFactory.php
M includes/Serializer/CrossCheckResultListSerializer.php
M tests/phpunit/CrossCheck/CrossCheckInteractorTest.php
M tests/phpunit/CrossCheck/CrossCheckerTest.php
M tests/phpunit/CrossCheck/ReferenceHandlerTest.php
M tests/phpunit/CrossCheck/Result/CrossCheckResultListTest.php
M tests/phpunit/Serializer/SerializerFactoryTest.php
M tests/phpunit/Specials/SpecialCrossCheckTest.php
12 files changed, 72 insertions(+), 82 deletions(-)
Approvals:
Soeren.oldag: Verified; Looks good to me, approved
diff --git a/api/CrossCheck.php b/api/CrossCheck.php
index c5b78de..c6529be 100755
--- a/api/CrossCheck.php
+++ b/api/CrossCheck.php
@@ -70,7 +70,7 @@
} elseif ( $params['claims'] ) {
$claimGuids = $params['claims'];
$this-assertAreValidClaimGuids( $claimGuids );
- $resultLists =
$this-crossCheckInteractor-crossCheckClaims( $claimGuids );
+ $resultLists =
$this-crossCheckInteractor-crossCheckStatements( $claimGuids );
} else {
$this-dieError(
'Either provide the ids of entities or ids of
claims, that should be cross-checked.',
diff --git a/includes/CrossCheck/CrossCheckInteractor.php
b/includes/CrossCheck/CrossCheckInteractor.php
index 3d50183..6f08e83 100755
--- a/includes/CrossCheck/CrossCheckInteractor.php
+++ b/includes/CrossCheck/CrossCheckInteractor.php
@@ -3,7 +3,7 @@
namespace WikibaseQuality\ExternalValidation\CrossCheck;
use InvalidArgumentException;
-use Wikibase\DataModel\Claim\ClaimGuidParser;
+use Wikibase\DataModel\Statement\StatementGuidParser;
use Wikibase\DataModel\Entity\Entity;
use Wikibase\DataModel\Entity\EntityId;
use Wikibase\DataModel\Entity\PropertyId;
@@ -27,9 +27,9 @@
private $entityLookup;
/**
-* @var ClaimGuidParser
+* @var StatementGuidParser
*/
- private $claimGuidParser;
+ private $statementGuidParser;
/**
* @var CrossChecker
@@ -38,12 +38,12 @@
/**
* @param EntityLookup $entityLookup
-* @param ClaimGuidParser $claimGuidParser
+* @param StatementGuidParser $statementGuidParser
* @param CrossChecker $crossChecker
*/
- public function __construct( EntityLookup $entityLookup,
ClaimGuidParser $claimGuidParser, CrossChecker $crossChecker ) {
+ public function __construct( EntityLookup $entityLookup,
StatementGuidParser $statementGuidParser, CrossChecker $crossChecker ) {
$this-entityLookup = $entityLookup;
- $this-claimGuidParser = $claimGuidParser;
+ $this-statementGuidParser = $statementGuidParser;
$this-crossChecker = $crossChecker;
}
@@ -197,49 +197,49 @@
}
/**
-* Runs cross-check for a single claim.
+* Runs cross-check for a single statement.
*
-* @param string $claimGuid
+* @param string $statementGuid
*
* @return CrossCheckResultList
* @throws InvalidArgumentException
*/
- public function crossCheckClaim( $claimGuid ) {
- $this-assertIsString( $claimGuid, '$claimGuid' );
+ public function crossCheckStatement( $statementGuid ) {
+ $this-assertIsString( $statementGuid, '$claimGuid' );
- $resultList = $this-crossCheckClaims( array( $claimGuid ) );
+ $resultList = $this-crossCheckStatements( array(
$statementGuid ) );
return reset( $resultList );
}
/**
-* Runs cross-check for multiple claims.
+* Runs cross-check for multiple statements.
*
-* @param string[] $claimGuids
+* @param string[] $statementGuids
*
* @return CrossCheckResultList[]
* @throws InvalidArgumentException
*/
- public function crossCheckClaims( array $claimGuids ) {
- $this-assertIsArrayOfStrings( $claimGuids, '$claimGuids' );
+ public function crossCheckStatements( array $statementGuids ) {
+ $this-assertIsArrayOfStrings( $statementGuids, '$claimGuids' );
$entityIds = array();
- $groupedClaimGuids = array();
- foreach ( $claimGuids as $claimGuid ) {
- $serializedEntityId = $this-claimGuidParser-parse(
$claimGuid )-getEntityId();
+ $groupedStatementGuids = array();
+
[MediaWiki-commits] [Gerrit] Phasing out of claims - change (mediawiki...WikidataQualityExternalValidation)
Soeren.oldag has submitted this change and it was merged.
Change subject: Phasing out of claims
..
Phasing out of claims
Cherry-pick from master
Change-Id: I057b88d9e569604007c7502c8737043a6f2200d7
---
M api/CrossCheck.php
M includes/CrossCheck/CrossCheckInteractor.php
M includes/CrossCheck/CrossChecker.php
M includes/CrossCheck/Result/CrossCheckResultList.php
M includes/ExternalValidationFactory.php
M includes/Serializer/CrossCheckResultListSerializer.php
M tests/phpunit/CrossCheck/CrossCheckInteractorTest.php
M tests/phpunit/CrossCheck/CrossCheckerTest.php
M tests/phpunit/CrossCheck/ReferenceHandlerTest.php
M tests/phpunit/CrossCheck/Result/CrossCheckResultListTest.php
M tests/phpunit/Serializer/SerializerFactoryTest.php
M tests/phpunit/Specials/SpecialCrossCheckTest.php
12 files changed, 88 insertions(+), 81 deletions(-)
Approvals:
Soeren.oldag: Verified; Looks good to me, approved
diff --git a/api/CrossCheck.php b/api/CrossCheck.php
index f3e661d..90304b2 100755
--- a/api/CrossCheck.php
+++ b/api/CrossCheck.php
@@ -70,7 +70,7 @@
} elseif ( $params['claims'] ) {
$claimGuids = $params['claims'];
$this-assertAreValidClaimGuids( $claimGuids );
- $resultLists =
$this-crossCheckInteractor-crossCheckClaims( $claimGuids );
+ $resultLists =
$this-crossCheckInteractor-crossCheckStatements( $claimGuids );
} else {
$this-dieError(
'Either provide the ids of entities or ids of
claims, that should be cross-checked.',
diff --git a/includes/CrossCheck/CrossCheckInteractor.php
b/includes/CrossCheck/CrossCheckInteractor.php
index 207b902..0ef7b00 100755
--- a/includes/CrossCheck/CrossCheckInteractor.php
+++ b/includes/CrossCheck/CrossCheckInteractor.php
@@ -2,8 +2,8 @@
namespace WikibaseQuality\ExternalValidation\CrossCheck;
-use Doctrine\Instantiator\Exception\InvalidArgumentException;
-use Wikibase\DataModel\Claim\ClaimGuidParser;
+use InvalidArgumentException;
+use Wikibase\DataModel\Statement\StatementGuidParser;
use Wikibase\DataModel\Entity\Entity;
use Wikibase\DataModel\Entity\EntityId;
use Wikibase\DataModel\Entity\PropertyId;
@@ -27,9 +27,9 @@
private $entityLookup;
/**
-* @var ClaimGuidParser
+* @var StatementGuidParser
*/
- private $claimGuidParser;
+ private $statementGuidParser;
/**
* @var CrossChecker
@@ -38,12 +38,12 @@
/**
* @param EntityLookup $entityLookup
-* @param ClaimGuidParser $claimGuidParser
+* @param StatementGuidParser $statementGuidParser
* @param CrossChecker $crossChecker
*/
- public function __construct( EntityLookup $entityLookup,
ClaimGuidParser $claimGuidParser, CrossChecker $crossChecker ) {
+ public function __construct( EntityLookup $entityLookup,
StatementGuidParser $statementGuidParser, CrossChecker $crossChecker ) {
$this-entityLookup = $entityLookup;
- $this-claimGuidParser = $claimGuidParser;
+ $this-statementGuidParser = $statementGuidParser;
$this-crossChecker = $crossChecker;
}
@@ -52,6 +52,7 @@
* Runs cross-check for all statements of multiple entities represented
by ids.
*
* @param EntityId $entityId
+*
* @return CrossCheckResultList
*/
public function crossCheckEntityById( EntityId $entityId ) {
@@ -66,6 +67,7 @@
* Runs cross-check for all statements of a single entity represented
by id.
*
* @param EntityId[] $entityIds
+*
* @return CrossCheckResultList[]
*/
public function crossCheckEntitiesByIds( array $entityIds ) {
@@ -84,6 +86,7 @@
* Runs cross-check for all statements of a single entity.
*
* @param Entity $entity
+*
* @return CrossCheckResultList
*/
public function crossCheckEntity( Entity $entity ) {
@@ -95,6 +98,7 @@
* Runs cross-check for all statements of multiple entities.
*
* @param Entity[] $entities
+*
* @return CrossCheckResultList[]
* @throws InvalidArgumentException
*/
@@ -116,6 +120,7 @@
*
* @param EntityId $entityId
* @param PropertyId[] $propertyIds
+*
* @return CrossCheckResultList
* @throws InvalidArgumentException
*/
@@ -134,6 +139,7 @@
*
* @param EntityId[] $entityIds
* @param PropertyId[] $propertyIds
+*
* @return CrossCheckResultList[]
* @throws InvalidArgumentException
*/
@@ -155,6 +161,7 @@
*
* @param Entity $entity
* @param PropertyId[] $propertyIds
+*
* @return
[MediaWiki-commits] [Gerrit] Upgrade data-model to be compatible to Wikibase. - change (mediawiki...WikidataQualityExternalValidation)
Soeren.oldag has uploaded a new change for review.
https://gerrit.wikimedia.org/r/218864
Change subject: Upgrade data-model to be compatible to Wikibase.
..
Upgrade data-model to be compatible to Wikibase.
Change-Id: I6d6b8439f74e33431677353abd83d93cea41b6f7
---
M composer.json
1 file changed, 1 insertion(+), 1 deletion(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikidataQualityExternalValidation
refs/changes/64/218864/1
diff --git a/composer.json b/composer.json
index a6ffdc0..f951eb7 100755
--- a/composer.json
+++ b/composer.json
@@ -22,7 +22,7 @@
require: {
php: =5.3.0,
composer/installers: 1.*,=1.0.1,
- wikibase/data-model: ~2.6,
+ wikibase/data-model: ~3.0,
wikibase/data-model-serialization: ~1.3,
serialization/serialization: 3.*,=3.2.1
},
--
To view, visit https://gerrit.wikimedia.org/r/218864
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6d6b8439f74e33431677353abd83d93cea41b6f7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikidataQualityExternalValidation
Gerrit-Branch: master
Gerrit-Owner: Soeren.oldag soeren_ol...@freenet.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Make travis work again (hopefully). - change (mediawiki...WikidataQualityExternalValidation)
Soeren.oldag has submitted this change and it was merged.
Change subject: Make travis work again (hopefully).
..
Make travis work again (hopefully).
Change-Id: I9627a32ea190f98d9927edccc7d223b4d0844d8f
---
M build/travis/after_script.sh
M build/travis/before_script.sh
M composer.json
3 files changed, 40 insertions(+), 18 deletions(-)
Approvals:
Soeren.oldag: Verified; Looks good to me, approved
diff --git a/build/travis/after_script.sh b/build/travis/after_script.sh
index 9a3084f..1fb6b07 100644
--- a/build/travis/after_script.sh
+++ b/build/travis/after_script.sh
@@ -1,6 +1,5 @@
#! /bin/bash
-cd ../wiki/extensions/WikibaseQualityExternalValidation
-composer remove wikibase/quality
-composer remove wikibase/wikibase
+cd ../wiki/extensions//WikibaseQualityExternalValidation
+
php vendor/bin/coveralls -v
\ No newline at end of file
diff --git a/build/travis/before_script.sh b/build/travis/before_script.sh
index 35b9f17..4b6b35e 100644
--- a/build/travis/before_script.sh
+++ b/build/travis/before_script.sh
@@ -1,3 +1,5 @@
+#! /bin/bash
+
set -x
originalDirectory=$(pwd)
@@ -12,6 +14,18 @@
rm master.tar.gz
mv mediawiki-master wiki
+# checkout wikibase
+wget
https://github.com/wikimedia/mediawiki-extensions-Wikibase/archive/master.tar.gz
+tar -zxf master.tar.gz
+rm master.tar.gz
+mv mediawiki-extensions-Wikibase-master wiki/extensions/Wikibase
+
+# checkout WikibaseQuality
+wget
https://github.com/wikimedia/mediawiki-extensions-WikidataQuality/archive/v1.tar.gz
+tar -zxf v1.tar.gz
+rm v1.tar.gz
+mv mediawiki-extensions-WikidataQuality-1 wiki/extensions/WikibaseQuality
+
cd wiki
if [ $DBTYPE == mysql ]
@@ -19,22 +33,36 @@
mysql -e 'CREATE DATABASE its_a_mw;'
fi
-composer install
+composer install --no-dev
php maintenance/install.php --dbtype $DBTYPE --dbuser root --dbname its_a_mw
--dbpath $(pwd) --pass nyan TravisWiki admin
-cd extensions
+cd extensions/WikibaseQuality
+composer install --dev --no-interaction --prefer-source
+
+cd ..
+
cp -r $originalDirectory WikibaseQualityExternalValidation
+
cd WikibaseQualityExternalValidation
-composer install
+composer install --prefer-source
+
+cd ../Wikibase
+composer install --prefer-source
cd ../..
+
echo 'error_reporting(E_ALL| E_STRICT);' LocalSettings.php
echo 'ini_set(display_errors, 1);' LocalSettings.php
echo '$wgShowExceptionDetails = true;' LocalSettings.php
echo '$wgDevelopmentWarnings = true;' LocalSettings.php
-echo putenv( 'MW_INSTALL_PATH=$(pwd)' ); LocalSettings.php
+echo '$wgLanguageCode = en;' LocalSettings.php
-echo require_once( __DIR__ .
'/extensions/WikibaseQualityExternalValidation/vendor/autoload.php' );
LocalSettings.php
-echo require_once( __DIR__ .
'/extensions/WikibaseQualityExternalValidation/extensions/Wikibase/repo/ExampleSettings.php'
); LocalSettings.php
+echo define( 'WB_EXPERIMENTAL_FEATURES', true ); LocalSettings.php
+echo 'require_once __DIR__ . /extensions/Wikibase/repo/Wikibase.php;'
LocalSettings.php
+echo 'require_once __DIR__ . /extensions/Wikibase/repo/ExampleSettings.php;'
LocalSettings.php
+echo 'require_once __DIR__ .
/extensions/Wikibase/client/WikibaseClient.php;' LocalSettings.php
+echo 'require_once __DIR__ .
/extensions/WikibaseQuality/WikibaseQuality.php;' LocalSettings.php
+echo 'require_once __DIR__ .
/extensions/WikibaseQualityExternalValidation/WikibaseQualityExternalValidation.php;'
LocalSettings.php
+echo '$wgWBClientSettings[siteGlobalID] = enwiki;' LocalSettings.php
-php maintenance/update.php --quick
\ No newline at end of file
+php maintenance/update.php --quick
diff --git a/composer.json b/composer.json
index ae92f75..f951eb7 100755
--- a/composer.json
+++ b/composer.json
@@ -22,11 +22,9 @@
require: {
php: =5.3.0,
composer/installers: 1.*,=1.0.1,
- wikibase/wikibase: dev-master,
- wikibase/data-model: ~2.6,
+ wikibase/data-model: ~3.0,
wikibase/data-model-serialization: ~1.3,
- serialization/serialization: 3.*,=3.2.1,
- wikibase/quality: 1.x-dev
+ serialization/serialization: 3.*,=3.2.1
},
require-dev: {
phpunit/phpunit: ~4.5,
@@ -42,9 +40,6 @@
classmap: [
WikibaseQualityExternalValidationHooks.php,
maintenance/UpdateTable.php
- ],
- files: [
- WikibaseQualityExternalValidation.php
]
}
-}
\ No newline at end of file
+}
--
To view, visit https://gerrit.wikimedia.org/r/218863
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9627a32ea190f98d9927edccc7d223b4d0844d8f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikidataQualityExternalValidation
Gerrit-Branch: v1
Gerrit-Owner: Soeren.oldag
[MediaWiki-commits] [Gerrit] Upgrade data-model to be compatible to Wikibase. - change (mediawiki...WikidataQualityConstraints)
Soeren.oldag has uploaded a new change for review.
https://gerrit.wikimedia.org/r/218872
Change subject: Upgrade data-model to be compatible to Wikibase.
..
Upgrade data-model to be compatible to Wikibase.
Change-Id: I3969ce0f75bbbda14971177a4f9a5feec991e628
---
M composer.json
1 file changed, 1 insertion(+), 1 deletion(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikidataQualityConstraints
refs/changes/72/218872/1
diff --git a/composer.json b/composer.json
index 848ba51..da07ac6 100644
--- a/composer.json
+++ b/composer.json
@@ -23,7 +23,7 @@
php: =5.3.0,
composer/installers: 1.*,=1.0.1,
wikibase/wikibase: dev-master,
- wikibase/data-model: ~2.6,
+ wikibase/data-model: ~3.0,
wikibase/quality: 1.x-dev
},
require-dev: {
--
To view, visit https://gerrit.wikimedia.org/r/218872
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3969ce0f75bbbda14971177a4f9a5feec991e628
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikidataQualityConstraints
Gerrit-Branch: v1
Gerrit-Owner: Soeren.oldag soeren_ol...@freenet.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Make travis work again (hopefully). - change (mediawiki...WikidataQuality)
Soeren.oldag has uploaded a new change for review. https://gerrit.wikimedia.org/r/218842 Change subject: Make travis work again (hopefully). .. Make travis work again (hopefully). Change-Id: Ia35b7512da2ff6035f2e793eca1d2b95a3b846be --- M build/travis/after_script.sh M build/travis/before_script.sh M composer.json 3 files changed, 24 insertions(+), 9 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikidataQuality refs/changes/42/218842/1 diff --git a/build/travis/after_script.sh b/build/travis/after_script.sh index 29ac374..8acb827 100644 --- a/build/travis/after_script.sh +++ b/build/travis/after_script.sh @@ -1,5 +1,5 @@ #! /bin/bash cd ../wiki/extensions/WikibaseQuality -composer remove wikibase/wikibase + php vendor/bin/coveralls -v \ No newline at end of file diff --git a/build/travis/before_script.sh b/build/travis/before_script.sh index d867cda..f55a7d8 100644 --- a/build/travis/before_script.sh +++ b/build/travis/before_script.sh @@ -1,3 +1,5 @@ +#! /bin/bash + set -x originalDirectory=$(pwd) @@ -12,6 +14,12 @@ rm master.tar.gz mv mediawiki-master wiki +# checkout wikibase +wget https://github.com/wikimedia/mediawiki-extensions-Wikibase/archive/master.tar.gz +tar -zxf master.tar.gz +rm master.tar.gz +mv mediawiki-extensions-Wikibase-master wiki/extensions/Wikibase + cd wiki if [ $DBTYPE == mysql ] @@ -19,22 +27,32 @@ mysql -e 'CREATE DATABASE its_a_mw;' fi -composer install +composer install --no-dev php maintenance/install.php --dbtype $DBTYPE --dbuser root --dbname its_a_mw --dbpath $(pwd) --pass nyan TravisWiki admin cd extensions + cp -r $originalDirectory WikibaseQuality + cd WikibaseQuality -composer install +composer install --dev --no-interaction --prefer-source + +cd ../Wikibase +composer install --prefer-source cd ../.. + echo 'error_reporting(E_ALL| E_STRICT);' LocalSettings.php echo 'ini_set(display_errors, 1);' LocalSettings.php echo '$wgShowExceptionDetails = true;' LocalSettings.php echo '$wgDevelopmentWarnings = true;' LocalSettings.php -echo putenv( 'MW_INSTALL_PATH=$(pwd)' ); LocalSettings.php +echo '$wgLanguageCode = en;' LocalSettings.php -echo require_once( __DIR__ . '/extensions/WikibaseQuality/vendor/autoload.php' ); LocalSettings.php -echo require_once( __DIR__ . '/extensions/WikibaseQuality/extensions/Wikibase/repo/ExampleSettings.php' ); LocalSettings.php +echo define( 'WB_EXPERIMENTAL_FEATURES', true ); LocalSettings.php +echo 'require_once __DIR__ . /extensions/Wikibase/repo/Wikibase.php;' LocalSettings.php +echo 'require_once __DIR__ . /extensions/Wikibase/repo/ExampleSettings.php;' LocalSettings.php +echo 'require_once __DIR__ . /extensions/Wikibase/client/WikibaseClient.php;' LocalSettings.php +echo 'require_once __DIR__ . /extensions/WikibaseQuality/WikibaseQuality.php;' LocalSettings.php +echo '$wgWBClientSettings[siteGlobalID] = enwiki;' LocalSettings.php php maintenance/update.php --quick \ No newline at end of file diff --git a/composer.json b/composer.json index 699cd8d..c1b91e2 100755 --- a/composer.json +++ b/composer.json @@ -31,9 +31,6 @@ }, classmap: [ WikibaseQualityHooks.php - ], - files: [ - WikibaseQuality.php ] } } -- To view, visit https://gerrit.wikimedia.org/r/218842 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia35b7512da2ff6035f2e793eca1d2b95a3b846be Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/WikidataQuality Gerrit-Branch: master Gerrit-Owner: Soeren.oldag soeren_ol...@freenet.de ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fixed table constant. - change (mediawiki...WikidataQuality)
Soeren.oldag has uploaded a new change for review.
https://gerrit.wikimedia.org/r/218849
Change subject: Fixed table constant.
..
Fixed table constant.
Change-Id: I4e9a784da9006913b36c6d2e8654775e75af2f5c
---
M WikibaseQuality.php
M WikibaseQualityHooks.php
2 files changed, 2 insertions(+), 7 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikidataQuality
refs/changes/49/218849/1
diff --git a/WikibaseQuality.php b/WikibaseQuality.php
index 0ec297e..f368a47 100755
--- a/WikibaseQuality.php
+++ b/WikibaseQuality.php
@@ -30,8 +30,4 @@
'localBasePath' = __DIR__,
'remoteExtPath' = 'WikibaseQuality'
);
-} );
-
-// Define database table names
-define( 'VIOLATION_TABLE', 'wbq_violations' );
-define( 'EVALUATION_TABLE', 'wbq_evaluation' );
\ No newline at end of file
+} );
\ No newline at end of file
diff --git a/WikibaseQualityHooks.php b/WikibaseQualityHooks.php
index 99d76f4..8bff337 100755
--- a/WikibaseQualityHooks.php
+++ b/WikibaseQualityHooks.php
@@ -8,8 +8,7 @@
* @return bool
*/
public static function onCreateSchema( DatabaseUpdater $updater ) {
- $updater-addExtensionTable( VIOLATION_TABLE, __DIR__ .
'/sql/create_wbq_violations.sql' );
- $updater-addExtensionTable( EVALUATION_TABLE, __DIR__ .
'/sql/create_wbq_evaluation.sql' );
+ $updater-addExtensionTable( 'wbq_violations', __DIR__ .
'/sql/create_wbq_violations.sql' );
return true;
}
--
To view, visit https://gerrit.wikimedia.org/r/218849
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4e9a784da9006913b36c6d2e8654775e75af2f5c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikidataQuality
Gerrit-Branch: v1
Gerrit-Owner: Soeren.oldag soeren_ol...@freenet.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Upgrade data-model to be compatible to Wikibase. - change (mediawiki...WikidataQuality)
Soeren.oldag has uploaded a new change for review.
https://gerrit.wikimedia.org/r/218854
Change subject: Upgrade data-model to be compatible to Wikibase.
..
Upgrade data-model to be compatible to Wikibase.
Change-Id: Ia5cf79276c124d2d17f950bc803a9f72616668da
---
M composer.json
1 file changed, 1 insertion(+), 1 deletion(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikidataQuality
refs/changes/54/218854/1
diff --git a/composer.json b/composer.json
index 5c26798..c1b91e2 100755
--- a/composer.json
+++ b/composer.json
@@ -15,7 +15,7 @@
},
require: {
php: =5.3.0,
- wikibase/data-model: ~2.6,
+ wikibase/data-model: ~3.0,
serialization/serialization: 3.*,=3.2.1
},
require-dev: {
--
To view, visit https://gerrit.wikimedia.org/r/218854
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia5cf79276c124d2d17f950bc803a9f72616668da
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikidataQuality
Gerrit-Branch: v1
Gerrit-Owner: Soeren.oldag soeren_ol...@freenet.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Upgrade data-model to be compatible to Wikibase. - change (mediawiki...WikidataQualityExternalValidation)
Soeren.oldag has submitted this change and it was merged.
Change subject: Upgrade data-model to be compatible to Wikibase.
..
Upgrade data-model to be compatible to Wikibase.
Change-Id: I6d6b8439f74e33431677353abd83d93cea41b6f7
---
M composer.json
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Soeren.oldag: Verified; Looks good to me, approved
diff --git a/composer.json b/composer.json
index a6ffdc0..f951eb7 100755
--- a/composer.json
+++ b/composer.json
@@ -22,7 +22,7 @@
require: {
php: =5.3.0,
composer/installers: 1.*,=1.0.1,
- wikibase/data-model: ~2.6,
+ wikibase/data-model: ~3.0,
wikibase/data-model-serialization: ~1.3,
serialization/serialization: 3.*,=3.2.1
},
--
To view, visit https://gerrit.wikimedia.org/r/218864
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6d6b8439f74e33431677353abd83d93cea41b6f7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikidataQualityExternalValidation
Gerrit-Branch: master
Gerrit-Owner: Soeren.oldag soeren_ol...@freenet.de
Gerrit-Reviewer: Soeren.oldag soeren_ol...@freenet.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Upgrade data-model to be compatible to Wikibase. - change (mediawiki...WikidataQualityConstraints)
Soeren.oldag has uploaded a new change for review.
https://gerrit.wikimedia.org/r/218871
Change subject: Upgrade data-model to be compatible to Wikibase.
..
Upgrade data-model to be compatible to Wikibase.
Change-Id: I6dae90a4a89560693dcd685302a0c11acb2cfa14
---
M composer.json
1 file changed, 1 insertion(+), 1 deletion(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikidataQualityConstraints
refs/changes/71/218871/1
diff --git a/composer.json b/composer.json
index ed6efc8..a1a278e 100644
--- a/composer.json
+++ b/composer.json
@@ -23,7 +23,7 @@
php: =5.3.0,
composer/installers: 1.*,=1.0.1,
wikibase/wikibase: dev-master,
- wikibase/data-model: ~2.6,
+ wikibase/data-model: ~3.0,
wikibase/quality: dev-master
},
require-dev: {
--
To view, visit https://gerrit.wikimedia.org/r/218871
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6dae90a4a89560693dcd685302a0c11acb2cfa14
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikidataQualityConstraints
Gerrit-Branch: master
Gerrit-Owner: Soeren.oldag soeren_ol...@freenet.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Make travis work again (hopefully). - change (mediawiki...WikidataQualityConstraints)
Soeren.oldag has submitted this change and it was merged.
Change subject: Make travis work again (hopefully).
..
Make travis work again (hopefully).
Change-Id: I901c2b244732e6f170d28741fd9a61e95631a0f4
---
M build/travis/after_script.sh
M build/travis/before_script.sh
M composer.json
3 files changed, 36 insertions(+), 15 deletions(-)
Approvals:
Soeren.oldag: Verified; Looks good to me, approved
diff --git a/build/travis/after_script.sh b/build/travis/after_script.sh
index 5fd72bf..d8ea624 100644
--- a/build/travis/after_script.sh
+++ b/build/travis/after_script.sh
@@ -1,6 +1,5 @@
#! /bin/bash
cd ../wiki/extensions/WikibaseQualityConstraints
-composer remove wikibase/quality
-composer remove wikibase/wikibase
+
php vendor/bin/coveralls -v
\ No newline at end of file
diff --git a/build/travis/before_script.sh b/build/travis/before_script.sh
index 3adf120..1387f91 100644
--- a/build/travis/before_script.sh
+++ b/build/travis/before_script.sh
@@ -1,3 +1,5 @@
+#! /bin/bash
+
set -x
originalDirectory=$(pwd)
@@ -12,6 +14,18 @@
rm master.tar.gz
mv mediawiki-master wiki
+# checkout wikibase
+wget
https://github.com/wikimedia/mediawiki-extensions-Wikibase/archive/master.tar.gz
+tar -zxf master.tar.gz
+rm master.tar.gz
+mv mediawiki-extensions-Wikibase-master wiki/extensions/Wikibase
+
+# checkout WikibaseQuality
+wget
https://github.com/wikimedia/mediawiki-extensions-WikidataQuality/archive/master.tar.gz
+tar -zxf master.tar.gz
+rm master.tar.gz
+mv mediawiki-extensions-WikidataQuality-master wiki/extensions/WikibaseQuality
+
cd wiki
if [ $DBTYPE == mysql ]
@@ -19,22 +33,36 @@
mysql -e 'CREATE DATABASE its_a_mw;'
fi
-composer install
+composer install --no-dev
php maintenance/install.php --dbtype $DBTYPE --dbuser root --dbname its_a_mw
--dbpath $(pwd) --pass nyan TravisWiki admin
-cd extensions
+cd extensions/WikibaseQuality
+composer install --dev --no-interaction --prefer-source
+
+cd ..
+
cp -r $originalDirectory WikibaseQualityConstraints
+
cd WikibaseQualityConstraints
-composer install
+composer install --prefer-source
+
+cd ../Wikibase
+composer install --prefer-source
cd ../..
+
echo 'error_reporting(E_ALL| E_STRICT);' LocalSettings.php
echo 'ini_set(display_errors, 1);' LocalSettings.php
echo '$wgShowExceptionDetails = true;' LocalSettings.php
echo '$wgDevelopmentWarnings = true;' LocalSettings.php
-echo putenv( 'MW_INSTALL_PATH=$(pwd)' ); LocalSettings.php
+echo '$wgLanguageCode = en;' LocalSettings.php
-echo require_once( __DIR__ .
'/extensions/WikibaseQualityConstraints/vendor/autoload.php' );
LocalSettings.php
-echo require_once( __DIR__ .
'/extensions/WikibaseQualityConstraints/extensions/Wikibase/repo/ExampleSettings.php'
); LocalSettings.php
+echo define( 'WB_EXPERIMENTAL_FEATURES', true ); LocalSettings.php
+echo 'require_once __DIR__ . /extensions/Wikibase/repo/Wikibase.php;'
LocalSettings.php
+echo 'require_once __DIR__ . /extensions/Wikibase/repo/ExampleSettings.php;'
LocalSettings.php
+echo 'require_once __DIR__ .
/extensions/Wikibase/client/WikibaseClient.php;' LocalSettings.php
+echo 'require_once __DIR__ .
/extensions/WikibaseQuality/WikibaseQuality.php;' LocalSettings.php
+echo 'require_once __DIR__ .
/extensions/WikibaseQualityConstraints/WikibaseQualityConstraints.php;'
LocalSettings.php
+echo '$wgWBClientSettings[siteGlobalID] = enwiki;' LocalSettings.php
php maintenance/update.php --quick
\ No newline at end of file
diff --git a/composer.json b/composer.json
index a1a278e..fd5b9b2 100644
--- a/composer.json
+++ b/composer.json
@@ -21,10 +21,7 @@
],
require: {
php: =5.3.0,
- composer/installers: 1.*,=1.0.1,
- wikibase/wikibase: dev-master,
- wikibase/data-model: ~3.0,
- wikibase/quality: dev-master
+ wikibase/data-model: ~3.0
},
require-dev: {
phpunit/phpunit: ~4.5,
@@ -39,9 +36,6 @@
},
classmap: [
WikibaseQualityConstraintsHooks.php
- ],
- files: [
- WikibaseQualityConstraints.php
]
}
}
\ No newline at end of file
--
To view, visit https://gerrit.wikimedia.org/r/218875
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I901c2b244732e6f170d28741fd9a61e95631a0f4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikidataQualityConstraints
Gerrit-Branch: master
Gerrit-Owner: Soeren.oldag soeren_ol...@freenet.de
Gerrit-Reviewer: Soeren.oldag soeren_ol...@freenet.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Make travis work again (hopefully). - change (mediawiki...WikidataQuality)
Soeren.oldag has submitted this change and it was merged. Change subject: Make travis work again (hopefully). .. Make travis work again (hopefully). Change-Id: Ia35b7512da2ff6035f2e793eca1d2b95a3b846be --- M build/travis/after_script.sh M build/travis/before_script.sh M composer.json 3 files changed, 24 insertions(+), 9 deletions(-) Approvals: Soeren.oldag: Verified; Looks good to me, approved diff --git a/build/travis/after_script.sh b/build/travis/after_script.sh index 29ac374..8acb827 100644 --- a/build/travis/after_script.sh +++ b/build/travis/after_script.sh @@ -1,5 +1,5 @@ #! /bin/bash cd ../wiki/extensions/WikibaseQuality -composer remove wikibase/wikibase + php vendor/bin/coveralls -v \ No newline at end of file diff --git a/build/travis/before_script.sh b/build/travis/before_script.sh index d867cda..f55a7d8 100644 --- a/build/travis/before_script.sh +++ b/build/travis/before_script.sh @@ -1,3 +1,5 @@ +#! /bin/bash + set -x originalDirectory=$(pwd) @@ -12,6 +14,12 @@ rm master.tar.gz mv mediawiki-master wiki +# checkout wikibase +wget https://github.com/wikimedia/mediawiki-extensions-Wikibase/archive/master.tar.gz +tar -zxf master.tar.gz +rm master.tar.gz +mv mediawiki-extensions-Wikibase-master wiki/extensions/Wikibase + cd wiki if [ $DBTYPE == mysql ] @@ -19,22 +27,32 @@ mysql -e 'CREATE DATABASE its_a_mw;' fi -composer install +composer install --no-dev php maintenance/install.php --dbtype $DBTYPE --dbuser root --dbname its_a_mw --dbpath $(pwd) --pass nyan TravisWiki admin cd extensions + cp -r $originalDirectory WikibaseQuality + cd WikibaseQuality -composer install +composer install --dev --no-interaction --prefer-source + +cd ../Wikibase +composer install --prefer-source cd ../.. + echo 'error_reporting(E_ALL| E_STRICT);' LocalSettings.php echo 'ini_set(display_errors, 1);' LocalSettings.php echo '$wgShowExceptionDetails = true;' LocalSettings.php echo '$wgDevelopmentWarnings = true;' LocalSettings.php -echo putenv( 'MW_INSTALL_PATH=$(pwd)' ); LocalSettings.php +echo '$wgLanguageCode = en;' LocalSettings.php -echo require_once( __DIR__ . '/extensions/WikibaseQuality/vendor/autoload.php' ); LocalSettings.php -echo require_once( __DIR__ . '/extensions/WikibaseQuality/extensions/Wikibase/repo/ExampleSettings.php' ); LocalSettings.php +echo define( 'WB_EXPERIMENTAL_FEATURES', true ); LocalSettings.php +echo 'require_once __DIR__ . /extensions/Wikibase/repo/Wikibase.php;' LocalSettings.php +echo 'require_once __DIR__ . /extensions/Wikibase/repo/ExampleSettings.php;' LocalSettings.php +echo 'require_once __DIR__ . /extensions/Wikibase/client/WikibaseClient.php;' LocalSettings.php +echo 'require_once __DIR__ . /extensions/WikibaseQuality/WikibaseQuality.php;' LocalSettings.php +echo '$wgWBClientSettings[siteGlobalID] = enwiki;' LocalSettings.php php maintenance/update.php --quick \ No newline at end of file diff --git a/composer.json b/composer.json index c925cec..5c26798 100755 --- a/composer.json +++ b/composer.json @@ -31,9 +31,6 @@ }, classmap: [ WikibaseQualityHooks.php - ], - files: [ - WikibaseQuality.php ] } } -- To view, visit https://gerrit.wikimedia.org/r/218852 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia35b7512da2ff6035f2e793eca1d2b95a3b846be Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/WikidataQuality Gerrit-Branch: v1 Gerrit-Owner: Soeren.oldag soeren_ol...@freenet.de Gerrit-Reviewer: Soeren.oldag soeren_ol...@freenet.de ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Make travis work again (hopefully). - change (mediawiki...WikidataQuality)
Soeren.oldag has uploaded a new change for review. https://gerrit.wikimedia.org/r/218852 Change subject: Make travis work again (hopefully). .. Make travis work again (hopefully). Change-Id: Ia35b7512da2ff6035f2e793eca1d2b95a3b846be --- M build/travis/after_script.sh M build/travis/before_script.sh M composer.json 3 files changed, 24 insertions(+), 9 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikidataQuality refs/changes/52/218852/1 diff --git a/build/travis/after_script.sh b/build/travis/after_script.sh index 29ac374..8acb827 100644 --- a/build/travis/after_script.sh +++ b/build/travis/after_script.sh @@ -1,5 +1,5 @@ #! /bin/bash cd ../wiki/extensions/WikibaseQuality -composer remove wikibase/wikibase + php vendor/bin/coveralls -v \ No newline at end of file diff --git a/build/travis/before_script.sh b/build/travis/before_script.sh index d867cda..f55a7d8 100644 --- a/build/travis/before_script.sh +++ b/build/travis/before_script.sh @@ -1,3 +1,5 @@ +#! /bin/bash + set -x originalDirectory=$(pwd) @@ -12,6 +14,12 @@ rm master.tar.gz mv mediawiki-master wiki +# checkout wikibase +wget https://github.com/wikimedia/mediawiki-extensions-Wikibase/archive/master.tar.gz +tar -zxf master.tar.gz +rm master.tar.gz +mv mediawiki-extensions-Wikibase-master wiki/extensions/Wikibase + cd wiki if [ $DBTYPE == mysql ] @@ -19,22 +27,32 @@ mysql -e 'CREATE DATABASE its_a_mw;' fi -composer install +composer install --no-dev php maintenance/install.php --dbtype $DBTYPE --dbuser root --dbname its_a_mw --dbpath $(pwd) --pass nyan TravisWiki admin cd extensions + cp -r $originalDirectory WikibaseQuality + cd WikibaseQuality -composer install +composer install --dev --no-interaction --prefer-source + +cd ../Wikibase +composer install --prefer-source cd ../.. + echo 'error_reporting(E_ALL| E_STRICT);' LocalSettings.php echo 'ini_set(display_errors, 1);' LocalSettings.php echo '$wgShowExceptionDetails = true;' LocalSettings.php echo '$wgDevelopmentWarnings = true;' LocalSettings.php -echo putenv( 'MW_INSTALL_PATH=$(pwd)' ); LocalSettings.php +echo '$wgLanguageCode = en;' LocalSettings.php -echo require_once( __DIR__ . '/extensions/WikibaseQuality/vendor/autoload.php' ); LocalSettings.php -echo require_once( __DIR__ . '/extensions/WikibaseQuality/extensions/Wikibase/repo/ExampleSettings.php' ); LocalSettings.php +echo define( 'WB_EXPERIMENTAL_FEATURES', true ); LocalSettings.php +echo 'require_once __DIR__ . /extensions/Wikibase/repo/Wikibase.php;' LocalSettings.php +echo 'require_once __DIR__ . /extensions/Wikibase/repo/ExampleSettings.php;' LocalSettings.php +echo 'require_once __DIR__ . /extensions/Wikibase/client/WikibaseClient.php;' LocalSettings.php +echo 'require_once __DIR__ . /extensions/WikibaseQuality/WikibaseQuality.php;' LocalSettings.php +echo '$wgWBClientSettings[siteGlobalID] = enwiki;' LocalSettings.php php maintenance/update.php --quick \ No newline at end of file diff --git a/composer.json b/composer.json index c925cec..5c26798 100755 --- a/composer.json +++ b/composer.json @@ -31,9 +31,6 @@ }, classmap: [ WikibaseQualityHooks.php - ], - files: [ - WikibaseQuality.php ] } } -- To view, visit https://gerrit.wikimedia.org/r/218852 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia35b7512da2ff6035f2e793eca1d2b95a3b846be Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/WikidataQuality Gerrit-Branch: v1 Gerrit-Owner: Soeren.oldag soeren_ol...@freenet.de ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Removed unnecessary dependency. - change (mediawiki...WikidataQualityExternalValidation)
Soeren.oldag has uploaded a new change for review.
https://gerrit.wikimedia.org/r/218876
Change subject: Removed unnecessary dependency.
..
Removed unnecessary dependency.
Change-Id: I3fe9001f1d50d32deed714880c2884fdba5053d9
---
M composer.json
1 file changed, 0 insertions(+), 1 deletion(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikidataQualityExternalValidation
refs/changes/76/218876/1
diff --git a/composer.json b/composer.json
index f951eb7..0a70677 100755
--- a/composer.json
+++ b/composer.json
@@ -21,7 +21,6 @@
],
require: {
php: =5.3.0,
- composer/installers: 1.*,=1.0.1,
wikibase/data-model: ~3.0,
wikibase/data-model-serialization: ~1.3,
serialization/serialization: 3.*,=3.2.1
--
To view, visit https://gerrit.wikimedia.org/r/218876
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3fe9001f1d50d32deed714880c2884fdba5053d9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikidataQualityExternalValidation
Gerrit-Branch: master
Gerrit-Owner: Soeren.oldag soeren_ol...@freenet.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Removed unnecessary dependency. - change (mediawiki...WikidataQualityExternalValidation)
Soeren.oldag has uploaded a new change for review.
https://gerrit.wikimedia.org/r/218877
Change subject: Removed unnecessary dependency.
..
Removed unnecessary dependency.
Change-Id: I3fe9001f1d50d32deed714880c2884fdba5053d9
---
M composer.json
1 file changed, 0 insertions(+), 1 deletion(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikidataQualityExternalValidation
refs/changes/77/218877/1
diff --git a/composer.json b/composer.json
index f951eb7..0a70677 100755
--- a/composer.json
+++ b/composer.json
@@ -21,7 +21,6 @@
],
require: {
php: =5.3.0,
- composer/installers: 1.*,=1.0.1,
wikibase/data-model: ~3.0,
wikibase/data-model-serialization: ~1.3,
serialization/serialization: 3.*,=3.2.1
--
To view, visit https://gerrit.wikimedia.org/r/218877
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3fe9001f1d50d32deed714880c2884fdba5053d9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikidataQualityExternalValidation
Gerrit-Branch: v1
Gerrit-Owner: Soeren.oldag soeren_ol...@freenet.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fixed table constant. - change (mediawiki...WikidataQuality)
Soeren.oldag has uploaded a new change for review.
https://gerrit.wikimedia.org/r/218848
Change subject: Fixed table constant.
..
Fixed table constant.
Change-Id: I92b8f9a56eefc15cc4c51e7822a5abe176a323d8
---
M WikibaseQualityHooks.php
1 file changed, 1 insertion(+), 2 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikidataQuality
refs/changes/48/218848/1
diff --git a/WikibaseQualityHooks.php b/WikibaseQualityHooks.php
index 99d76f4..8bff337 100755
--- a/WikibaseQualityHooks.php
+++ b/WikibaseQualityHooks.php
@@ -8,8 +8,7 @@
* @return bool
*/
public static function onCreateSchema( DatabaseUpdater $updater ) {
- $updater-addExtensionTable( VIOLATION_TABLE, __DIR__ .
'/sql/create_wbq_violations.sql' );
- $updater-addExtensionTable( EVALUATION_TABLE, __DIR__ .
'/sql/create_wbq_evaluation.sql' );
+ $updater-addExtensionTable( 'wbq_violations', __DIR__ .
'/sql/create_wbq_violations.sql' );
return true;
}
--
To view, visit https://gerrit.wikimedia.org/r/218848
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I92b8f9a56eefc15cc4c51e7822a5abe176a323d8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikidataQuality
Gerrit-Branch: v1
Gerrit-Owner: Soeren.oldag soeren_ol...@freenet.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Make tests compatible with phpunit 3.7.37. - change (mediawiki...WikidataQuality)
Soeren.oldag has uploaded a new change for review. https://gerrit.wikimedia.org/r/218846 Change subject: Make tests compatible with phpunit 3.7.37. .. Make tests compatible with phpunit 3.7.37. Change-Id: I9ad388d179457c720f14c2b8574015bbcfa4dfb7 --- M tests/phpunit/Html/HtmlTableBuilderTest.php 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikidataQuality refs/changes/46/218846/1 diff --git a/tests/phpunit/Html/HtmlTableBuilderTest.php b/tests/phpunit/Html/HtmlTableBuilderTest.php index eb9af58..b35d480 100755 --- a/tests/phpunit/Html/HtmlTableBuilderTest.php +++ b/tests/phpunit/Html/HtmlTableBuilderTest.php @@ -249,7 +249,7 @@ $cellMock -expects( $this-any() ) -method( 'toHtml' ) - -willReturn( th$content/th ); + -will( $this-returnValue( th$content/th ) ); return $cellMock; } @@ -269,7 +269,7 @@ $cellMock -expects( $this-any() ) -method( 'toHtml' ) - -willReturn( td$content/td ); + -will( $this-returnValue( td$content/td ) ); return $cellMock; } -- To view, visit https://gerrit.wikimedia.org/r/218846 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9ad388d179457c720f14c2b8574015bbcfa4dfb7 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/WikidataQuality Gerrit-Branch: master Gerrit-Owner: Soeren.oldag soeren_ol...@freenet.de Gerrit-Reviewer: JanZerebecki jan.wikime...@zerebecki.de ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Make travis work again (hopefully). - change (mediawiki...WikidataQualityExternalValidation)
Soeren.oldag has uploaded a new change for review.
https://gerrit.wikimedia.org/r/218861
Change subject: Make travis work again (hopefully).
..
Make travis work again (hopefully).
Change-Id: I86c7269634d1fb693945c3d568f5232b43b4efd8
---
M build/travis/after_script.sh
M build/travis/before_script.sh
M composer.json
3 files changed, 38 insertions(+), 16 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikidataQualityExternalValidation
refs/changes/61/218861/1
diff --git a/build/travis/after_script.sh b/build/travis/after_script.sh
index 9a3084f..1fb6b07 100644
--- a/build/travis/after_script.sh
+++ b/build/travis/after_script.sh
@@ -1,6 +1,5 @@
#! /bin/bash
-cd ../wiki/extensions/WikibaseQualityExternalValidation
-composer remove wikibase/quality
-composer remove wikibase/wikibase
+cd ../wiki/extensions//WikibaseQualityExternalValidation
+
php vendor/bin/coveralls -v
\ No newline at end of file
diff --git a/build/travis/before_script.sh b/build/travis/before_script.sh
index 35b9f17..91840d3 100644
--- a/build/travis/before_script.sh
+++ b/build/travis/before_script.sh
@@ -1,3 +1,5 @@
+#! /bin/bash
+
set -x
originalDirectory=$(pwd)
@@ -12,6 +14,18 @@
rm master.tar.gz
mv mediawiki-master wiki
+# checkout wikibase
+wget
https://github.com/wikimedia/mediawiki-extensions-Wikibase/archive/master.tar.gz
+tar -zxf master.tar.gz
+rm master.tar.gz
+mv mediawiki-extensions-Wikibase-master wiki/extensions/Wikibase
+
+# checkout WikibaseQuality
+wget
https://github.com/wikimedia/mediawiki-extensions-WikidataQuality/archive/master.tar.gz
+tar -zxf master.tar.gz
+rm master.tar.gz
+mv mediawiki-extensions-WikidataQuality-master wiki/extensions/WikibaseQuality
+
cd wiki
if [ $DBTYPE == mysql ]
@@ -19,22 +33,36 @@
mysql -e 'CREATE DATABASE its_a_mw;'
fi
-composer install
+composer install --no-dev
php maintenance/install.php --dbtype $DBTYPE --dbuser root --dbname its_a_mw
--dbpath $(pwd) --pass nyan TravisWiki admin
-cd extensions
+cd extensions/WikibaseQuality
+composer install --dev --no-interaction --prefer-source
+
+cd ..
+
cp -r $originalDirectory WikibaseQualityExternalValidation
+
cd WikibaseQualityExternalValidation
-composer install
+composer install --prefer-source
+
+cd ../Wikibase
+composer install --prefer-source
cd ../..
+
echo 'error_reporting(E_ALL| E_STRICT);' LocalSettings.php
echo 'ini_set(display_errors, 1);' LocalSettings.php
echo '$wgShowExceptionDetails = true;' LocalSettings.php
echo '$wgDevelopmentWarnings = true;' LocalSettings.php
-echo putenv( 'MW_INSTALL_PATH=$(pwd)' ); LocalSettings.php
+echo '$wgLanguageCode = en;' LocalSettings.php
-echo require_once( __DIR__ .
'/extensions/WikibaseQualityExternalValidation/vendor/autoload.php' );
LocalSettings.php
-echo require_once( __DIR__ .
'/extensions/WikibaseQualityExternalValidation/extensions/Wikibase/repo/ExampleSettings.php'
); LocalSettings.php
+echo define( 'WB_EXPERIMENTAL_FEATURES', true ); LocalSettings.php
+echo 'require_once __DIR__ . /extensions/Wikibase/repo/Wikibase.php;'
LocalSettings.php
+echo 'require_once __DIR__ . /extensions/Wikibase/repo/ExampleSettings.php;'
LocalSettings.php
+echo 'require_once __DIR__ .
/extensions/Wikibase/client/WikibaseClient.php;' LocalSettings.php
+echo 'require_once __DIR__ .
/extensions/WikibaseQuality/WikibaseQuality.php;' LocalSettings.php
+echo 'require_once __DIR__ .
/extensions/WikibaseQualityExternalValidation/WikibaseQualityExternalValidation.php;'
LocalSettings.php
+echo '$wgWBClientSettings[siteGlobalID] = enwiki;' LocalSettings.php
php maintenance/update.php --quick
\ No newline at end of file
diff --git a/composer.json b/composer.json
index de9189f..a6ffdc0 100755
--- a/composer.json
+++ b/composer.json
@@ -22,11 +22,9 @@
require: {
php: =5.3.0,
composer/installers: 1.*,=1.0.1,
- wikibase/wikibase: dev-master,
wikibase/data-model: ~2.6,
wikibase/data-model-serialization: ~1.3,
- serialization/serialization: 3.*,=3.2.1,
- wikibase/quality: dev-master
+ serialization/serialization: 3.*,=3.2.1
},
require-dev: {
phpunit/phpunit: ~4.5,
@@ -42,9 +40,6 @@
classmap: [
WikibaseQualityExternalValidationHooks.php,
maintenance/UpdateTable.php
- ],
- files: [
- WikibaseQualityExternalValidation.php
]
}
-}
\ No newline at end of file
+}
--
To view, visit https://gerrit.wikimedia.org/r/218861
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I86c7269634d1fb693945c3d568f5232b43b4efd8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikidataQualityExternalValidation
[MediaWiki-commits] [Gerrit] Make travis work again (hopefully). - change (mediawiki...WikidataQualityExternalValidation)
Soeren.oldag has submitted this change and it was merged.
Change subject: Make travis work again (hopefully).
..
Make travis work again (hopefully).
Change-Id: I86c7269634d1fb693945c3d568f5232b43b4efd8
---
M build/travis/after_script.sh
M build/travis/before_script.sh
M composer.json
3 files changed, 38 insertions(+), 16 deletions(-)
Approvals:
Soeren.oldag: Verified; Looks good to me, approved
diff --git a/build/travis/after_script.sh b/build/travis/after_script.sh
index 9a3084f..1fb6b07 100644
--- a/build/travis/after_script.sh
+++ b/build/travis/after_script.sh
@@ -1,6 +1,5 @@
#! /bin/bash
-cd ../wiki/extensions/WikibaseQualityExternalValidation
-composer remove wikibase/quality
-composer remove wikibase/wikibase
+cd ../wiki/extensions//WikibaseQualityExternalValidation
+
php vendor/bin/coveralls -v
\ No newline at end of file
diff --git a/build/travis/before_script.sh b/build/travis/before_script.sh
index 35b9f17..91840d3 100644
--- a/build/travis/before_script.sh
+++ b/build/travis/before_script.sh
@@ -1,3 +1,5 @@
+#! /bin/bash
+
set -x
originalDirectory=$(pwd)
@@ -12,6 +14,18 @@
rm master.tar.gz
mv mediawiki-master wiki
+# checkout wikibase
+wget
https://github.com/wikimedia/mediawiki-extensions-Wikibase/archive/master.tar.gz
+tar -zxf master.tar.gz
+rm master.tar.gz
+mv mediawiki-extensions-Wikibase-master wiki/extensions/Wikibase
+
+# checkout WikibaseQuality
+wget
https://github.com/wikimedia/mediawiki-extensions-WikidataQuality/archive/master.tar.gz
+tar -zxf master.tar.gz
+rm master.tar.gz
+mv mediawiki-extensions-WikidataQuality-master wiki/extensions/WikibaseQuality
+
cd wiki
if [ $DBTYPE == mysql ]
@@ -19,22 +33,36 @@
mysql -e 'CREATE DATABASE its_a_mw;'
fi
-composer install
+composer install --no-dev
php maintenance/install.php --dbtype $DBTYPE --dbuser root --dbname its_a_mw
--dbpath $(pwd) --pass nyan TravisWiki admin
-cd extensions
+cd extensions/WikibaseQuality
+composer install --dev --no-interaction --prefer-source
+
+cd ..
+
cp -r $originalDirectory WikibaseQualityExternalValidation
+
cd WikibaseQualityExternalValidation
-composer install
+composer install --prefer-source
+
+cd ../Wikibase
+composer install --prefer-source
cd ../..
+
echo 'error_reporting(E_ALL| E_STRICT);' LocalSettings.php
echo 'ini_set(display_errors, 1);' LocalSettings.php
echo '$wgShowExceptionDetails = true;' LocalSettings.php
echo '$wgDevelopmentWarnings = true;' LocalSettings.php
-echo putenv( 'MW_INSTALL_PATH=$(pwd)' ); LocalSettings.php
+echo '$wgLanguageCode = en;' LocalSettings.php
-echo require_once( __DIR__ .
'/extensions/WikibaseQualityExternalValidation/vendor/autoload.php' );
LocalSettings.php
-echo require_once( __DIR__ .
'/extensions/WikibaseQualityExternalValidation/extensions/Wikibase/repo/ExampleSettings.php'
); LocalSettings.php
+echo define( 'WB_EXPERIMENTAL_FEATURES', true ); LocalSettings.php
+echo 'require_once __DIR__ . /extensions/Wikibase/repo/Wikibase.php;'
LocalSettings.php
+echo 'require_once __DIR__ . /extensions/Wikibase/repo/ExampleSettings.php;'
LocalSettings.php
+echo 'require_once __DIR__ .
/extensions/Wikibase/client/WikibaseClient.php;' LocalSettings.php
+echo 'require_once __DIR__ .
/extensions/WikibaseQuality/WikibaseQuality.php;' LocalSettings.php
+echo 'require_once __DIR__ .
/extensions/WikibaseQualityExternalValidation/WikibaseQualityExternalValidation.php;'
LocalSettings.php
+echo '$wgWBClientSettings[siteGlobalID] = enwiki;' LocalSettings.php
php maintenance/update.php --quick
\ No newline at end of file
diff --git a/composer.json b/composer.json
index de9189f..a6ffdc0 100755
--- a/composer.json
+++ b/composer.json
@@ -22,11 +22,9 @@
require: {
php: =5.3.0,
composer/installers: 1.*,=1.0.1,
- wikibase/wikibase: dev-master,
wikibase/data-model: ~2.6,
wikibase/data-model-serialization: ~1.3,
- serialization/serialization: 3.*,=3.2.1,
- wikibase/quality: dev-master
+ serialization/serialization: 3.*,=3.2.1
},
require-dev: {
phpunit/phpunit: ~4.5,
@@ -42,9 +40,6 @@
classmap: [
WikibaseQualityExternalValidationHooks.php,
maintenance/UpdateTable.php
- ],
- files: [
- WikibaseQualityExternalValidation.php
]
}
-}
\ No newline at end of file
+}
--
To view, visit https://gerrit.wikimedia.org/r/218861
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I86c7269634d1fb693945c3d568f5232b43b4efd8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikidataQualityExternalValidation
Gerrit-Branch: master
Gerrit-Owner: Soeren.oldag soeren_ol...@freenet.de
Gerrit-Reviewer: Soeren.oldag
[MediaWiki-commits] [Gerrit] Make travis work again (hopefully) - change (mediawiki...WikidataQualityConstraints)
Soeren.oldag has uploaded a new change for review.
https://gerrit.wikimedia.org/r/218873
Change subject: Make travis work again (hopefully)
..
Make travis work again (hopefully)
Change-Id: I9e20f6b9f272693bc350dfd41034ac0f0065b898
---
M build/travis/after_script.sh
M build/travis/before_script.sh
M composer.json
3 files changed, 36 insertions(+), 15 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikidataQualityConstraints
refs/changes/73/218873/1
diff --git a/build/travis/after_script.sh b/build/travis/after_script.sh
index 5fd72bf..d8ea624 100644
--- a/build/travis/after_script.sh
+++ b/build/travis/after_script.sh
@@ -1,6 +1,5 @@
#! /bin/bash
cd ../wiki/extensions/WikibaseQualityConstraints
-composer remove wikibase/quality
-composer remove wikibase/wikibase
+
php vendor/bin/coveralls -v
\ No newline at end of file
diff --git a/build/travis/before_script.sh b/build/travis/before_script.sh
index 3adf120..d16c1f8 100644
--- a/build/travis/before_script.sh
+++ b/build/travis/before_script.sh
@@ -1,3 +1,5 @@
+#! /bin/bash
+
set -x
originalDirectory=$(pwd)
@@ -12,6 +14,18 @@
rm master.tar.gz
mv mediawiki-master wiki
+# checkout wikibase
+wget
https://github.com/wikimedia/mediawiki-extensions-Wikibase/archive/master.tar.gz
+tar -zxf master.tar.gz
+rm master.tar.gz
+mv mediawiki-extensions-Wikibase-master wiki/extensions/Wikibase
+
+# checkout WikibaseQuality
+wget
https://github.com/wikimedia/mediawiki-extensions-WikidataQuality/archive/v1.tar.gz
+tar -zxf v1.tar.gz
+rm v1.tar.gz
+mv mediawiki-extensions-WikidataQuality-1 wiki/extensions/WikibaseQuality
+
cd wiki
if [ $DBTYPE == mysql ]
@@ -19,22 +33,36 @@
mysql -e 'CREATE DATABASE its_a_mw;'
fi
-composer install
+composer install --no-dev
php maintenance/install.php --dbtype $DBTYPE --dbuser root --dbname its_a_mw
--dbpath $(pwd) --pass nyan TravisWiki admin
-cd extensions
+cd extensions/WikibaseQuality
+composer install --dev --no-interaction --prefer-source
+
+cd ..
+
cp -r $originalDirectory WikibaseQualityConstraints
+
cd WikibaseQualityConstraints
-composer install
+composer install --prefer-source
+
+cd ../Wikibase
+composer install --prefer-source
cd ../..
+
echo 'error_reporting(E_ALL| E_STRICT);' LocalSettings.php
echo 'ini_set(display_errors, 1);' LocalSettings.php
echo '$wgShowExceptionDetails = true;' LocalSettings.php
echo '$wgDevelopmentWarnings = true;' LocalSettings.php
-echo putenv( 'MW_INSTALL_PATH=$(pwd)' ); LocalSettings.php
+echo '$wgLanguageCode = en;' LocalSettings.php
-echo require_once( __DIR__ .
'/extensions/WikibaseQualityConstraints/vendor/autoload.php' );
LocalSettings.php
-echo require_once( __DIR__ .
'/extensions/WikibaseQualityConstraints/extensions/Wikibase/repo/ExampleSettings.php'
); LocalSettings.php
+echo define( 'WB_EXPERIMENTAL_FEATURES', true ); LocalSettings.php
+echo 'require_once __DIR__ . /extensions/Wikibase/repo/Wikibase.php;'
LocalSettings.php
+echo 'require_once __DIR__ . /extensions/Wikibase/repo/ExampleSettings.php;'
LocalSettings.php
+echo 'require_once __DIR__ .
/extensions/Wikibase/client/WikibaseClient.php;' LocalSettings.php
+echo 'require_once __DIR__ .
/extensions/WikibaseQuality/WikibaseQuality.php;' LocalSettings.php
+echo 'require_once __DIR__ .
/extensions/WikibaseQualityConstraints/WikibaseQualityConstraints.php;'
LocalSettings.php
+echo '$wgWBClientSettings[siteGlobalID] = enwiki;' LocalSettings.php
php maintenance/update.php --quick
\ No newline at end of file
diff --git a/composer.json b/composer.json
index da07ac6..fd5b9b2 100644
--- a/composer.json
+++ b/composer.json
@@ -21,10 +21,7 @@
],
require: {
php: =5.3.0,
- composer/installers: 1.*,=1.0.1,
- wikibase/wikibase: dev-master,
- wikibase/data-model: ~3.0,
- wikibase/quality: 1.x-dev
+ wikibase/data-model: ~3.0
},
require-dev: {
phpunit/phpunit: ~4.5,
@@ -39,9 +36,6 @@
},
classmap: [
WikibaseQualityConstraintsHooks.php
- ],
- files: [
- WikibaseQualityConstraints.php
]
}
}
\ No newline at end of file
--
To view, visit https://gerrit.wikimedia.org/r/218873
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9e20f6b9f272693bc350dfd41034ac0f0065b898
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikidataQualityConstraints
Gerrit-Branch: v1
Gerrit-Owner: Soeren.oldag soeren_ol...@freenet.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Upgrade data-model to be compatible to Wikibase. - change (mediawiki...WikidataQualityConstraints)
Soeren.oldag has submitted this change and it was merged.
Change subject: Upgrade data-model to be compatible to Wikibase.
..
Upgrade data-model to be compatible to Wikibase.
Change-Id: I3969ce0f75bbbda14971177a4f9a5feec991e628
---
M composer.json
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Soeren.oldag: Verified; Looks good to me, approved
diff --git a/composer.json b/composer.json
index 848ba51..da07ac6 100644
--- a/composer.json
+++ b/composer.json
@@ -23,7 +23,7 @@
php: =5.3.0,
composer/installers: 1.*,=1.0.1,
wikibase/wikibase: dev-master,
- wikibase/data-model: ~2.6,
+ wikibase/data-model: ~3.0,
wikibase/quality: 1.x-dev
},
require-dev: {
--
To view, visit https://gerrit.wikimedia.org/r/218872
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3969ce0f75bbbda14971177a4f9a5feec991e628
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikidataQualityConstraints
Gerrit-Branch: v1
Gerrit-Owner: Soeren.oldag soeren_ol...@freenet.de
Gerrit-Reviewer: Legoktm legoktm.wikipe...@gmail.com
Gerrit-Reviewer: Soeren.oldag soeren_ol...@freenet.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Extensions may not use composer.json to depend on extensions. - change (mediawiki...WikidataQuality)
Soeren.oldag has uploaded a new change for review.
https://gerrit.wikimedia.org/r/218844
Change subject: Extensions may not use composer.json to depend on extensions.
..
Extensions may not use composer.json to depend on extensions.
Change-Id: I93c052ce64ab4a07e67065ae78ebb1e7b14e83bb
(cherry picked from commit d3d73499f9a60fcdb7ebb27d51bc62bda8a7b805)
---
M composer.json
1 file changed, 2 insertions(+), 4 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikidataQuality
refs/changes/44/218844/1
diff --git a/composer.json b/composer.json
index a604326..2afaec7 100755
--- a/composer.json
+++ b/composer.json
@@ -15,9 +15,7 @@
},
require: {
php: =5.3.0,
- composer/installers: 1.*,=1.0.1,
wikibase/data-model: ~2.6,
- wikibase/wikibase: dev-master,
serialization/serialization: 3.*,=3.2.1
},
require-dev: {
@@ -27,7 +25,7 @@
autoload: {
psr-4: {
WikibaseQuality\\: includes/,
- WikibaseQuality\\Api\\: api/,
+ WikibaseQuality\\Api\\: api/,
WikibaseQuality\\Specials\\: specials/,
WikibaseQuality\\Tests\\: tests/phpunit/
},
@@ -38,4 +36,4 @@
WikibaseQuality.php
]
}
-}
\ No newline at end of file
+}
--
To view, visit https://gerrit.wikimedia.org/r/218844
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I93c052ce64ab4a07e67065ae78ebb1e7b14e83bb
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikidataQuality
Gerrit-Branch: v1
Gerrit-Owner: Soeren.oldag soeren_ol...@freenet.de
Gerrit-Reviewer: JanZerebecki jan.wikime...@zerebecki.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Make travis work again (hopefully). - change (mediawiki...WikidataQuality)
Soeren.oldag has submitted this change and it was merged. Change subject: Make travis work again (hopefully). .. Make travis work again (hopefully). Change-Id: Ia35b7512da2ff6035f2e793eca1d2b95a3b846be --- M build/travis/after_script.sh M build/travis/before_script.sh M composer.json 3 files changed, 24 insertions(+), 9 deletions(-) Approvals: Soeren.oldag: Verified; Looks good to me, approved diff --git a/build/travis/after_script.sh b/build/travis/after_script.sh index 29ac374..8acb827 100644 --- a/build/travis/after_script.sh +++ b/build/travis/after_script.sh @@ -1,5 +1,5 @@ #! /bin/bash cd ../wiki/extensions/WikibaseQuality -composer remove wikibase/wikibase + php vendor/bin/coveralls -v \ No newline at end of file diff --git a/build/travis/before_script.sh b/build/travis/before_script.sh index d867cda..f55a7d8 100644 --- a/build/travis/before_script.sh +++ b/build/travis/before_script.sh @@ -1,3 +1,5 @@ +#! /bin/bash + set -x originalDirectory=$(pwd) @@ -12,6 +14,12 @@ rm master.tar.gz mv mediawiki-master wiki +# checkout wikibase +wget https://github.com/wikimedia/mediawiki-extensions-Wikibase/archive/master.tar.gz +tar -zxf master.tar.gz +rm master.tar.gz +mv mediawiki-extensions-Wikibase-master wiki/extensions/Wikibase + cd wiki if [ $DBTYPE == mysql ] @@ -19,22 +27,32 @@ mysql -e 'CREATE DATABASE its_a_mw;' fi -composer install +composer install --no-dev php maintenance/install.php --dbtype $DBTYPE --dbuser root --dbname its_a_mw --dbpath $(pwd) --pass nyan TravisWiki admin cd extensions + cp -r $originalDirectory WikibaseQuality + cd WikibaseQuality -composer install +composer install --dev --no-interaction --prefer-source + +cd ../Wikibase +composer install --prefer-source cd ../.. + echo 'error_reporting(E_ALL| E_STRICT);' LocalSettings.php echo 'ini_set(display_errors, 1);' LocalSettings.php echo '$wgShowExceptionDetails = true;' LocalSettings.php echo '$wgDevelopmentWarnings = true;' LocalSettings.php -echo putenv( 'MW_INSTALL_PATH=$(pwd)' ); LocalSettings.php +echo '$wgLanguageCode = en;' LocalSettings.php -echo require_once( __DIR__ . '/extensions/WikibaseQuality/vendor/autoload.php' ); LocalSettings.php -echo require_once( __DIR__ . '/extensions/WikibaseQuality/extensions/Wikibase/repo/ExampleSettings.php' ); LocalSettings.php +echo define( 'WB_EXPERIMENTAL_FEATURES', true ); LocalSettings.php +echo 'require_once __DIR__ . /extensions/Wikibase/repo/Wikibase.php;' LocalSettings.php +echo 'require_once __DIR__ . /extensions/Wikibase/repo/ExampleSettings.php;' LocalSettings.php +echo 'require_once __DIR__ . /extensions/Wikibase/client/WikibaseClient.php;' LocalSettings.php +echo 'require_once __DIR__ . /extensions/WikibaseQuality/WikibaseQuality.php;' LocalSettings.php +echo '$wgWBClientSettings[siteGlobalID] = enwiki;' LocalSettings.php php maintenance/update.php --quick \ No newline at end of file diff --git a/composer.json b/composer.json index 699cd8d..c1b91e2 100755 --- a/composer.json +++ b/composer.json @@ -31,9 +31,6 @@ }, classmap: [ WikibaseQualityHooks.php - ], - files: [ - WikibaseQuality.php ] } } -- To view, visit https://gerrit.wikimedia.org/r/218842 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia35b7512da2ff6035f2e793eca1d2b95a3b846be Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/WikidataQuality Gerrit-Branch: master Gerrit-Owner: Soeren.oldag soeren_ol...@freenet.de Gerrit-Reviewer: Soeren.oldag soeren_ol...@freenet.de Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Allow phpunit version 3.7.37 to be compatible to mediawiki c... - change (mediawiki...WikidataQuality)
Soeren.oldag has uploaded a new change for review.
https://gerrit.wikimedia.org/r/218843
Change subject: Allow phpunit version 3.7.37 to be compatible to mediawiki core.
..
Allow phpunit version 3.7.37 to be compatible to mediawiki core.
Change-Id: Ib4db19aebf5821d43d8a173533415695d21176ea
(cherry picked from commit b52ee46e2b0907f3584e29b54cfd589b343d3cf5)
---
M composer.json
1 file changed, 2 insertions(+), 2 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikidataQuality
refs/changes/43/218843/1
diff --git a/composer.json b/composer.json
index a604326..34e070d 100755
--- a/composer.json
+++ b/composer.json
@@ -21,7 +21,7 @@
serialization/serialization: 3.*,=3.2.1
},
require-dev: {
- phpunit/phpunit: ~4.5,
+ phpunit/phpunit: ~3.7,=3.7.37|~4.5,
satooshi/php-coveralls: master-dev
},
autoload: {
@@ -38,4 +38,4 @@
WikibaseQuality.php
]
}
-}
\ No newline at end of file
+}
--
To view, visit https://gerrit.wikimedia.org/r/218843
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib4db19aebf5821d43d8a173533415695d21176ea
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikidataQuality
Gerrit-Branch: v1
Gerrit-Owner: Soeren.oldag soeren_ol...@freenet.de
Gerrit-Reviewer: JanZerebecki jan.wikime...@zerebecki.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Make tests compatible with phpunit 3.7.37 - change (mediawiki...WikidataQuality)
Soeren.oldag has submitted this change and it was merged. Change subject: Make tests compatible with phpunit 3.7.37 .. Make tests compatible with phpunit 3.7.37 Change-Id: I52ce91b8f54f4ab3b2e2c558cd2aa9da743ffdbd --- M tests/phpunit/Html/HtmlTableBuilderTest.php 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Soeren.oldag: Verified; Looks good to me, approved diff --git a/tests/phpunit/Html/HtmlTableBuilderTest.php b/tests/phpunit/Html/HtmlTableBuilderTest.php index eb9af58..b35d480 100755 --- a/tests/phpunit/Html/HtmlTableBuilderTest.php +++ b/tests/phpunit/Html/HtmlTableBuilderTest.php @@ -249,7 +249,7 @@ $cellMock -expects( $this-any() ) -method( 'toHtml' ) - -willReturn( th$content/th ); + -will( $this-returnValue( th$content/th ) ); return $cellMock; } @@ -269,7 +269,7 @@ $cellMock -expects( $this-any() ) -method( 'toHtml' ) - -willReturn( td$content/td ); + -will( $this-returnValue( td$content/td ) ); return $cellMock; } -- To view, visit https://gerrit.wikimedia.org/r/218851 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I52ce91b8f54f4ab3b2e2c558cd2aa9da743ffdbd Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/WikidataQuality Gerrit-Branch: v1 Gerrit-Owner: Soeren.oldag soeren_ol...@freenet.de Gerrit-Reviewer: Soeren.oldag soeren_ol...@freenet.de ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Make tests compatible with phpunit 3.7.37 - change (mediawiki...WikidataQuality)
Soeren.oldag has uploaded a new change for review. https://gerrit.wikimedia.org/r/218851 Change subject: Make tests compatible with phpunit 3.7.37 .. Make tests compatible with phpunit 3.7.37 Change-Id: I52ce91b8f54f4ab3b2e2c558cd2aa9da743ffdbd --- M tests/phpunit/Html/HtmlTableBuilderTest.php 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikidataQuality refs/changes/51/218851/1 diff --git a/tests/phpunit/Html/HtmlTableBuilderTest.php b/tests/phpunit/Html/HtmlTableBuilderTest.php index eb9af58..b35d480 100755 --- a/tests/phpunit/Html/HtmlTableBuilderTest.php +++ b/tests/phpunit/Html/HtmlTableBuilderTest.php @@ -249,7 +249,7 @@ $cellMock -expects( $this-any() ) -method( 'toHtml' ) - -willReturn( th$content/th ); + -will( $this-returnValue( th$content/th ) ); return $cellMock; } @@ -269,7 +269,7 @@ $cellMock -expects( $this-any() ) -method( 'toHtml' ) - -willReturn( td$content/td ); + -will( $this-returnValue( td$content/td ) ); return $cellMock; } -- To view, visit https://gerrit.wikimedia.org/r/218851 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I52ce91b8f54f4ab3b2e2c558cd2aa9da743ffdbd Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/WikidataQuality Gerrit-Branch: v1 Gerrit-Owner: Soeren.oldag soeren_ol...@freenet.de ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Upgrade data-model to be compatible to Wikibase. - change (mediawiki...WikidataQuality)
Soeren.oldag has submitted this change and it was merged.
Change subject: Upgrade data-model to be compatible to Wikibase.
..
Upgrade data-model to be compatible to Wikibase.
Change-Id: Ia5cf79276c124d2d17f950bc803a9f72616668da
---
M composer.json
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Soeren.oldag: Verified; Looks good to me, approved
diff --git a/composer.json b/composer.json
index 5c26798..c1b91e2 100755
--- a/composer.json
+++ b/composer.json
@@ -15,7 +15,7 @@
},
require: {
php: =5.3.0,
- wikibase/data-model: ~2.6,
+ wikibase/data-model: ~3.0,
serialization/serialization: 3.*,=3.2.1
},
require-dev: {
--
To view, visit https://gerrit.wikimedia.org/r/218854
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia5cf79276c124d2d17f950bc803a9f72616668da
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikidataQuality
Gerrit-Branch: v1
Gerrit-Owner: Soeren.oldag soeren_ol...@freenet.de
Gerrit-Reviewer: Legoktm legoktm.wikipe...@gmail.com
Gerrit-Reviewer: Soeren.oldag soeren_ol...@freenet.de
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix entry point for jenkins. - change (mediawiki...WikidataQuality)
Soeren.oldag has uploaded a new change for review. https://gerrit.wikimedia.org/r/218856 Change subject: Fix entry point for jenkins. .. Fix entry point for jenkins. Change-Id: I77dc781f01f0a8cc93745de4ca1afb848b6c9595 --- A build/WikidataQuality.php 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikidataQuality refs/changes/56/218856/1 diff --git a/build/WikidataQuality.php b/build/WikidataQuality.php new file mode 100644 index 000..a3c9c1f --- /dev/null +++ b/build/WikidataQuality.php @@ -0,0 +1,2 @@ +?php +require_once( __DIR__ . '/WikibaseQuality.php' ); \ No newline at end of file -- To view, visit https://gerrit.wikimedia.org/r/218856 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I77dc781f01f0a8cc93745de4ca1afb848b6c9595 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/WikidataQuality Gerrit-Branch: v1 Gerrit-Owner: Soeren.oldag soeren_ol...@freenet.de ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
