Jonaskeutel has uploaded a new change for review.
https://gerrit.wikimedia.org/r/204040
Change subject: Merge commit 'refs/changes/39/204039/1' of
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikidataQuality into
violationsTable
......................................................................
Merge commit 'refs/changes/39/204039/1' of
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikidataQuality into
violationsTable
Conflicts:
constraint-report/includes/ConstraintCheck/Result/CheckResultToViolationTranslator.php
Change-Id: Iacfd1b1849c6737e5a6c78f03671f5e4e92b8975
---
M
constraint-report/includes/ConstraintCheck/Result/CheckResultToViolationTranslator.php
M constraint-report/specials/SpecialConstraintReport.php
M includes/Violations/Violation.php
3 files changed, 4 insertions(+), 22 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikidataQuality
refs/changes/40/204040/1
diff --git
a/constraint-report/includes/ConstraintCheck/Result/CheckResultToViolationTranslator.php
b/constraint-report/includes/ConstraintCheck/Result/CheckResultToViolationTranslator.php
index 9136958..fafcc36 100644
---
a/constraint-report/includes/ConstraintCheck/Result/CheckResultToViolationTranslator.php
+++
b/constraint-report/includes/ConstraintCheck/Result/CheckResultToViolationTranslator.php
@@ -2,29 +2,12 @@
namespace WikidataQuality\ConstraintReport\ConstraintCheck\Result;
-
-<<<<<<< HEAD (164604 add ResultToViolationTranslator (basic + CheckResult))
use Wikibase\DataModel\Entity\ItemId;
use Wikibase\DataModel\Entity\PropertyId;
use Wikibase\Lib\ClaimGuidGenerator;
use WikidataQuality\Result\ResultToViolationTranslator;
use WikidataQuality\Violations\Violation;
-
-
-class CheckResultToViolationTranslator extends ResultToViolationTranslator{
-
- public function translateToViolation( $checkResultOrArray ) {
- if( $checkResultOrArray instanceof CheckResult ) {
- $checkResultArray = array( $checkResultOrArray );
- } else {
- $checkResultArray = $checkResultOrArray;
-=======
-use Doctrine\Instantiator\Exception\InvalidArgumentException;
-use Wikibase\DataModel\Entity\ItemId;
-use Wikibase\DataModel\Entity\PropertyId;
-use Wikibase\Lib\ClaimGuidGenerator;
-use WikidataQuality\Result\ResultToViolationTranslator;
-use WikidataQuality\Violations\Violation;
+use InvalidArgumentException;
class CheckResultToViolationTranslator extends ResultToViolationTranslator{
@@ -36,7 +19,6 @@
$checkResultArray = $checkResultOrArray;
} else {
throw new InvalidArgumentException;
->>>>>>> BRANCH (3946cd add ResultToViolationTranslator (basic + CheckResult))
}
$violationArray = array();
@@ -65,4 +47,4 @@
return $violationArray;
}
-}
+}
\ No newline at end of file
diff --git a/constraint-report/specials/SpecialConstraintReport.php
b/constraint-report/specials/SpecialConstraintReport.php
index c0318cc..288ebee 100644
--- a/constraint-report/specials/SpecialConstraintReport.php
+++ b/constraint-report/specials/SpecialConstraintReport.php
@@ -297,4 +297,4 @@
$violationStore = new ViolationStore();
$violationStore->insertViolation( $violations );
}
-}
+}
\ No newline at end of file
diff --git a/includes/Violations/Violation.php
b/includes/Violations/Violation.php
index 0dfa304..5ee46dd 100644
--- a/includes/Violations/Violation.php
+++ b/includes/Violations/Violation.php
@@ -215,4 +215,4 @@
public function getStatus() {
return $this->status;
}
-}
+}
\ No newline at end of file
--
To view, visit https://gerrit.wikimedia.org/r/204040
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iacfd1b1849c6737e5a6c78f03671f5e4e92b8975
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikidataQuality
Gerrit-Branch: master
Gerrit-Owner: Jonaskeutel <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
