Completed
Pull Request — master (#81)
by
unknown
31s
created
src/ConstraintCheck/Checker/ValueOnlyChecker.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -33,16 +33,16 @@
 block discarded – undo
33 33
 		return self::ALL_ENTITY_TYPES_SUPPORTED;
34 34
 	}
35 35
 
36
-	public function checkConstraint( Context $context, Constraint $constraint ) {
37
-		if ( $context->getType() === Context::TYPE_STATEMENT ) {
38
-			return new CheckResult( $context, $constraint, CheckResult::STATUS_COMPLIANCE );
36
+	public function checkConstraint(Context $context, Constraint $constraint) {
37
+		if ($context->getType() === Context::TYPE_STATEMENT) {
38
+			return new CheckResult($context, $constraint, CheckResult::STATUS_COMPLIANCE);
39 39
 		} else {
40
-			$message = new ViolationMessage( 'wbqc-violation-message-valueOnly' );
41
-			return new CheckResult( $context, $constraint, CheckResult::STATUS_VIOLATION, $message );
40
+			$message = new ViolationMessage('wbqc-violation-message-valueOnly');
41
+			return new CheckResult($context, $constraint, CheckResult::STATUS_VIOLATION, $message);
42 42
 		}
43 43
 	}
44 44
 
45
-	public function checkConstraintParameters( Constraint $constraint ) {
45
+	public function checkConstraintParameters(Constraint $constraint) {
46 46
 		// no parameters
47 47
 		return [];
48 48
 	}
Please login to merge, or discard this patch.
src/ConstraintCheck/Checker/SymmetricChecker.php 1 patch
Spacing   +23 added lines, -23 removed lines patch added patch discarded remove patch
@@ -79,17 +79,17 @@  discard block
 block discarded – undo
79 79
 	 *
80 80
 	 * @return CheckResult
81 81
 	 */
82
-	public function checkConstraint( Context $context, Constraint $constraint ) {
83
-		if ( $context->getSnakRank() === Statement::RANK_DEPRECATED ) {
84
-			return new CheckResult( $context, $constraint, CheckResult::STATUS_DEPRECATED );
82
+	public function checkConstraint(Context $context, Constraint $constraint) {
83
+		if ($context->getSnakRank() === Statement::RANK_DEPRECATED) {
84
+			return new CheckResult($context, $constraint, CheckResult::STATUS_DEPRECATED);
85 85
 		}
86 86
 
87 87
 		$snak = $context->getSnak();
88 88
 		$propertyId = $context->getSnak()->getPropertyId();
89 89
 
90
-		if ( !$snak instanceof PropertyValueSnak ) {
90
+		if (!$snak instanceof PropertyValueSnak) {
91 91
 			// nothing to check
92
-			return new CheckResult( $context, $constraint, CheckResult::STATUS_COMPLIANCE );
92
+			return new CheckResult($context, $constraint, CheckResult::STATUS_COMPLIANCE);
93 93
 		}
94 94
 
95 95
 		$dataValue = $snak->getDataValue();
@@ -98,18 +98,18 @@  discard block
 block discarded – undo
98 98
 		 * error handling:
99 99
 		 *   type of $dataValue for properties with 'Symmetric' constraint has to be 'wikibase-entityid'
100 100
 		 */
101
-		if ( !$dataValue instanceof EntityIdValue ) {
102
-			$message = ( new ViolationMessage( 'wbqc-violation-message-value-needed-of-type' ) )
103
-				->withEntityId( new ItemId( $constraint->getConstraintTypeItemId() ), Role::CONSTRAINT_TYPE_ITEM )
104
-				->withDataValueType( 'wikibase-entityid' );
105
-			return new CheckResult( $context, $constraint, CheckResult::STATUS_VIOLATION, $message );
101
+		if (!$dataValue instanceof EntityIdValue) {
102
+			$message = (new ViolationMessage('wbqc-violation-message-value-needed-of-type'))
103
+				->withEntityId(new ItemId($constraint->getConstraintTypeItemId()), Role::CONSTRAINT_TYPE_ITEM)
104
+				->withDataValueType('wikibase-entityid');
105
+			return new CheckResult($context, $constraint, CheckResult::STATUS_VIOLATION, $message);
106 106
 		}
107 107
 
108 108
 		$targetEntityId = $dataValue->getEntityId();
109
-		$targetEntity = $this->entityLookup->getEntity( $targetEntityId );
110
-		if ( !$targetEntity instanceof StatementListProvider ) {
111
-			$message = new ViolationMessage( 'wbqc-violation-message-target-entity-must-exist' );
112
-			return new CheckResult( $context, $constraint, CheckResult::STATUS_VIOLATION, $message );
109
+		$targetEntity = $this->entityLookup->getEntity($targetEntityId);
110
+		if (!$targetEntity instanceof StatementListProvider) {
111
+			$message = new ViolationMessage('wbqc-violation-message-target-entity-must-exist');
112
+			return new CheckResult($context, $constraint, CheckResult::STATUS_VIOLATION, $message);
113 113
 		}
114 114
 
115 115
 		$symmetricStatement = $this->connectionCheckerHelper->findStatementWithPropertyAndEntityIdValue(
@@ -117,23 +117,23 @@  discard block
 block discarded – undo
117 117
 			$propertyId,
118 118
 			$context->getEntity()->getId()
119 119
 		);
120
-		if ( $symmetricStatement !== null ) {
120
+		if ($symmetricStatement !== null) {
121 121
 			$message = null;
122 122
 			$status = CheckResult::STATUS_COMPLIANCE;
123 123
 		} else {
124
-			$message = ( new ViolationMessage( 'wbqc-violation-message-symmetric' ) )
125
-				->withEntityId( $targetEntityId, Role::SUBJECT )
126
-				->withEntityId( $propertyId, Role::PREDICATE )
127
-				->withEntityId( $context->getEntity()->getId(), Role::OBJECT );
124
+			$message = (new ViolationMessage('wbqc-violation-message-symmetric'))
125
+				->withEntityId($targetEntityId, Role::SUBJECT)
126
+				->withEntityId($propertyId, Role::PREDICATE)
127
+				->withEntityId($context->getEntity()->getId(), Role::OBJECT);
128 128
 			$status = CheckResult::STATUS_VIOLATION;
129 129
 		}
130 130
 
131
-		return ( new CheckResult( $context, $constraint, $status, $message ) )
132
-			->withMetadata( Metadata::ofDependencyMetadata(
133
-				DependencyMetadata::ofEntityId( $targetEntityId ) ) );
131
+		return (new CheckResult($context, $constraint, $status, $message))
132
+			->withMetadata(Metadata::ofDependencyMetadata(
133
+				DependencyMetadata::ofEntityId($targetEntityId) ));
134 134
 	}
135 135
 
136
-	public function checkConstraintParameters( Constraint $constraint ) {
136
+	public function checkConstraintParameters(Constraint $constraint) {
137 137
 		// no parameters
138 138
 		return [];
139 139
 	}
Please login to merge, or discard this patch.
src/ConstraintCheck/Checker/NoBoundsChecker.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -36,17 +36,17 @@  discard block
 block discarded – undo
36 36
 		return self::ALL_ENTITY_TYPES_SUPPORTED;
37 37
 	}
38 38
 
39
-	public function checkConstraint( Context $context, Constraint $constraint ) {
39
+	public function checkConstraint(Context $context, Constraint $constraint) {
40 40
 		$snak = $context->getSnak();
41 41
 
42
-		if ( !$snak instanceof PropertyValueSnak ) {
42
+		if (!$snak instanceof PropertyValueSnak) {
43 43
 			// nothing to check
44
-			return new CheckResult( $context, $constraint, CheckResult::STATUS_COMPLIANCE );
44
+			return new CheckResult($context, $constraint, CheckResult::STATUS_COMPLIANCE);
45 45
 		}
46 46
 
47
-		if ( $snak->getDataValue() instanceof QuantityValue ) {
48
-			$message = ( new ViolationMessage( 'wbqc-violation-message-noBounds' ) )
49
-				->withEntityId( $context->getSnak()->getPropertyId(), Role::CONSTRAINT_PROPERTY );
47
+		if ($snak->getDataValue() instanceof QuantityValue) {
48
+			$message = (new ViolationMessage('wbqc-violation-message-noBounds'))
49
+				->withEntityId($context->getSnak()->getPropertyId(), Role::CONSTRAINT_PROPERTY);
50 50
 			return new CheckResult(
51 51
 				$context,
52 52
 				$constraint,
@@ -55,10 +55,10 @@  discard block
 block discarded – undo
55 55
 			);
56 56
 		}
57 57
 
58
-		return new CheckResult( $context, $constraint, CheckResult::STATUS_COMPLIANCE );
58
+		return new CheckResult($context, $constraint, CheckResult::STATUS_COMPLIANCE);
59 59
 	}
60 60
 
61
-	public function checkConstraintParameters( Constraint $constraint ) {
61
+	public function checkConstraintParameters(Constraint $constraint) {
62 62
 		// no parameters
63 63
 		return [];
64 64
 	}
Please login to merge, or discard this patch.
src/ConstraintCheck/Checker/MandatoryQualifiersChecker.php 1 patch
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -67,9 +67,9 @@  discard block
 block discarded – undo
67 67
 	 * @throws ConstraintParameterException
68 68
 	 * @return CheckResult
69 69
 	 */
70
-	public function checkConstraint( Context $context, Constraint $constraint ) {
71
-		if ( $context->getSnakRank() === Statement::RANK_DEPRECATED ) {
72
-			return new CheckResult( $context, $constraint, CheckResult::STATUS_DEPRECATED );
70
+	public function checkConstraint(Context $context, Constraint $constraint) {
71
+		if ($context->getSnakRank() === Statement::RANK_DEPRECATED) {
72
+			return new CheckResult($context, $constraint, CheckResult::STATUS_DEPRECATED);
73 73
 		}
74 74
 
75 75
 		$constraintParameters = $constraint->getConstraintParameters();
@@ -80,24 +80,24 @@  discard block
 block discarded – undo
80 80
 			$constraintTypeItemId
81 81
 		);
82 82
 
83
-		$message = ( new ViolationMessage( 'wbqc-violation-message-mandatory-qualifier' ) )
84
-			->withEntityId( $context->getSnak()->getPropertyId(), Role::CONSTRAINT_PROPERTY )
85
-			->withEntityId( $propertyId, Role::QUALIFIER_PREDICATE );
83
+		$message = (new ViolationMessage('wbqc-violation-message-mandatory-qualifier'))
84
+			->withEntityId($context->getSnak()->getPropertyId(), Role::CONSTRAINT_PROPERTY)
85
+			->withEntityId($propertyId, Role::QUALIFIER_PREDICATE);
86 86
 		$status = CheckResult::STATUS_VIOLATION;
87 87
 
88 88
 		/** @var Snak $qualifier */
89
-		foreach ( $context->getSnakStatement()->getQualifiers() as $qualifier ) {
90
-			if ( $propertyId->equals( $qualifier->getPropertyId() ) ) {
89
+		foreach ($context->getSnakStatement()->getQualifiers() as $qualifier) {
90
+			if ($propertyId->equals($qualifier->getPropertyId())) {
91 91
 				$message = null;
92 92
 				$status = CheckResult::STATUS_COMPLIANCE;
93 93
 				break;
94 94
 			}
95 95
 		}
96 96
 
97
-		return new CheckResult( $context, $constraint, $status, $message );
97
+		return new CheckResult($context, $constraint, $status, $message);
98 98
 	}
99 99
 
100
-	public function checkConstraintParameters( Constraint $constraint ) {
100
+	public function checkConstraintParameters(Constraint $constraint) {
101 101
 		$constraintParameters = $constraint->getConstraintParameters();
102 102
 		$constraintTypeItemId = $constraint->getConstraintTypeItemId();
103 103
 		$exceptions = [];
@@ -106,7 +106,7 @@  discard block
 block discarded – undo
106 106
 				$constraintParameters,
107 107
 				$constraintTypeItemId
108 108
 			);
109
-		} catch ( ConstraintParameterException $e ) {
109
+		} catch (ConstraintParameterException $e) {
110 110
 			$exceptions[] = $e;
111 111
 		}
112 112
 		return $exceptions;
Please login to merge, or discard this patch.
src/ConstraintCheck/Checker/IntegerChecker.php 1 patch
Spacing   +21 added lines, -22 removed lines patch added patch discarded remove patch
@@ -38,22 +38,21 @@  discard block
 block discarded – undo
38 38
 		return self::ALL_ENTITY_TYPES_SUPPORTED;
39 39
 	}
40 40
 
41
-	public function checkConstraint( Context $context, Constraint $constraint ) {
41
+	public function checkConstraint(Context $context, Constraint $constraint) {
42 42
 		$snak = $context->getSnak();
43 43
 
44
-		if ( !$snak instanceof PropertyValueSnak ) {
44
+		if (!$snak instanceof PropertyValueSnak) {
45 45
 			// nothing to check
46
-			return new CheckResult( $context, $constraint, CheckResult::STATUS_COMPLIANCE );
46
+			return new CheckResult($context, $constraint, CheckResult::STATUS_COMPLIANCE);
47 47
 		}
48 48
 
49
-		$violationMessage = $this->checkSnak( $snak );
49
+		$violationMessage = $this->checkSnak($snak);
50 50
 
51 51
 		return new CheckResult(
52 52
 			$context,
53 53
 			$constraint,
54 54
 			$violationMessage === null ?
55
-				CheckResult::STATUS_COMPLIANCE :
56
-				CheckResult::STATUS_VIOLATION,
55
+				CheckResult::STATUS_COMPLIANCE : CheckResult::STATUS_VIOLATION,
57 56
 			$violationMessage
58 57
 		);
59 58
 	}
@@ -62,23 +61,23 @@  discard block
 block discarded – undo
62 61
 	 * @param PropertyValueSnak $snak
63 62
 	 * @return ViolationMessage|null
64 63
 	 */
65
-	public function checkSnak( PropertyValueSnak $snak ) {
64
+	public function checkSnak(PropertyValueSnak $snak) {
66 65
 		$dataValue = $snak->getDataValue();
67 66
 
68
-		if ( $dataValue instanceof DecimalValue ) {
69
-			if ( !$this->isInteger( $dataValue ) ) {
70
-				return $this->getViolationMessage( 'wbqc-violation-message-integer', $snak );
67
+		if ($dataValue instanceof DecimalValue) {
68
+			if (!$this->isInteger($dataValue)) {
69
+				return $this->getViolationMessage('wbqc-violation-message-integer', $snak);
71 70
 			}
72
-		} elseif ( $dataValue instanceof UnboundedQuantityValue ) {
73
-			if ( !$this->isInteger( $dataValue->getAmount() ) ) {
74
-				return $this->getViolationMessage( 'wbqc-violation-message-integer', $snak );
71
+		} elseif ($dataValue instanceof UnboundedQuantityValue) {
72
+			if (!$this->isInteger($dataValue->getAmount())) {
73
+				return $this->getViolationMessage('wbqc-violation-message-integer', $snak);
75 74
 			} elseif (
76 75
 				$dataValue instanceof QuantityValue && (
77
-					!$this->isInteger( $dataValue->getLowerBound() ) ||
78
-					!$this->isInteger( $dataValue->getUpperBound() )
76
+					!$this->isInteger($dataValue->getLowerBound()) ||
77
+					!$this->isInteger($dataValue->getUpperBound())
79 78
 				)
80 79
 			) {
81
-				return $this->getViolationMessage( 'wbqc-violation-message-integer-bounds', $snak );
80
+				return $this->getViolationMessage('wbqc-violation-message-integer-bounds', $snak);
82 81
 			}
83 82
 		}
84 83
 
@@ -89,7 +88,7 @@  discard block
 block discarded – undo
89 88
 	 * @param DecimalValue $decimalValue
90 89
 	 * @return bool
91 90
 	 */
92
-	private function isInteger( DecimalValue $decimalValue ) {
91
+	private function isInteger(DecimalValue $decimalValue) {
93 92
 		return $decimalValue->getTrimmed()->getFractionalPart() === '';
94 93
 	}
95 94
 
@@ -98,13 +97,13 @@  discard block
 block discarded – undo
98 97
 	 * @param PropertyValueSnak $snak
99 98
 	 * @return ViolationMessage
100 99
 	 */
101
-	private function getViolationMessage( $messageKey, PropertyValueSnak $snak ) {
102
-		return ( new ViolationMessage( $messageKey ) )
103
-			->withEntityId( $snak->getPropertyId(), Role::CONSTRAINT_PROPERTY )
104
-			->withDataValue( $snak->getDataValue() );
100
+	private function getViolationMessage($messageKey, PropertyValueSnak $snak) {
101
+		return (new ViolationMessage($messageKey))
102
+			->withEntityId($snak->getPropertyId(), Role::CONSTRAINT_PROPERTY)
103
+			->withDataValue($snak->getDataValue());
105 104
 	}
106 105
 
107
-	public function checkConstraintParameters( Constraint $constraint ) {
106
+	public function checkConstraintParameters(Constraint $constraint) {
108 107
 		// no parameters
109 108
 		return [];
110 109
 	}
Please login to merge, or discard this patch.
src/ConstraintCheck/Checker/FormatChecker.php 1 patch
Spacing   +42 added lines, -42 removed lines patch added patch discarded remove patch
@@ -94,7 +94,7 @@  discard block
 block discarded – undo
94 94
 	 * @throws ConstraintParameterException
95 95
 	 * @return CheckResult
96 96
 	 */
97
-	public function checkConstraint( Context $context, Constraint $constraint ) {
97
+	public function checkConstraint(Context $context, Constraint $constraint) {
98 98
 		$constraintParameters = $constraint->getConstraintParameters();
99 99
 		$constraintTypeItemId = $constraint->getConstraintTypeItemId();
100 100
 
@@ -109,9 +109,9 @@  discard block
 block discarded – undo
109 109
 
110 110
 		$snak = $context->getSnak();
111 111
 
112
-		if ( !$snak instanceof PropertyValueSnak ) {
112
+		if (!$snak instanceof PropertyValueSnak) {
113 113
 			// nothing to check
114
-			return new CheckResult( $context, $constraint, CheckResult::STATUS_COMPLIANCE );
114
+			return new CheckResult($context, $constraint, CheckResult::STATUS_COMPLIANCE);
115 115
 		}
116 116
 
117 117
 		$dataValue = $snak->getDataValue();
@@ -120,7 +120,7 @@  discard block
 block discarded – undo
120 120
 		 * error handling:
121 121
 		 *   type of $dataValue for properties with 'Format' constraint has to be 'string' or 'monolingualtext'
122 122
 		 */
123
-		switch ( $dataValue->getType() ) {
123
+		switch ($dataValue->getType()) {
124 124
 			case 'string':
125 125
 				$text = $dataValue->getValue();
126 126
 				break;
@@ -130,13 +130,13 @@  discard block
 block discarded – undo
130 130
 				$text = $dataValue->getText();
131 131
 				break;
132 132
 			default:
133
-				$message = ( new ViolationMessage( 'wbqc-violation-message-value-needed-of-types-2' ) )
134
-					->withEntityId( new ItemId( $constraintTypeItemId ), Role::CONSTRAINT_TYPE_ITEM )
135
-					->withDataValueType( 'string' )
136
-					->withDataValueType( 'monolingualtext' );
137
-				return new CheckResult( $context, $constraint, CheckResult::STATUS_VIOLATION, $message );
133
+				$message = (new ViolationMessage('wbqc-violation-message-value-needed-of-types-2'))
134
+					->withEntityId(new ItemId($constraintTypeItemId), Role::CONSTRAINT_TYPE_ITEM)
135
+					->withDataValueType('string')
136
+					->withDataValueType('monolingualtext');
137
+				return new CheckResult($context, $constraint, CheckResult::STATUS_VIOLATION, $message);
138 138
 		}
139
-		$status = $this->runRegexCheck( $text, $format );
139
+		$status = $this->runRegexCheck($text, $format);
140 140
 		$message = $this->formatMessage(
141 141
 			$status,
142 142
 			$text,
@@ -145,7 +145,7 @@  discard block
 block discarded – undo
145 145
 			$syntaxClarifications,
146 146
 			$constraintTypeItemId
147 147
 		);
148
-		return new CheckResult( $context, $constraint, $status, $message );
148
+		return new CheckResult($context, $constraint, $status, $message);
149 149
 	}
150 150
 
151 151
 	private function formatMessage(
@@ -157,74 +157,74 @@  discard block
 block discarded – undo
157 157
 		string $constraintTypeItemId
158 158
 	): ?ViolationMessage {
159 159
 		$message = null;
160
-		if ( $status === CheckResult::STATUS_VIOLATION ) {
161
-			$message = ( new ViolationMessage( 'wbqc-violation-message-format-clarification' ) )
162
-				->withEntityId( $propertyId, Role::CONSTRAINT_PROPERTY )
163
-				->withDataValue( new StringValue( $text ), Role::OBJECT )
164
-				->withInlineCode( $format, Role::CONSTRAINT_PARAMETER_VALUE )
165
-				->withMultilingualText( $syntaxClarifications, Role::CONSTRAINT_PARAMETER_VALUE );
166
-		} elseif ( $status === CheckResult::STATUS_TODO ) {
167
-			$message = ( new ViolationMessage( 'wbqc-violation-message-security-reason' ) )
168
-				->withEntityId( new ItemId( $constraintTypeItemId ), Role::CONSTRAINT_TYPE_ITEM );
160
+		if ($status === CheckResult::STATUS_VIOLATION) {
161
+			$message = (new ViolationMessage('wbqc-violation-message-format-clarification'))
162
+				->withEntityId($propertyId, Role::CONSTRAINT_PROPERTY)
163
+				->withDataValue(new StringValue($text), Role::OBJECT)
164
+				->withInlineCode($format, Role::CONSTRAINT_PARAMETER_VALUE)
165
+				->withMultilingualText($syntaxClarifications, Role::CONSTRAINT_PARAMETER_VALUE);
166
+		} elseif ($status === CheckResult::STATUS_TODO) {
167
+			$message = (new ViolationMessage('wbqc-violation-message-security-reason'))
168
+				->withEntityId(new ItemId($constraintTypeItemId), Role::CONSTRAINT_TYPE_ITEM);
169 169
 		}
170 170
 
171 171
 		return $message;
172 172
 	}
173 173
 
174
-	private function runRegexCheck( string $text, string $format ): string {
175
-		if ( !$this->config->get( 'WBQualityConstraintsCheckFormatConstraint' ) ) {
174
+	private function runRegexCheck(string $text, string $format): string {
175
+		if (!$this->config->get('WBQualityConstraintsCheckFormatConstraint')) {
176 176
 			return CheckResult::STATUS_TODO;
177 177
 		}
178 178
 		if (
179
-			$this->config->get( 'WBQualityConstraintsFormatCheckerShellboxRatio' ) > (float)wfRandom()
179
+			$this->config->get('WBQualityConstraintsFormatCheckerShellboxRatio') > (float) wfRandom()
180 180
 		) {
181
-			return $this->runRegexCheckUsingShellbox( $text, $format );
181
+			return $this->runRegexCheckUsingShellbox($text, $format);
182 182
 		}
183 183
 
184
-		return $this->runRegexCheckUsingSparql( $text, $format );
184
+		return $this->runRegexCheckUsingSparql($text, $format);
185 185
 	}
186 186
 
187
-	private function runRegexCheckUsingShellbox( string $text, string $format ): string {
188
-		if ( !$this->shellboxClientFactory->isEnabled( 'constraint-regex-checker' ) ) {
187
+	private function runRegexCheckUsingShellbox(string $text, string $format): string {
188
+		if (!$this->shellboxClientFactory->isEnabled('constraint-regex-checker')) {
189 189
 			return CheckResult::STATUS_TODO;
190 190
 		}
191 191
 		try {
192
-			$pattern = '/^(?:' . str_replace( '/', '\/', $format ) . ')$/u';
193
-			$shellboxResponse = $this->shellboxClientFactory->getClient( [
194
-				'timeout' => $this->config->get( 'WBQualityConstraintsSparqlMaxMillis' ) / 1000,
192
+			$pattern = '/^(?:'.str_replace('/', '\/', $format).')$/u';
193
+			$shellboxResponse = $this->shellboxClientFactory->getClient([
194
+				'timeout' => $this->config->get('WBQualityConstraintsSparqlMaxMillis') / 1000,
195 195
 				'service' => 'constraint-regex-checker',
196
-			] )->call(
196
+			])->call(
197 197
 				'constraint-regex-checker',
198 198
 				'preg_match',
199
-				[ $pattern, $text ]
199
+				[$pattern, $text]
200 200
 			);
201
-		} catch ( ShellboxError $exception ) {
201
+		} catch (ShellboxError $exception) {
202 202
 			throw new ConstraintParameterException(
203
-				( new ViolationMessage( 'wbqc-violation-message-parameter-regex' ) )
204
-					->withInlineCode( $pattern, Role::CONSTRAINT_PARAMETER_VALUE )
203
+				(new ViolationMessage('wbqc-violation-message-parameter-regex'))
204
+					->withInlineCode($pattern, Role::CONSTRAINT_PARAMETER_VALUE)
205 205
 			);
206 206
 		}
207 207
 
208
-		if ( $shellboxResponse ) {
208
+		if ($shellboxResponse) {
209 209
 			return CheckResult::STATUS_COMPLIANCE;
210 210
 		} else {
211 211
 			return CheckResult::STATUS_VIOLATION;
212 212
 		}
213 213
 	}
214 214
 
215
-	private function runRegexCheckUsingSparql( string $text, string $format ): string {
216
-		if ( $this->sparqlHelper instanceof DummySparqlHelper ) {
215
+	private function runRegexCheckUsingSparql(string $text, string $format): string {
216
+		if ($this->sparqlHelper instanceof DummySparqlHelper) {
217 217
 			return CheckResult::STATUS_TODO;
218 218
 		}
219 219
 
220
-		if ( $this->sparqlHelper->matchesRegularExpression( $text, $format ) ) {
220
+		if ($this->sparqlHelper->matchesRegularExpression($text, $format)) {
221 221
 			return CheckResult::STATUS_COMPLIANCE;
222 222
 		} else {
223 223
 			return CheckResult::STATUS_VIOLATION;
224 224
 		}
225 225
 	}
226 226
 
227
-	public function checkConstraintParameters( Constraint $constraint ) {
227
+	public function checkConstraintParameters(Constraint $constraint) {
228 228
 		$constraintParameters = $constraint->getConstraintParameters();
229 229
 		$constraintTypeItemId = $constraint->getConstraintTypeItemId();
230 230
 		$exceptions = [];
@@ -233,14 +233,14 @@  discard block
 block discarded – undo
233 233
 				$constraintParameters,
234 234
 				$constraintTypeItemId
235 235
 			);
236
-		} catch ( ConstraintParameterException $e ) {
236
+		} catch (ConstraintParameterException $e) {
237 237
 			$exceptions[] = $e;
238 238
 		}
239 239
 		try {
240 240
 			$this->constraintParameterParser->parseSyntaxClarificationParameter(
241 241
 				$constraintParameters
242 242
 			);
243
-		} catch ( ConstraintParameterException $e ) {
243
+		} catch (ConstraintParameterException $e) {
244 244
 			$exceptions[] = $e;
245 245
 		}
246 246
 		return $exceptions;
Please login to merge, or discard this patch.
src/ConstraintCheck/Checker/UniqueValueChecker.php 1 patch
Spacing   +18 added lines, -18 removed lines patch added patch discarded remove patch
@@ -76,18 +76,18 @@  discard block
 block discarded – undo
76 76
 	 * @throws SparqlHelperException if the checker uses SPARQL and the query times out or some other error occurs
77 77
 	 * @return CheckResult
78 78
 	 */
79
-	public function checkConstraint( Context $context, Constraint $constraint ) {
80
-		if ( $context->getSnakRank() === Statement::RANK_DEPRECATED ) {
81
-			return new CheckResult( $context, $constraint, CheckResult::STATUS_DEPRECATED );
79
+	public function checkConstraint(Context $context, Constraint $constraint) {
80
+		if ($context->getSnakRank() === Statement::RANK_DEPRECATED) {
81
+			return new CheckResult($context, $constraint, CheckResult::STATUS_DEPRECATED);
82 82
 		}
83 83
 
84
-		if ( !( $this->sparqlHelper instanceof DummySparqlHelper ) ) {
84
+		if (!($this->sparqlHelper instanceof DummySparqlHelper)) {
85 85
 
86 86
 			$separators = $this->constraintParameterParser->parseSeparatorsParameter(
87 87
 				$constraint->getConstraintParameters()
88 88
 			);
89 89
 
90
-			if ( $context->getType() === 'statement' ) {
90
+			if ($context->getType() === 'statement') {
91 91
 				$statement = $context->getSnakStatement();
92 92
 				'@phan-var Statement $statement';
93 93
 				$result = $this->sparqlHelper->findEntitiesWithSameStatement(
@@ -96,9 +96,9 @@  discard block
 block discarded – undo
96 96
 				);
97 97
 			} else {
98 98
 				$snak = $context->getSnak();
99
-				if ( !$snak instanceof PropertyValueSnak ) {
99
+				if (!$snak instanceof PropertyValueSnak) {
100 100
 					// nothing to check
101
-					return new CheckResult( $context, $constraint, CheckResult::STATUS_COMPLIANCE );
101
+					return new CheckResult($context, $constraint, CheckResult::STATUS_COMPLIANCE);
102 102
 				}
103 103
 				$result = $this->sparqlHelper->findEntitiesWithSameQualifierOrReference(
104 104
 					$context->getEntity()->getId(),
@@ -111,32 +111,32 @@  discard block
 block discarded – undo
111 111
 			$otherEntities = $result->getArray();
112 112
 			$metadata = $result->getMetadata();
113 113
 
114
-			if ( $otherEntities === [] ) {
114
+			if ($otherEntities === []) {
115 115
 				$status = CheckResult::STATUS_COMPLIANCE;
116 116
 				$message = null;
117 117
 			} else {
118
-				$otherEntities = array_values( array_filter( $otherEntities ) ); // remove nulls
118
+				$otherEntities = array_values(array_filter($otherEntities)); // remove nulls
119 119
 				$status = CheckResult::STATUS_VIOLATION;
120
-				$message = ( new ViolationMessage( 'wbqc-violation-message-unique-value' ) )
121
-					->withEntityIdList( $otherEntities, Role::SUBJECT );
120
+				$message = (new ViolationMessage('wbqc-violation-message-unique-value'))
121
+					->withEntityIdList($otherEntities, Role::SUBJECT);
122 122
 			}
123 123
 		} else {
124 124
 			$status = CheckResult::STATUS_TODO;
125
-			$message = ( new ViolationMessage( 'wbqc-violation-message-not-yet-implemented' ) )
126
-				->withEntityId( new ItemId( $constraint->getConstraintTypeItemId() ), Role::CONSTRAINT_TYPE_ITEM );
125
+			$message = (new ViolationMessage('wbqc-violation-message-not-yet-implemented'))
126
+				->withEntityId(new ItemId($constraint->getConstraintTypeItemId()), Role::CONSTRAINT_TYPE_ITEM);
127 127
 			$metadata = Metadata::blank();
128 128
 		}
129 129
 
130
-		return ( new CheckResult( $context, $constraint, $status, $message ) )
131
-			->withMetadata( $metadata );
130
+		return (new CheckResult($context, $constraint, $status, $message))
131
+			->withMetadata($metadata);
132 132
 	}
133 133
 
134
-	public function checkConstraintParameters( Constraint $constraint ) {
134
+	public function checkConstraintParameters(Constraint $constraint) {
135 135
 		$constraintParameters = $constraint->getConstraintParameters();
136 136
 		$exceptions = [];
137 137
 		try {
138
-			$this->constraintParameterParser->parseSeparatorsParameter( $constraintParameters );
139
-		} catch ( ConstraintParameterException $e ) {
138
+			$this->constraintParameterParser->parseSeparatorsParameter($constraintParameters);
139
+		} catch (ConstraintParameterException $e) {
140 140
 			$exceptions[] = $e;
141 141
 		}
142 142
 		return $exceptions;
Please login to merge, or discard this patch.
src/ConstraintCheck/Checker/ContemporaryChecker.php 1 patch
Spacing   +42 added lines, -43 removed lines patch added patch discarded remove patch
@@ -79,7 +79,7 @@  discard block
 block discarded – undo
79 79
 	 * @codeCoverageIgnore This method is purely declarative.
80 80
 	 */
81 81
 	public function getDefaultContextTypes() {
82
-		return [ Context::TYPE_STATEMENT ];
82
+		return [Context::TYPE_STATEMENT];
83 83
 	}
84 84
 
85 85
 	/** @codeCoverageIgnore This method is purely declarative. */
@@ -96,31 +96,31 @@  discard block
 block discarded – undo
96 96
 	 * @return CheckResult
97 97
 	 * @throws \ConfigException
98 98
 	 */
99
-	public function checkConstraint( Context $context, Constraint $constraint ) {
100
-		if ( $context->getSnakRank() === Statement::RANK_DEPRECATED ) {
101
-			return new CheckResult( $context, $constraint, CheckResult::STATUS_DEPRECATED );
99
+	public function checkConstraint(Context $context, Constraint $constraint) {
100
+		if ($context->getSnakRank() === Statement::RANK_DEPRECATED) {
101
+			return new CheckResult($context, $constraint, CheckResult::STATUS_DEPRECATED);
102 102
 		}
103 103
 		$snak = $context->getSnak();
104
-		if ( !$snak instanceof PropertyValueSnak ) {
104
+		if (!$snak instanceof PropertyValueSnak) {
105 105
 			// nothing to check
106
-			return new CheckResult( $context, $constraint, CheckResult::STATUS_COMPLIANCE );
106
+			return new CheckResult($context, $constraint, CheckResult::STATUS_COMPLIANCE);
107 107
 		}
108 108
 
109 109
 		$dataValue = $snak->getDataValue();
110
-		if ( !$dataValue instanceof EntityIdValue ) {
110
+		if (!$dataValue instanceof EntityIdValue) {
111 111
 			// wrong data type
112
-			$message = ( new ViolationMessage( 'wbqc-violation-message-value-needed-of-type' ) )
113
-				->withEntityId( new ItemId( $constraint->getConstraintTypeItemId() ), Role::CONSTRAINT_TYPE_ITEM )
114
-				->withDataValueType( 'wikibase-entityid' );
115
-			return new CheckResult( $context, $constraint, CheckResult::STATUS_VIOLATION, $message );
112
+			$message = (new ViolationMessage('wbqc-violation-message-value-needed-of-type'))
113
+				->withEntityId(new ItemId($constraint->getConstraintTypeItemId()), Role::CONSTRAINT_TYPE_ITEM)
114
+				->withDataValueType('wikibase-entityid');
115
+			return new CheckResult($context, $constraint, CheckResult::STATUS_VIOLATION, $message);
116 116
 		}
117 117
 
118 118
 		$objectId = $dataValue->getEntityId();
119
-		$objectItem = $this->entityLookup->getEntity( $objectId );
120
-		if ( !( $objectItem instanceof StatementListProvider ) ) {
119
+		$objectItem = $this->entityLookup->getEntity($objectId);
120
+		if (!($objectItem instanceof StatementListProvider)) {
121 121
 			// object was deleted/doesn't exist
122
-			$message = new ViolationMessage( 'wbqc-violation-message-value-entity-must-exist' );
123
-			return new CheckResult( $context, $constraint, CheckResult::STATUS_VIOLATION, $message );
122
+			$message = new ViolationMessage('wbqc-violation-message-value-entity-must-exist');
123
+			return new CheckResult($context, $constraint, CheckResult::STATUS_VIOLATION, $message);
124 124
 		}
125 125
 		/** @var Statement[] $objectStatements */
126 126
 		$objectStatements = $objectItem->getStatements()->toArray();
@@ -128,9 +128,9 @@  discard block
 block discarded – undo
128 128
 		$subjectId = $context->getEntity()->getId();
129 129
 		$subjectStatements = $context->getEntity()->getStatements()->toArray();
130 130
 		/** @var String[] $startPropertyIds */
131
-		$startPropertyIds = $this->config->get( self::CONFIG_VARIABLE_START_PROPERTY_IDS );
131
+		$startPropertyIds = $this->config->get(self::CONFIG_VARIABLE_START_PROPERTY_IDS);
132 132
 		/** @var String[] $endPropertyIds */
133
-		$endPropertyIds = $this->config->get( self::CONFIG_VARIABLE_END_PROPERTY_IDS );
133
+		$endPropertyIds = $this->config->get(self::CONFIG_VARIABLE_END_PROPERTY_IDS);
134 134
 		$subjectStartValue = $this->getExtremeValue(
135 135
 			$startPropertyIds,
136 136
 			$subjectStatements,
@@ -152,15 +152,15 @@  discard block
 block discarded – undo
152 152
 			'end'
153 153
 		);
154 154
 		if (
155
-			$this->rangeCheckerHelper->getComparison( $subjectStartValue, $subjectEndValue ) <= 0 &&
156
-			$this->rangeCheckerHelper->getComparison( $objectStartValue, $objectEndValue ) <= 0 && (
157
-				$this->rangeCheckerHelper->getComparison( $subjectEndValue, $objectStartValue ) < 0 ||
158
-				$this->rangeCheckerHelper->getComparison( $objectEndValue, $subjectStartValue ) < 0
155
+			$this->rangeCheckerHelper->getComparison($subjectStartValue, $subjectEndValue) <= 0 &&
156
+			$this->rangeCheckerHelper->getComparison($objectStartValue, $objectEndValue) <= 0 && (
157
+				$this->rangeCheckerHelper->getComparison($subjectEndValue, $objectStartValue) < 0 ||
158
+				$this->rangeCheckerHelper->getComparison($objectEndValue, $subjectStartValue) < 0
159 159
 			)
160 160
 		) {
161 161
 			if (
162 162
 				$subjectEndValue == null ||
163
-				$this->rangeCheckerHelper->getComparison( $objectEndValue, $subjectEndValue ) < 0
163
+				$this->rangeCheckerHelper->getComparison($objectEndValue, $subjectEndValue) < 0
164 164
 			) {
165 165
 				$earlierEntityId = $objectId;
166 166
 				$minEndValue = $objectEndValue;
@@ -185,7 +185,7 @@  discard block
 block discarded – undo
185 185
 			$message = null;
186 186
 			$status = CheckResult::STATUS_COMPLIANCE;
187 187
 		}
188
-		return new CheckResult( $context, $constraint, $status, $message );
188
+		return new CheckResult($context, $constraint, $status, $message);
189 189
 	}
190 190
 
191 191
 	/**
@@ -195,19 +195,19 @@  discard block
 block discarded – undo
195 195
 	 *
196 196
 	 * @return DataValue|null
197 197
 	 */
198
-	private function getExtremeValue( $extremePropertyIds, $statements, $startOrEnd ) {
199
-		if ( $startOrEnd !== 'start' && $startOrEnd !== 'end' ) {
200
-			throw new \InvalidArgumentException( '$startOrEnd must be \'start\' or \'end\'.' );
198
+	private function getExtremeValue($extremePropertyIds, $statements, $startOrEnd) {
199
+		if ($startOrEnd !== 'start' && $startOrEnd !== 'end') {
200
+			throw new \InvalidArgumentException('$startOrEnd must be \'start\' or \'end\'.');
201 201
 		}
202 202
 		$extremeValue = null;
203
-		foreach ( $extremePropertyIds as $extremePropertyId ) {
204
-			$statementList = new StatementList( ...$statements );
205
-			$extremeStatements = $statementList->getByPropertyId( new NumericPropertyId( $extremePropertyId ) );
203
+		foreach ($extremePropertyIds as $extremePropertyId) {
204
+			$statementList = new StatementList(...$statements);
205
+			$extremeStatements = $statementList->getByPropertyId(new NumericPropertyId($extremePropertyId));
206 206
 			/** @var Statement $extremeStatement */
207
-			foreach ( $extremeStatements as $extremeStatement ) {
208
-				if ( $extremeStatement->getRank() !== Statement::RANK_DEPRECATED ) {
207
+			foreach ($extremeStatements as $extremeStatement) {
208
+				if ($extremeStatement->getRank() !== Statement::RANK_DEPRECATED) {
209 209
 					$snak = $extremeStatement->getMainSnak();
210
-					if ( !$snak instanceof PropertyValueSnak ) {
210
+					if (!$snak instanceof PropertyValueSnak) {
211 211
 						return null;
212 212
 					} else {
213 213
 						$comparison = $this->rangeCheckerHelper->getComparison(
@@ -216,8 +216,8 @@  discard block
 block discarded – undo
216 216
 						);
217 217
 						if (
218 218
 							$extremeValue === null ||
219
-							( $startOrEnd === 'start' && $comparison < 0 ) ||
220
-							( $startOrEnd === 'end' && $comparison > 0 )
219
+							($startOrEnd === 'start' && $comparison < 0) ||
220
+							($startOrEnd === 'end' && $comparison > 0)
221 221
 						) {
222 222
 							$extremeValue = $snak->getDataValue();
223 223
 						}
@@ -247,17 +247,16 @@  discard block
 block discarded – undo
247 247
 		DataValue $maxStartValue
248 248
 	) {
249 249
 		$messageKey = $earlierEntityId === $subjectId ?
250
-			'wbqc-violation-message-contemporary-subject-earlier' :
251
-			'wbqc-violation-message-contemporary-value-earlier';
252
-		return ( new ViolationMessage( $messageKey ) )
253
-			->withEntityId( $subjectId, Role::SUBJECT )
254
-			->withEntityId( $propertyId, Role::PREDICATE )
255
-			->withEntityId( $objectId, Role::OBJECT )
256
-			->withDataValue( $minEndValue, Role::OBJECT )
257
-			->withDataValue( $maxStartValue, Role::OBJECT );
250
+			'wbqc-violation-message-contemporary-subject-earlier' : 'wbqc-violation-message-contemporary-value-earlier';
251
+		return (new ViolationMessage($messageKey))
252
+			->withEntityId($subjectId, Role::SUBJECT)
253
+			->withEntityId($propertyId, Role::PREDICATE)
254
+			->withEntityId($objectId, Role::OBJECT)
255
+			->withDataValue($minEndValue, Role::OBJECT)
256
+			->withDataValue($maxStartValue, Role::OBJECT);
258 257
 	}
259 258
 
260
-	public function checkConstraintParameters( Constraint $constraint ) {
259
+	public function checkConstraintParameters(Constraint $constraint) {
261 260
 		// no parameters
262 261
 		return [];
263 262
 	}
Please login to merge, or discard this patch.
src/ConstraintCheck/Checker/RangeChecker.php 1 patch
Spacing   +34 added lines, -34 removed lines patch added patch discarded remove patch
@@ -81,30 +81,30 @@  discard block
 block discarded – undo
81 81
 	 * @throws ConstraintParameterException
82 82
 	 * @return CheckResult
83 83
 	 */
84
-	public function checkConstraint( Context $context, Constraint $constraint ) {
85
-		if ( $context->getSnakRank() === Statement::RANK_DEPRECATED ) {
86
-			return new CheckResult( $context, $constraint, CheckResult::STATUS_DEPRECATED );
84
+	public function checkConstraint(Context $context, Constraint $constraint) {
85
+		if ($context->getSnakRank() === Statement::RANK_DEPRECATED) {
86
+			return new CheckResult($context, $constraint, CheckResult::STATUS_DEPRECATED);
87 87
 		}
88 88
 
89 89
 		$constraintParameters = $constraint->getConstraintParameters();
90 90
 
91 91
 		$snak = $context->getSnak();
92 92
 
93
-		if ( !$snak instanceof PropertyValueSnak ) {
93
+		if (!$snak instanceof PropertyValueSnak) {
94 94
 			// nothing to check
95
-			return new CheckResult( $context, $constraint, CheckResult::STATUS_COMPLIANCE );
95
+			return new CheckResult($context, $constraint, CheckResult::STATUS_COMPLIANCE);
96 96
 		}
97 97
 
98 98
 		$dataValue = $snak->getDataValue();
99 99
 
100
-		list( $min, $max ) = $this->parseRangeParameter(
100
+		list($min, $max) = $this->parseRangeParameter(
101 101
 			$constraintParameters,
102 102
 			$constraint->getConstraintTypeItemId(),
103 103
 			$dataValue->getType()
104 104
 		);
105 105
 
106
-		if ( $this->rangeCheckerHelper->getComparison( $min, $dataValue ) > 0 ||
107
-			 $this->rangeCheckerHelper->getComparison( $dataValue, $max ) > 0
106
+		if ($this->rangeCheckerHelper->getComparison($min, $dataValue) > 0 ||
107
+			 $this->rangeCheckerHelper->getComparison($dataValue, $max) > 0
108 108
 		) {
109 109
 			$message = $this->getViolationMessage(
110 110
 				$context->getSnak()->getPropertyId(),
@@ -120,16 +120,16 @@  discard block
 block discarded – undo
120 120
 
121 121
 		if (
122 122
 			$dataValue instanceof TimeValue &&
123
-			( $min instanceof NowValue || $max instanceof NowValue ) &&
124
-			$this->rangeCheckerHelper->isFutureTime( $dataValue )
123
+			($min instanceof NowValue || $max instanceof NowValue) &&
124
+			$this->rangeCheckerHelper->isFutureTime($dataValue)
125 125
 		) {
126
-			$dependencyMetadata = DependencyMetadata::ofFutureTime( $dataValue );
126
+			$dependencyMetadata = DependencyMetadata::ofFutureTime($dataValue);
127 127
 		} else {
128 128
 			$dependencyMetadata = DependencyMetadata::blank();
129 129
 		}
130 130
 
131
-		return ( new CheckResult( $context, $constraint, $status, $message ) )
132
-			->withMetadata( Metadata::ofDependencyMetadata( $dependencyMetadata ) );
131
+		return (new CheckResult($context, $constraint, $status, $message))
132
+			->withMetadata(Metadata::ofDependencyMetadata($dependencyMetadata));
133 133
 	}
134 134
 
135 135
 	/**
@@ -140,8 +140,8 @@  discard block
 block discarded – undo
140 140
 	 * @throws ConstraintParameterException if the parameter is invalid or missing
141 141
 	 * @return DataValue[] a pair of two data values, either of which may be null to signify an open range
142 142
 	 */
143
-	private function parseRangeParameter( array $constraintParameters, $constraintTypeItemId, $type ) {
144
-		switch ( $type ) {
143
+	private function parseRangeParameter(array $constraintParameters, $constraintTypeItemId, $type) {
144
+		switch ($type) {
145 145
 			case 'quantity':
146 146
 				return $this->constraintParameterParser->parseQuantityRangeParameter(
147 147
 					$constraintParameters,
@@ -155,10 +155,10 @@  discard block
 block discarded – undo
155 155
 		}
156 156
 
157 157
 		throw new ConstraintParameterException(
158
-			( new ViolationMessage( 'wbqc-violation-message-value-needed-of-types-2' ) )
159
-				->withEntityId( new ItemId( $constraintTypeItemId ), Role::CONSTRAINT_TYPE_ITEM )
160
-				->withDataValueType( 'quantity' )
161
-				->withDataValueType( 'time' )
158
+			(new ViolationMessage('wbqc-violation-message-value-needed-of-types-2'))
159
+				->withEntityId(new ItemId($constraintTypeItemId), Role::CONSTRAINT_TYPE_ITEM)
160
+				->withDataValueType('quantity')
161
+				->withDataValueType('time')
162 162
 		);
163 163
 	}
164 164
 
@@ -170,7 +170,7 @@  discard block
 block discarded – undo
170 170
 	 *
171 171
 	 * @return ViolationMessage
172 172
 	 */
173
-	private function getViolationMessage( PropertyId $predicate, DataValue $value, $min, $max ) {
173
+	private function getViolationMessage(PropertyId $predicate, DataValue $value, $min, $max) {
174 174
 		// possible message keys:
175 175
 		// wbqc-violation-message-range-quantity-closed
176 176
 		// wbqc-violation-message-range-quantity-leftopen
@@ -183,39 +183,39 @@  discard block
 block discarded – undo
183 183
 		// wbqc-violation-message-range-time-rightopen
184 184
 		// wbqc-violation-message-range-time-rightopen-leftnow
185 185
 		$messageKey = 'wbqc-violation-message-range';
186
-		$messageKey .= '-' . $value->getType();
186
+		$messageKey .= '-'.$value->getType();
187 187
 		// at least one of $min, $max is set, otherwise there could be no violation
188
-		$messageKey .= '-' . ( $min !== null ? ( $max !== null ? 'closed' : 'rightopen' ) : 'leftopen' );
189
-		if ( $min instanceof NowValue ) {
188
+		$messageKey .= '-'.($min !== null ? ($max !== null ? 'closed' : 'rightopen') : 'leftopen');
189
+		if ($min instanceof NowValue) {
190 190
 			$messageKey .= '-leftnow';
191
-		} elseif ( $max instanceof NowValue ) {
191
+		} elseif ($max instanceof NowValue) {
192 192
 			$messageKey .= '-rightnow';
193 193
 		}
194
-		$message = ( new ViolationMessage( $messageKey ) )
195
-			->withEntityId( $predicate, Role::PREDICATE )
196
-			->withDataValue( $value, Role::OBJECT );
197
-		if ( $min !== null && !( $min instanceof NowValue ) ) {
198
-			$message = $message->withDataValue( $min, Role::OBJECT );
194
+		$message = (new ViolationMessage($messageKey))
195
+			->withEntityId($predicate, Role::PREDICATE)
196
+			->withDataValue($value, Role::OBJECT);
197
+		if ($min !== null && !($min instanceof NowValue)) {
198
+			$message = $message->withDataValue($min, Role::OBJECT);
199 199
 		}
200
-		if ( $max !== null && !( $max instanceof NowValue ) ) {
201
-			$message = $message->withDataValue( $max, Role::OBJECT );
200
+		if ($max !== null && !($max instanceof NowValue)) {
201
+			$message = $message->withDataValue($max, Role::OBJECT);
202 202
 		}
203 203
 		return $message;
204 204
 	}
205 205
 
206
-	public function checkConstraintParameters( Constraint $constraint ) {
206
+	public function checkConstraintParameters(Constraint $constraint) {
207 207
 		$constraintParameters = $constraint->getConstraintParameters();
208 208
 		$exceptions = [];
209 209
 		try {
210 210
 			// we don’t have a data value here, so get the type from the property instead
211 211
 			// (the distinction between data type and data value type is irrelevant for 'quantity' and 'time')
212
-			$type = $this->propertyDataTypeLookup->getDataTypeIdForProperty( $constraint->getPropertyId() );
212
+			$type = $this->propertyDataTypeLookup->getDataTypeIdForProperty($constraint->getPropertyId());
213 213
 			$this->parseRangeParameter(
214 214
 				$constraintParameters,
215 215
 				$constraint->getConstraintTypeItemId(),
216 216
 				$type
217 217
 			);
218
-		} catch ( ConstraintParameterException $e ) {
218
+		} catch (ConstraintParameterException $e) {
219 219
 			$exceptions[] = $e;
220 220
 		}
221 221
 		return $exceptions;
Please login to merge, or discard this patch.