jenkins-bot has submitted this change and it was merged.
Change subject: Fix validation in wbparsevalue.
......................................................................
Fix validation in wbparsevalue.
Change-Id: Ib1dd337d9131a0ba7762cd3d6bf57f6fed47b92f
---
M repo/includes/api/ParseValue.php
M repo/tests/phpunit/includes/api/ParseValueTest.php
2 files changed, 7 insertions(+), 2 deletions(-)
Approvals:
Jonas Kress (WMDE): Looks good to me, approved
jenkins-bot: Verified
diff --git a/repo/includes/api/ParseValue.php b/repo/includes/api/ParseValue.php
index d615343..6a516f0 100644
--- a/repo/includes/api/ParseValue.php
+++ b/repo/includes/api/ParseValue.php
@@ -214,7 +214,7 @@
}
if ( $validator ) {
- $validatorResult = $validator->validate( $value );
+ $validatorResult = $validator->validate( $parseResult );
$validationStatus =
$this->validatorErrorLocalizer->getResultStatus( $validatorResult );
$result['valid'] = $validationStatus->isOK();
diff --git a/repo/tests/phpunit/includes/api/ParseValueTest.php
b/repo/tests/phpunit/includes/api/ParseValueTest.php
index d48af07..46585d4 100644
--- a/repo/tests/phpunit/includes/api/ParseValueTest.php
+++ b/repo/tests/phpunit/includes/api/ParseValueTest.php
@@ -11,6 +11,8 @@
use Wikibase\Repo\Api\ApiErrorReporter;
use Wikibase\Repo\Api\ParseValue;
use Wikibase\Repo\BuilderBasedDataTypeValidatorFactory;
+use Wikibase\Repo\Validators\DataFieldValidator;
+use Wikibase\Repo\Validators\DataValueValidator;
use Wikibase\Repo\ValueParserFactory;
use Wikibase\Repo\WikibaseRepo;
use Wikibase\Repo\Validators\RegexValidator;
@@ -80,7 +82,10 @@
}
public function newArrayWithStringValidator() {
- return array( new RegexValidator( '/INVALID/', true,
'no-kittens' ) );
+ return array(
+ new DataValueValidator(
+ new RegexValidator( '/INVALID/', true,
'no-kittens' )
+ ) );
}
public function newStringDataType( $name ) {
--
To view, visit https://gerrit.wikimedia.org/r/230100
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib1dd337d9131a0ba7762cd3d6bf57f6fed47b92f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Daniel Kinzler <[email protected]>
Gerrit-Reviewer: Addshore <[email protected]>
Gerrit-Reviewer: Jonas Kress (WMDE) <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
