Merge "Use ConstraintParameterException::getViolationMessage()"

wikimedia · Feb 19, 2018 · 257ff8b · 257ff8b
2 parents 88ea541 + 3e5a320
commit 257ff8b
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/src/ConstraintCheck/DelegatingConstraintChecker.php b/src/ConstraintCheck/DelegatingConstraintChecker.php
@@ -424,7 +424,7 @@ private function checkConstraintsForMainSnak(
 			try {
 				$exceptions = $this->constraintParameterParser->parseExceptionParameter( $parameters );
 			} catch ( ConstraintParameterException $e ) {
-				$result[] = new CheckResult( $context, $constraint, [], CheckResult::STATUS_BAD_PARAMETERS, $e->getMessage() );
+				$result[] = new CheckResult( $context, $constraint, [], CheckResult::STATUS_BAD_PARAMETERS, $e->getViolationMessage() );
 				continue;
 			}
 
@@ -542,7 +542,7 @@ private function getCheckResultFor( Context $context, Constraint $constraint ) {
 			try {
 				$result = $checker->checkConstraint( $context, $constraint );
 			} catch ( ConstraintParameterException $e ) {
-				$result = new CheckResult( $context, $constraint, [], CheckResult::STATUS_BAD_PARAMETERS, $e->getMessage() );
+				$result = new CheckResult( $context, $constraint, [], CheckResult::STATUS_BAD_PARAMETERS, $e->getViolationMessage() );
 			} catch ( SparqlHelperException $e ) {
 				$message = new ViolationMessage( 'wbqc-violation-message-sparql-error' );
 				$result = new CheckResult( $context, $constraint, [], CheckResult::STATUS_VIOLATION, $message );
@@ -555,7 +555,7 @@ private function getCheckResultFor( Context $context, Constraint $constraint ) {
 				$constraintStatus = $this->constraintParameterParser
 					->parseConstraintStatusParameter( $constraint->getConstraintParameters() );
 			} catch ( ConstraintParameterException $e ) {
-				$result = new CheckResult( $context, $constraint, [], CheckResult::STATUS_BAD_PARAMETERS, $e->getMessage() );
+				$result = new CheckResult( $context, $constraint, [], CheckResult::STATUS_BAD_PARAMETERS, $e->getViolationMessage() );
 				$constraintStatus = null;
 			}
 			if ( $constraintStatus === null ) {
@@ -601,7 +601,7 @@ private function handleScope(
 				$constraint->getConstraintTypeItemId()
 			);
 		} catch ( ConstraintParameterException $e ) {
-			return new CheckResult( $context, $constraint, [], CheckResult::STATUS_BAD_PARAMETERS, $e->getMessage() );
+			return new CheckResult( $context, $constraint, [], CheckResult::STATUS_BAD_PARAMETERS, $e->getViolationMessage() );
 		}
 		if ( $checkedContextTypes === null ) {
 			$checkedContextTypes = $checker->getDefaultContextTypes();

diff --git a/tests/phpunit/Helper/ConstraintParameterParserTest.php b/tests/phpunit/Helper/ConstraintParameterParserTest.php
@@ -93,7 +93,7 @@ private function assertThrowsConstraintParameterException( $method, array $argum
 				$this->constraint,
 				[],
 				CheckResult::STATUS_VIOLATION,
-				$exception->getMessage()
+				$exception->getViolationMessage()
 			);
 			$this->assertViolation( $checkResult, $messageKey );
 		}

diff --git a/tests/phpunit/Helper/SparqlHelperTest.php b/tests/phpunit/Helper/SparqlHelperTest.php
@@ -339,7 +339,7 @@ public function testMatchesRegularExpressionWithSparqlBadRegex() {
 				$this->getMockBuilder( Constraint::class )->disableOriginalConstructor()->getMock(),
 				[],
 				CheckResult::STATUS_VIOLATION,
-				$exception->getMessage()
+				$exception->getViolationMessage()
 			);
 			$this->assertViolation( $checkResult, $messageKey );
 		}