Completed
Push — master ( f98233...8ccb25 )
by
unknown
39s
created
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
-		[ $min, $max ] = $this->parseRangeParameter(
100
+		[$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.
src/ConstraintCheck/Checker/DiffWithinRangeChecker.php 1 patch
Spacing   +36 added lines, -37 removed lines patch added patch discarded remove patch
@@ -73,8 +73,8 @@  discard block
 block discarded – undo
73 73
 	 * @throws ConstraintParameterException
74 74
 	 * @return array [ DataValue|null $min, DataValue|null $max, NumericPropertyId $property ]
75 75
 	 */
76
-	private function parseConstraintParameters( Constraint $constraint ) {
77
-		[ $min, $max ] = $this->constraintParameterParser->parseQuantityRangeParameter(
76
+	private function parseConstraintParameters(Constraint $constraint) {
77
+		[$min, $max] = $this->constraintParameterParser->parseQuantityRangeParameter(
78 78
 			$constraint->getConstraintParameters(),
79 79
 			$constraint->getConstraintTypeItemId()
80 80
 		);
@@ -83,7 +83,7 @@  discard block
 block discarded – undo
83 83
 			$constraint->getConstraintTypeItemId()
84 84
 		);
85 85
 
86
-		return [ $min, $max, $property ];
86
+		return [$min, $max, $property];
87 87
 	}
88 88
 
89 89
 	/**
@@ -93,13 +93,13 @@  discard block
 block discarded – undo
93 93
 	 *
94 94
 	 * @return bool
95 95
 	 */
96
-	private function rangeInYears( $min, $max ) {
97
-		$yearUnit = $this->config->get( 'WBQualityConstraintsYearUnit' );
96
+	private function rangeInYears($min, $max) {
97
+		$yearUnit = $this->config->get('WBQualityConstraintsYearUnit');
98 98
 
99
-		if ( $min !== null && $min->getUnit() === $yearUnit ) {
99
+		if ($min !== null && $min->getUnit() === $yearUnit) {
100 100
 			return true;
101 101
 		}
102
-		if ( $max !== null && $max->getUnit() === $yearUnit ) {
102
+		if ($max !== null && $max->getUnit() === $yearUnit) {
103 103
 			return true;
104 104
 		}
105 105
 
@@ -115,28 +115,28 @@  discard block
 block discarded – undo
115 115
 	 * @throws ConstraintParameterException
116 116
 	 * @return CheckResult
117 117
 	 */
118
-	public function checkConstraint( Context $context, Constraint $constraint ) {
119
-		if ( $context->getSnakRank() === Statement::RANK_DEPRECATED ) {
120
-			return new CheckResult( $context, $constraint, CheckResult::STATUS_DEPRECATED );
118
+	public function checkConstraint(Context $context, Constraint $constraint) {
119
+		if ($context->getSnakRank() === Statement::RANK_DEPRECATED) {
120
+			return new CheckResult($context, $constraint, CheckResult::STATUS_DEPRECATED);
121 121
 		}
122 122
 
123 123
 		$snak = $context->getSnak();
124 124
 
125
-		if ( !$snak instanceof PropertyValueSnak ) {
125
+		if (!$snak instanceof PropertyValueSnak) {
126 126
 			// nothing to check
127
-			return new CheckResult( $context, $constraint, CheckResult::STATUS_COMPLIANCE );
127
+			return new CheckResult($context, $constraint, CheckResult::STATUS_COMPLIANCE);
128 128
 		}
129 129
 
130 130
 		$minuend = $snak->getDataValue();
131 131
 		'@phan-var \DataValues\TimeValue|\DataValues\QuantityValue|\DataValues\UnboundedQuantityValue $minuend';
132 132
 
133 133
 		/** @var NumericPropertyId $property */
134
-		[ $min, $max, $property ] = $this->parseConstraintParameters( $constraint );
134
+		[$min, $max, $property] = $this->parseConstraintParameters($constraint);
135 135
 
136 136
 		// checks only the first occurrence of the referenced property
137
-		foreach ( $context->getSnakGroup( Context::GROUP_NON_DEPRECATED ) as $otherSnak ) {
137
+		foreach ($context->getSnakGroup(Context::GROUP_NON_DEPRECATED) as $otherSnak) {
138 138
 			if (
139
-				!$property->equals( $otherSnak->getPropertyId() ) ||
139
+				!$property->equals($otherSnak->getPropertyId()) ||
140 140
 				!$otherSnak instanceof PropertyValueSnak
141 141
 			) {
142 142
 				continue;
@@ -144,30 +144,29 @@  discard block
 block discarded – undo
144 144
 
145 145
 			$subtrahend = $otherSnak->getDataValue();
146 146
 			'@phan-var \DataValues\TimeValue|\DataValues\QuantityValue|\DataValues\UnboundedQuantityValue $subtrahend';
147
-			if ( $subtrahend->getType() === $minuend->getType() ) {
148
-				$diff = $this->rangeInYears( $min, $max ) && $minuend->getType() === 'time' ?
149
-					$this->rangeCheckerHelper->getDifferenceInYears( $minuend, $subtrahend ) :
150
-					$this->rangeCheckerHelper->getDifference( $minuend, $subtrahend );
147
+			if ($subtrahend->getType() === $minuend->getType()) {
148
+				$diff = $this->rangeInYears($min, $max) && $minuend->getType() === 'time' ?
149
+					$this->rangeCheckerHelper->getDifferenceInYears($minuend, $subtrahend) : $this->rangeCheckerHelper->getDifference($minuend, $subtrahend);
151 150
 
152
-				if ( $this->rangeCheckerHelper->getComparison( $min, $diff ) > 0 ||
153
-					$this->rangeCheckerHelper->getComparison( $diff, $max ) > 0
151
+				if ($this->rangeCheckerHelper->getComparison($min, $diff) > 0 ||
152
+					$this->rangeCheckerHelper->getComparison($diff, $max) > 0
154 153
 				) {
155 154
 					// at least one of $min, $max is set at this point, otherwise there could be no violation
156
-					$openness = $min !== null ? ( $max !== null ? '' : '-rightopen' ) : '-leftopen';
155
+					$openness = $min !== null ? ($max !== null ? '' : '-rightopen') : '-leftopen';
157 156
 					// possible message keys:
158 157
 					// wbqc-violation-message-diff-within-range
159 158
 					// wbqc-violation-message-diff-within-range-leftopen
160 159
 					// wbqc-violation-message-diff-within-range-rightopen
161
-					$message = ( new ViolationMessage( "wbqc-violation-message-diff-within-range$openness" ) )
162
-						->withEntityId( $context->getSnak()->getPropertyId(), Role::PREDICATE )
163
-						->withDataValue( $minuend, Role::OBJECT )
164
-						->withEntityId( $otherSnak->getPropertyId(), Role::PREDICATE )
165
-						->withDataValue( $subtrahend, Role::OBJECT );
166
-					if ( $min !== null ) {
167
-						$message = $message->withDataValue( $min, Role::OBJECT );
160
+					$message = (new ViolationMessage("wbqc-violation-message-diff-within-range$openness"))
161
+						->withEntityId($context->getSnak()->getPropertyId(), Role::PREDICATE)
162
+						->withDataValue($minuend, Role::OBJECT)
163
+						->withEntityId($otherSnak->getPropertyId(), Role::PREDICATE)
164
+						->withDataValue($subtrahend, Role::OBJECT);
165
+					if ($min !== null) {
166
+						$message = $message->withDataValue($min, Role::OBJECT);
168 167
 					}
169
-					if ( $max !== null ) {
170
-						$message = $message->withDataValue( $max, Role::OBJECT );
168
+					if ($max !== null) {
169
+						$message = $message->withDataValue($max, Role::OBJECT);
171 170
 					}
172 171
 					$status = CheckResult::STATUS_VIOLATION;
173 172
 				} else {
@@ -175,17 +174,17 @@  discard block
 block discarded – undo
175 174
 					$status = CheckResult::STATUS_COMPLIANCE;
176 175
 				}
177 176
 			} else {
178
-				$message = new ViolationMessage( 'wbqc-violation-message-diff-within-range-must-have-equal-types' );
177
+				$message = new ViolationMessage('wbqc-violation-message-diff-within-range-must-have-equal-types');
179 178
 				$status = CheckResult::STATUS_VIOLATION;
180 179
 			}
181 180
 
182
-			return new CheckResult( $context, $constraint, $status, $message );
181
+			return new CheckResult($context, $constraint, $status, $message);
183 182
 		}
184 183
 
185
-		return new CheckResult( $context, $constraint, CheckResult::STATUS_COMPLIANCE );
184
+		return new CheckResult($context, $constraint, CheckResult::STATUS_COMPLIANCE);
186 185
 	}
187 186
 
188
-	public function checkConstraintParameters( Constraint $constraint ) {
187
+	public function checkConstraintParameters(Constraint $constraint) {
189 188
 		$constraintParameters = $constraint->getConstraintParameters();
190 189
 		$constraintTypeItemId = $constraint->getConstraintTypeItemId();
191 190
 		$exceptions = [];
@@ -194,7 +193,7 @@  discard block
 block discarded – undo
194 193
 				$constraintParameters,
195 194
 				$constraintTypeItemId
196 195
 			);
197
-		} catch ( ConstraintParameterException $e ) {
196
+		} catch (ConstraintParameterException $e) {
198 197
 			$exceptions[] = $e;
199 198
 		}
200 199
 		try {
@@ -202,7 +201,7 @@  discard block
 block discarded – undo
202 201
 				$constraintParameters,
203 202
 				$constraintTypeItemId
204 203
 			);
205
-		} catch ( ConstraintParameterException $e ) {
204
+		} catch (ConstraintParameterException $e) {
206 205
 			$exceptions[] = $e;
207 206
 		}
208 207
 		return $exceptions;
Please login to merge, or discard this patch.
src/ConstraintCheck/Helper/LoggingHelper.php 1 patch
Spacing   +33 added lines, -33 removed lines patch added patch discarded remove patch
@@ -53,12 +53,12 @@  discard block
 block discarded – undo
53 53
 		$this->dataFactory = $dataFactory;
54 54
 		$this->logger = $logger;
55 55
 		$this->constraintCheckDurationLimits = [
56
-			'info' => $config->get( 'WBQualityConstraintsCheckDurationInfoSeconds' ),
57
-			'warning' => $config->get( 'WBQualityConstraintsCheckDurationWarningSeconds' ),
56
+			'info' => $config->get('WBQualityConstraintsCheckDurationInfoSeconds'),
57
+			'warning' => $config->get('WBQualityConstraintsCheckDurationWarningSeconds'),
58 58
 		];
59 59
 		$this->constraintCheckOnEntityDurationLimits = [
60
-			'info' => $config->get( 'WBQualityConstraintsCheckOnEntityDurationInfoSeconds' ),
61
-			'warning' => $config->get( 'WBQualityConstraintsCheckOnEntityDurationWarningSeconds' ),
60
+			'info' => $config->get('WBQualityConstraintsCheckOnEntityDurationInfoSeconds'),
61
+			'warning' => $config->get('WBQualityConstraintsCheckOnEntityDurationWarningSeconds'),
62 62
 		];
63 63
 	}
64 64
 
@@ -69,23 +69,23 @@  discard block
 block discarded – undo
69 69
 	 * @param float $durationSeconds
70 70
 	 * @return array [ $limitSeconds, $logLevel ]
71 71
 	 */
72
-	private function findLimit( $limits, $durationSeconds ) {
72
+	private function findLimit($limits, $durationSeconds) {
73 73
 		$limitSeconds = null;
74 74
 		$logLevel = null;
75 75
 
76
-		foreach ( $limits as $level => $limit ) {
76
+		foreach ($limits as $level => $limit) {
77 77
 			if (
78 78
 				// duration exceeds this limit
79
-				isset( $limit ) && $durationSeconds > $limit &&
79
+				isset($limit) && $durationSeconds > $limit &&
80 80
 				// this limit is longer than previous longest limit
81
-				( $limitSeconds === null || $limit > $limitSeconds )
81
+				($limitSeconds === null || $limit > $limitSeconds)
82 82
 			) {
83 83
 				$limitSeconds = $limit;
84 84
 				$logLevel = $level;
85 85
 			}
86 86
 		}
87 87
 
88
-		return [ $limitSeconds, $logLevel ];
88
+		return [$limitSeconds, $logLevel];
89 89
 	}
90 90
 
91 91
 	/**
@@ -110,31 +110,31 @@  discard block
 block discarded – undo
110 110
 		$durationSeconds,
111 111
 		$method
112 112
 	) {
113
-		$constraintCheckerClassShortName = substr( strrchr( $constraintCheckerClass, '\\' ), 1 );
113
+		$constraintCheckerClassShortName = substr(strrchr($constraintCheckerClass, '\\'), 1);
114 114
 		$constraintTypeItemId = $constraint->getConstraintTypeItemId();
115 115
 
116 116
 		$this->dataFactory->timing(
117
-			'wikibase.quality.constraints.check.timing.' .
118
-				$constraintTypeItemId . '-' .
117
+			'wikibase.quality.constraints.check.timing.'.
118
+				$constraintTypeItemId.'-'.
119 119
 				$constraintCheckerClassShortName,
120 120
 			$durationSeconds * 1000
121 121
 		);
122 122
 
123 123
 		// find the longest limit (and associated log level) that the duration exceeds
124
-		[ $limitSeconds, $logLevel ] = $this->findLimit(
124
+		[$limitSeconds, $logLevel] = $this->findLimit(
125 125
 			$this->constraintCheckDurationLimits,
126 126
 			$durationSeconds
127 127
 		);
128
-		if ( $limitSeconds === null ) {
128
+		if ($limitSeconds === null) {
129 129
 			return;
130 130
 		}
131
-		if ( $context->getType() !== Context::TYPE_STATEMENT ) {
131
+		if ($context->getType() !== Context::TYPE_STATEMENT) {
132 132
 			// TODO log less details but still log something
133 133
 			return;
134 134
 		}
135 135
 
136 136
 		$resultMessage = $result->getMessage();
137
-		if ( $resultMessage !== null ) {
137
+		if ($resultMessage !== null) {
138 138
 			$resultMessageKey = $resultMessage->getMessageKey();
139 139
 		} else {
140 140
 			$resultMessageKey = null;
@@ -142,8 +142,8 @@  discard block
 block discarded – undo
142 142
 
143 143
 		$this->logger->log(
144 144
 			$logLevel,
145
-			'Constraint check with {constraintCheckerClassShortName} ' .
146
-			'took longer than {limitSeconds} second(s) ' .
145
+			'Constraint check with {constraintCheckerClassShortName} '.
146
+			'took longer than {limitSeconds} second(s) '.
147 147
 			'(duration: {durationSeconds} seconds).',
148 148
 			[
149 149
 				'method' => $method,
@@ -153,7 +153,7 @@  discard block
 block discarded – undo
153 153
 				'constraintId' => $constraint->getConstraintId(),
154 154
 				'constraintPropertyId' => $constraint->getPropertyId()->getSerialization(),
155 155
 				'constraintTypeItemId' => $constraintTypeItemId,
156
-				'constraintParameters' => json_encode( $constraint->getConstraintParameters() ),
156
+				'constraintParameters' => json_encode($constraint->getConstraintParameters()),
157 157
 				'constraintCheckerClass' => $constraintCheckerClass,
158 158
 				'constraintCheckerClassShortName' => $constraintCheckerClassShortName,
159 159
 				'entityId' => $context->getEntity()->getId()->getSerialization(),
@@ -188,18 +188,18 @@  discard block
 block discarded – undo
188 188
 		);
189 189
 
190 190
 		// find the longest limit (and associated log level) that the duration exceeds
191
-		[ $limitSeconds, $logLevel ] = $this->findLimit(
191
+		[$limitSeconds, $logLevel] = $this->findLimit(
192 192
 			$this->constraintCheckOnEntityDurationLimits,
193 193
 			$durationSeconds
194 194
 		);
195
-		if ( $limitSeconds === null ) {
195
+		if ($limitSeconds === null) {
196 196
 			return;
197 197
 		}
198 198
 
199 199
 		$this->logger->log(
200 200
 			$logLevel,
201
-			'Full constraint check on {entityId} ' .
202
-			'took longer than {limitSeconds} second(s) ' .
201
+			'Full constraint check on {entityId} '.
202
+			'took longer than {limitSeconds} second(s) '.
203 203
 			'(duration: {durationSeconds} seconds).',
204 204
 			[
205 205
 				'method' => $method,
@@ -217,7 +217,7 @@  discard block
 block discarded – undo
217 217
 	 *
218 218
 	 * @param EntityId $entityId
219 219
 	 */
220
-	public function logCheckConstraintsCacheHit( EntityId $entityId ) {
220
+	public function logCheckConstraintsCacheHit(EntityId $entityId) {
221 221
 		$this->dataFactory->increment(
222 222
 			'wikibase.quality.constraints.cache.entity.hit'
223 223
 		);
@@ -228,10 +228,10 @@  discard block
 block discarded – undo
228 228
 	 *
229 229
 	 * @param EntityId[] $entityIds
230 230
 	 */
231
-	public function logCheckConstraintsCacheMisses( array $entityIds ) {
231
+	public function logCheckConstraintsCacheMisses(array $entityIds) {
232 232
 		$this->dataFactory->updateCount(
233 233
 			'wikibase.quality.constraints.cache.entity.miss',
234
-			count( $entityIds )
234
+			count($entityIds)
235 235
 		);
236 236
 	}
237 237
 
@@ -258,17 +258,17 @@  discard block
 block discarded – undo
258 258
 	 * @param EntityId[] $entityIds
259 259
 	 * @param int $maxRevisionIds
260 260
 	 */
261
-	public function logHugeDependencyMetadata( array $entityIds, $maxRevisionIds ) {
261
+	public function logHugeDependencyMetadata(array $entityIds, $maxRevisionIds) {
262 262
 		$this->logger->log(
263 263
 			'warning',
264
-			'Dependency metadata for constraint check result has huge set of entity IDs ' .
265
-			'(count ' . count( $entityIds ) . ', limit ' . $maxRevisionIds . '); ' .
264
+			'Dependency metadata for constraint check result has huge set of entity IDs '.
265
+			'(count '.count($entityIds).', limit '.$maxRevisionIds.'); '.
266 266
 			'caching disabled for this check result.',
267 267
 			[
268 268
 				'loggingMethod' => __METHOD__,
269 269
 				'entityIds' => json_encode(
270 270
 					array_map(
271
-						static function ( EntityId $entityId ) {
271
+						static function(EntityId $entityId) {
272 272
 							return $entityId->getSerialization();
273 273
 						},
274 274
 						$entityIds
@@ -287,17 +287,17 @@  discard block
 block discarded – undo
287 287
 			'Sparql API replied with status 429 and a retry-after header. Requesting to retry after {retryAfterTime}',
288 288
 			[
289 289
 				'retryAfterTime' => $retryAfterTime,
290
-				'responseHeaders' => json_encode( $request->getResponseHeaders() ),
290
+				'responseHeaders' => json_encode($request->getResponseHeaders()),
291 291
 				'responseContent' => $request->getContent(),
292 292
 			]
293 293
 		);
294 294
 	}
295 295
 
296
-	public function logSparqlHelperTooManyRequestsRetryAfterInvalid( MWHttpRequest $request ) {
296
+	public function logSparqlHelperTooManyRequestsRetryAfterInvalid(MWHttpRequest $request) {
297 297
 		$this->logger->warning(
298 298
 			'Sparql API replied with status 429 and no valid retry-after header.',
299 299
 			[
300
-				'responseHeaders' => json_encode( $request->getResponseHeaders() ),
300
+				'responseHeaders' => json_encode($request->getResponseHeaders()),
301 301
 				'responseContent' => $request->getContent(),
302 302
 			]
303 303
 		);
Please login to merge, or discard this patch.
src/ConstraintCheck/Helper/SparqlHelper.php 1 patch
Spacing   +176 added lines, -179 removed lines patch added patch discarded remove patch
@@ -200,73 +200,73 @@  discard block
 block discarded – undo
200 200
 		$this->defaultUserAgent = $defaultUserAgent;
201 201
 		$this->requestFactory = $requestFactory;
202 202
 		$this->entityPrefixes = [];
203
-		foreach ( $rdfVocabulary->entityNamespaceNames as $namespaceName ) {
204
-			$this->entityPrefixes[] = $rdfVocabulary->getNamespaceURI( $namespaceName );
203
+		foreach ($rdfVocabulary->entityNamespaceNames as $namespaceName) {
204
+			$this->entityPrefixes[] = $rdfVocabulary->getNamespaceURI($namespaceName);
205 205
 		}
206 206
 
207
-		$this->endpoint = $config->get( 'WBQualityConstraintsSparqlEndpoint' );
208
-		$this->maxQueryTimeMillis = $config->get( 'WBQualityConstraintsSparqlMaxMillis' );
209
-		$this->instanceOfId = $config->get( 'WBQualityConstraintsInstanceOfId' );
210
-		$this->subclassOfId = $config->get( 'WBQualityConstraintsSubclassOfId' );
211
-		$this->cacheMapSize = $config->get( 'WBQualityConstraintsFormatCacheMapSize' );
207
+		$this->endpoint = $config->get('WBQualityConstraintsSparqlEndpoint');
208
+		$this->maxQueryTimeMillis = $config->get('WBQualityConstraintsSparqlMaxMillis');
209
+		$this->instanceOfId = $config->get('WBQualityConstraintsInstanceOfId');
210
+		$this->subclassOfId = $config->get('WBQualityConstraintsSubclassOfId');
211
+		$this->cacheMapSize = $config->get('WBQualityConstraintsFormatCacheMapSize');
212 212
 		$this->timeoutExceptionClasses = $config->get(
213 213
 			'WBQualityConstraintsSparqlTimeoutExceptionClasses'
214 214
 		);
215 215
 		$this->sparqlHasWikibaseSupport = $config->get(
216 216
 			'WBQualityConstraintsSparqlHasWikibaseSupport'
217 217
 		);
218
-		$this->sparqlThrottlingFallbackDuration = (int)$config->get(
218
+		$this->sparqlThrottlingFallbackDuration = (int) $config->get(
219 219
 			'WBQualityConstraintsSparqlThrottlingFallbackDuration'
220 220
 		);
221 221
 
222
-		$this->prefixes = $this->getQueryPrefixes( $rdfVocabulary );
222
+		$this->prefixes = $this->getQueryPrefixes($rdfVocabulary);
223 223
 	}
224 224
 
225
-	private function getQueryPrefixes( RdfVocabulary $rdfVocabulary ) {
225
+	private function getQueryPrefixes(RdfVocabulary $rdfVocabulary) {
226 226
 		// TODO: it would probably be smarter that RdfVocubulary exposed these prefixes somehow
227 227
 		$prefixes = '';
228
-		foreach ( $rdfVocabulary->entityNamespaceNames as $sourceName => $namespaceName ) {
228
+		foreach ($rdfVocabulary->entityNamespaceNames as $sourceName => $namespaceName) {
229 229
 			$prefixes .= <<<END
230
-PREFIX {$namespaceName}: <{$rdfVocabulary->getNamespaceURI( $namespaceName )}>\n
230
+PREFIX {$namespaceName}: <{$rdfVocabulary->getNamespaceURI($namespaceName)}>\n
231 231
 END;
232 232
 		}
233 233
 		$prefixes .= <<<END
234
-PREFIX wds: <{$rdfVocabulary->getNamespaceURI( RdfVocabulary::NS_STATEMENT )}>
235
-PREFIX wdv: <{$rdfVocabulary->getNamespaceURI( RdfVocabulary::NS_VALUE )}>\n
234
+PREFIX wds: <{$rdfVocabulary->getNamespaceURI(RdfVocabulary::NS_STATEMENT)}>
235
+PREFIX wdv: <{$rdfVocabulary->getNamespaceURI(RdfVocabulary::NS_VALUE)}>\n
236 236
 END;
237 237
 
238
-		foreach ( $rdfVocabulary->propertyNamespaceNames as $sourceName => $sourceNamespaces ) {
238
+		foreach ($rdfVocabulary->propertyNamespaceNames as $sourceName => $sourceNamespaces) {
239 239
 			$namespaceName = $sourceNamespaces[RdfVocabulary::NSP_DIRECT_CLAIM];
240 240
 			$prefixes .= <<<END
241
-PREFIX {$namespaceName}: <{$rdfVocabulary->getNamespaceURI( $namespaceName )}>\n
241
+PREFIX {$namespaceName}: <{$rdfVocabulary->getNamespaceURI($namespaceName)}>\n
242 242
 END;
243 243
 			$namespaceName = $sourceNamespaces[RdfVocabulary::NSP_CLAIM];
244 244
 			$prefixes .= <<<END
245
-PREFIX {$namespaceName}: <{$rdfVocabulary->getNamespaceURI( $namespaceName )}>\n
245
+PREFIX {$namespaceName}: <{$rdfVocabulary->getNamespaceURI($namespaceName)}>\n
246 246
 END;
247 247
 			$namespaceName = $sourceNamespaces[RdfVocabulary::NSP_CLAIM_STATEMENT];
248 248
 			$prefixes .= <<<END
249
-PREFIX {$namespaceName}: <{$rdfVocabulary->getNamespaceURI( $namespaceName )}>\n
249
+PREFIX {$namespaceName}: <{$rdfVocabulary->getNamespaceURI($namespaceName)}>\n
250 250
 END;
251 251
 			$namespaceName = $sourceNamespaces[RdfVocabulary::NSP_QUALIFIER];
252 252
 			$prefixes .= <<<END
253
-PREFIX {$namespaceName}: <{$rdfVocabulary->getNamespaceURI( $namespaceName )}>\n
253
+PREFIX {$namespaceName}: <{$rdfVocabulary->getNamespaceURI($namespaceName)}>\n
254 254
 END;
255 255
 			$namespaceName = $sourceNamespaces[RdfVocabulary::NSP_QUALIFIER_VALUE];
256 256
 			$prefixes .= <<<END
257
-PREFIX {$namespaceName}: <{$rdfVocabulary->getNamespaceURI( $namespaceName )}>\n
257
+PREFIX {$namespaceName}: <{$rdfVocabulary->getNamespaceURI($namespaceName)}>\n
258 258
 END;
259 259
 			$namespaceName = $sourceNamespaces[RdfVocabulary::NSP_REFERENCE];
260 260
 			$prefixes .= <<<END
261
-PREFIX {$namespaceName}: <{$rdfVocabulary->getNamespaceURI( $namespaceName )}>\n
261
+PREFIX {$namespaceName}: <{$rdfVocabulary->getNamespaceURI($namespaceName)}>\n
262 262
 END;
263 263
 			$namespaceName = $sourceNamespaces[RdfVocabulary::NSP_REFERENCE_VALUE];
264 264
 			$prefixes .= <<<END
265
-PREFIX {$namespaceName}: <{$rdfVocabulary->getNamespaceURI( $namespaceName )}>\n
265
+PREFIX {$namespaceName}: <{$rdfVocabulary->getNamespaceURI($namespaceName)}>\n
266 266
 END;
267 267
 		}
268 268
 		$prefixes .= <<<END
269
-PREFIX wikibase: <{$rdfVocabulary->getNamespaceURI( RdfVocabulary::NS_ONTOLOGY )}>\n
269
+PREFIX wikibase: <{$rdfVocabulary->getNamespaceURI(RdfVocabulary::NS_ONTOLOGY)}>\n
270 270
 END;
271 271
 		return $prefixes;
272 272
 	}
@@ -278,21 +278,20 @@  discard block
 block discarded – undo
278 278
 	 * @return CachedBool
279 279
 	 * @throws SparqlHelperException if the query times out or some other error occurs
280 280
 	 */
281
-	public function hasType( $id, array $classes ) {
281
+	public function hasType($id, array $classes) {
282 282
 		// TODO hint:gearing is a workaround for T168973 and can hopefully be removed eventually
283 283
 		$gearingHint = $this->sparqlHasWikibaseSupport ?
284
-			' hint:Prior hint:gearing "forward".' :
285
-			'';
284
+			' hint:Prior hint:gearing "forward".' : '';
286 285
 
287 286
 		$metadatas = [];
288 287
 
289
-		foreach ( array_chunk( $classes, 20 ) as $classesChunk ) {
290
-			$classesValues = implode( ' ', array_map(
291
-				static function ( $class ) {
292
-					return 'wd:' . $class;
288
+		foreach (array_chunk($classes, 20) as $classesChunk) {
289
+			$classesValues = implode(' ', array_map(
290
+				static function($class) {
291
+					return 'wd:'.$class;
293 292
 				},
294 293
 				$classesChunk
295
-			) );
294
+			));
296 295
 
297 296
 			$query = <<<EOF
298 297
 ASK {
@@ -302,19 +301,19 @@  discard block
 block discarded – undo
302 301
 }
303 302
 EOF;
304 303
 
305
-			$result = $this->runQuery( $query );
304
+			$result = $this->runQuery($query);
306 305
 			$metadatas[] = $result->getMetadata();
307
-			if ( $result->getArray()['boolean'] ) {
306
+			if ($result->getArray()['boolean']) {
308 307
 				return new CachedBool(
309 308
 					true,
310
-					Metadata::merge( $metadatas )
309
+					Metadata::merge($metadatas)
311 310
 				);
312 311
 			}
313 312
 		}
314 313
 
315 314
 		return new CachedBool(
316 315
 			false,
317
-			Metadata::merge( $metadatas )
316
+			Metadata::merge($metadatas)
318 317
 		);
319 318
 	}
320 319
 
@@ -325,7 +324,7 @@  discard block
 block discarded – undo
325 324
 	 * @param PropertyId $separator
326 325
 	 * @return string
327 326
 	 */
328
-	private function nestedSeparatorFilter( PropertyId $separator ) {
327
+	private function nestedSeparatorFilter(PropertyId $separator) {
329 328
 		$filter = <<<EOF
330 329
   MINUS {
331 330
     ?statement pq:$separator ?qualifier.
@@ -369,10 +368,10 @@  discard block
 block discarded – undo
369 368
 		$pid = $statement->getPropertyId()->getSerialization();
370 369
 		$guid = $statement->getGuid();
371 370
 		'@phan-var string $guid'; // statement must have a non-null GUID
372
-		$guidForRdf = str_replace( '$', '-', $guid );
371
+		$guidForRdf = str_replace('$', '-', $guid);
373 372
 
374
-		$separatorFilters = array_map( [ $this, 'nestedSeparatorFilter' ], $separators );
375
-		$finalSeparatorFilter = implode( "\n", $separatorFilters );
373
+		$separatorFilters = array_map([$this, 'nestedSeparatorFilter'], $separators);
374
+		$finalSeparatorFilter = implode("\n", $separatorFilters);
376 375
 
377 376
 		$query = <<<EOF
378 377
 SELECT DISTINCT ?otherEntity WHERE {
@@ -390,9 +389,9 @@  discard block
 block discarded – undo
390 389
 LIMIT 10
391 390
 EOF;
392 391
 
393
-		$result = $this->runQuery( $query );
392
+		$result = $this->runQuery($query);
394 393
 
395
-		return $this->getOtherEntities( $result );
394
+		return $this->getOtherEntities($result);
396 395
 	}
397 396
 
398 397
 	/**
@@ -417,16 +416,15 @@  discard block
 block discarded – undo
417 416
 		$dataType = $this->propertyDataTypeLookup->getDataTypeIdForProperty(
418 417
 			$snak->getPropertyId()
419 418
 		);
420
-		[ $value, $isFullValue ] = $this->getRdfLiteral( $dataType, $dataValue );
421
-		if ( $isFullValue ) {
419
+		[$value, $isFullValue] = $this->getRdfLiteral($dataType, $dataValue);
420
+		if ($isFullValue) {
422 421
 			$prefix .= 'v';
423 422
 		}
424 423
 		$path = $type === Context::TYPE_QUALIFIER ?
425
-			"$prefix:$pid" :
426
-			"prov:wasDerivedFrom/$prefix:$pid";
424
+			"$prefix:$pid" : "prov:wasDerivedFrom/$prefix:$pid";
427 425
 
428 426
 		$deprecatedFilter = '';
429
-		if ( $ignoreDeprecatedStatements ) {
427
+		if ($ignoreDeprecatedStatements) {
430 428
 			$deprecatedFilter = <<< EOF
431 429
   MINUS { ?otherStatement wikibase:rank wikibase:DeprecatedRank. }
432 430
 EOF;
@@ -446,9 +444,9 @@  discard block
 block discarded – undo
446 444
 LIMIT 10
447 445
 EOF;
448 446
 
449
-		$result = $this->runQuery( $query );
447
+		$result = $this->runQuery($query);
450 448
 
451
-		return $this->getOtherEntities( $result );
449
+		return $this->getOtherEntities($result);
452 450
 	}
453 451
 
454 452
 	/**
@@ -458,8 +456,8 @@  discard block
 block discarded – undo
458 456
 	 *
459 457
 	 * @return string
460 458
 	 */
461
-	private function stringLiteral( $text ) {
462
-		return '"' . strtr( $text, [ '"' => '\\"', '\\' => '\\\\' ] ) . '"';
459
+	private function stringLiteral($text) {
460
+		return '"'.strtr($text, ['"' => '\\"', '\\' => '\\\\']).'"';
463 461
 	}
464 462
 
465 463
 	/**
@@ -469,18 +467,18 @@  discard block
 block discarded – undo
469 467
 	 *
470 468
 	 * @return CachedEntityIds
471 469
 	 */
472
-	private function getOtherEntities( CachedQueryResults $results ) {
473
-		return new CachedEntityIds( array_map(
474
-			function ( $resultBindings ) {
470
+	private function getOtherEntities(CachedQueryResults $results) {
471
+		return new CachedEntityIds(array_map(
472
+			function($resultBindings) {
475 473
 				$entityIRI = $resultBindings['otherEntity']['value'];
476
-				foreach ( $this->entityPrefixes as $entityPrefix ) {
477
-					$entityPrefixLength = strlen( $entityPrefix );
478
-					if ( substr( $entityIRI, 0, $entityPrefixLength ) === $entityPrefix ) {
474
+				foreach ($this->entityPrefixes as $entityPrefix) {
475
+					$entityPrefixLength = strlen($entityPrefix);
476
+					if (substr($entityIRI, 0, $entityPrefixLength) === $entityPrefix) {
479 477
 						try {
480 478
 							return $this->entityIdParser->parse(
481
-								substr( $entityIRI, $entityPrefixLength )
479
+								substr($entityIRI, $entityPrefixLength)
482 480
 							);
483
-						} catch ( EntityIdParsingException $e ) {
481
+						} catch (EntityIdParsingException $e) {
484 482
 							// fall through
485 483
 						}
486 484
 					}
@@ -491,7 +489,7 @@  discard block
 block discarded – undo
491 489
 				return null;
492 490
 			},
493 491
 			$results->getArray()['results']['bindings']
494
-		), $results->getMetadata() );
492
+		), $results->getMetadata());
495 493
 	}
496 494
 
497 495
 	// phpcs:disable Generic.Metrics.CyclomaticComplexity,Squiz.WhiteSpace.FunctionSpacing
@@ -504,50 +502,50 @@  discard block
 block discarded – undo
504 502
 	 * @return array the literal or IRI as a string in SPARQL syntax,
505 503
 	 * and a boolean indicating whether it refers to a full value node or not
506 504
 	 */
507
-	private function getRdfLiteral( $dataType, DataValue $dataValue ) {
508
-		switch ( $dataType ) {
505
+	private function getRdfLiteral($dataType, DataValue $dataValue) {
506
+		switch ($dataType) {
509 507
 			case 'string':
510 508
 			case 'external-id':
511
-				return [ $this->stringLiteral( $dataValue->getValue() ), false ];
509
+				return [$this->stringLiteral($dataValue->getValue()), false];
512 510
 			case 'commonsMedia':
513
-				$url = $this->rdfVocabulary->getMediaFileURI( $dataValue->getValue() );
514
-				return [ '<' . $url . '>', false ];
511
+				$url = $this->rdfVocabulary->getMediaFileURI($dataValue->getValue());
512
+				return ['<'.$url.'>', false];
515 513
 			case 'geo-shape':
516
-				$url = $this->rdfVocabulary->getGeoShapeURI( $dataValue->getValue() );
517
-				return [ '<' . $url . '>', false ];
514
+				$url = $this->rdfVocabulary->getGeoShapeURI($dataValue->getValue());
515
+				return ['<'.$url.'>', false];
518 516
 			case 'tabular-data':
519
-				$url = $this->rdfVocabulary->getTabularDataURI( $dataValue->getValue() );
520
-				return [ '<' . $url . '>', false ];
517
+				$url = $this->rdfVocabulary->getTabularDataURI($dataValue->getValue());
518
+				return ['<'.$url.'>', false];
521 519
 			case 'url':
522 520
 				$url = $dataValue->getValue();
523
-				if ( !preg_match( '/^[^<>"{}\\\\|^`\\x00-\\x20]*$/D', $url ) ) {
521
+				if (!preg_match('/^[^<>"{}\\\\|^`\\x00-\\x20]*$/D', $url)) {
524 522
 					// not a valid URL for SPARQL (see SPARQL spec, production 139 IRIREF)
525 523
 					// such an URL should never reach us, so just throw
526
-					throw new InvalidArgumentException( 'invalid URL: ' . $url );
524
+					throw new InvalidArgumentException('invalid URL: '.$url);
527 525
 				}
528
-				return [ '<' . $url . '>', false ];
526
+				return ['<'.$url.'>', false];
529 527
 			case 'wikibase-item':
530 528
 			case 'wikibase-property':
531 529
 				/** @var EntityIdValue $dataValue */
532 530
 				'@phan-var EntityIdValue $dataValue';
533
-				return [ 'wd:' . $dataValue->getEntityId()->getSerialization(), false ];
531
+				return ['wd:'.$dataValue->getEntityId()->getSerialization(), false];
534 532
 			case 'monolingualtext':
535 533
 				/** @var MonolingualTextValue $dataValue */
536 534
 				'@phan-var MonolingualTextValue $dataValue';
537 535
 				$lang = $dataValue->getLanguageCode();
538
-				if ( !preg_match( '/^[a-zA-Z]+(-[a-zA-Z0-9]+)*$/D', $lang ) ) {
536
+				if (!preg_match('/^[a-zA-Z]+(-[a-zA-Z0-9]+)*$/D', $lang)) {
539 537
 					// not a valid language tag for SPARQL (see SPARQL spec, production 145 LANGTAG)
540 538
 					// such a language tag should never reach us, so just throw
541
-					throw new InvalidArgumentException( 'invalid language tag: ' . $lang );
539
+					throw new InvalidArgumentException('invalid language tag: '.$lang);
542 540
 				}
543
-				return [ $this->stringLiteral( $dataValue->getText() ) . '@' . $lang, false ];
541
+				return [$this->stringLiteral($dataValue->getText()).'@'.$lang, false];
544 542
 			case 'globe-coordinate':
545 543
 			case 'quantity':
546 544
 			case 'time':
547 545
 				// @phan-suppress-next-line PhanUndeclaredMethod
548
-				return [ 'wdv:' . $dataValue->getHash(), true ];
546
+				return ['wdv:'.$dataValue->getHash(), true];
549 547
 			default:
550
-				throw new InvalidArgumentException( 'unknown data type: ' . $dataType );
548
+				throw new InvalidArgumentException('unknown data type: '.$dataType);
551 549
 		}
552 550
 	}
553 551
 	// phpcs:enable
@@ -560,43 +558,43 @@  discard block
 block discarded – undo
560 558
 	 * @throws SparqlHelperException if the query times out or some other error occurs
561 559
 	 * @throws ConstraintParameterException if the $regex is invalid
562 560
 	 */
563
-	public function matchesRegularExpression( $text, $regex ) {
561
+	public function matchesRegularExpression($text, $regex) {
564 562
 		// caching wrapper around matchesRegularExpressionWithSparql
565 563
 
566
-		$textHash = hash( 'sha256', $text );
564
+		$textHash = hash('sha256', $text);
567 565
 		$cacheKey = $this->cache->makeKey(
568 566
 			'WikibaseQualityConstraints', // extension
569 567
 			'regex', // action
570 568
 			'WDQS-Java', // regex flavor
571
-			hash( 'sha256', $regex )
569
+			hash('sha256', $regex)
572 570
 		);
573 571
 
574 572
 		$cacheMapArray = $this->cache->getWithSetCallback(
575 573
 			$cacheKey,
576 574
 			WANObjectCache::TTL_DAY,
577
-			function ( $cacheMapArray ) use ( $text, $regex, $textHash ) {
575
+			function($cacheMapArray) use ($text, $regex, $textHash) {
578 576
 				// Initialize the cache map if not set
579
-				if ( $cacheMapArray === false ) {
577
+				if ($cacheMapArray === false) {
580 578
 					$key = 'wikibase.quality.constraints.regex.cache.refresh.init';
581
-					$this->dataFactory->increment( $key );
579
+					$this->dataFactory->increment($key);
582 580
 					return [];
583 581
 				}
584 582
 
585 583
 				$key = 'wikibase.quality.constraints.regex.cache.refresh';
586
-				$this->dataFactory->increment( $key );
587
-				$cacheMap = MapCacheLRU::newFromArray( $cacheMapArray, $this->cacheMapSize );
588
-				if ( $cacheMap->has( $textHash ) ) {
584
+				$this->dataFactory->increment($key);
585
+				$cacheMap = MapCacheLRU::newFromArray($cacheMapArray, $this->cacheMapSize);
586
+				if ($cacheMap->has($textHash)) {
589 587
 					$key = 'wikibase.quality.constraints.regex.cache.refresh.hit';
590
-					$this->dataFactory->increment( $key );
591
-					$cacheMap->get( $textHash ); // ping cache
588
+					$this->dataFactory->increment($key);
589
+					$cacheMap->get($textHash); // ping cache
592 590
 				} else {
593 591
 					$key = 'wikibase.quality.constraints.regex.cache.refresh.miss';
594
-					$this->dataFactory->increment( $key );
592
+					$this->dataFactory->increment($key);
595 593
 					try {
596
-						$matches = $this->matchesRegularExpressionWithSparql( $text, $regex );
597
-					} catch ( ConstraintParameterException $e ) {
598
-						$matches = $this->serializeConstraintParameterException( $e );
599
-					} catch ( SparqlHelperException $e ) {
594
+						$matches = $this->matchesRegularExpressionWithSparql($text, $regex);
595
+					} catch (ConstraintParameterException $e) {
596
+						$matches = $this->serializeConstraintParameterException($e);
597
+					} catch (SparqlHelperException $e) {
600 598
 						// don’t cache this
601 599
 						return $cacheMap->toArray();
602 600
 					}
@@ -620,42 +618,42 @@  discard block
 block discarded – undo
620 618
 			]
621 619
 		);
622 620
 
623
-		if ( isset( $cacheMapArray[$textHash] ) ) {
621
+		if (isset($cacheMapArray[$textHash])) {
624 622
 			$key = 'wikibase.quality.constraints.regex.cache.hit';
625
-			$this->dataFactory->increment( $key );
623
+			$this->dataFactory->increment($key);
626 624
 			$matches = $cacheMapArray[$textHash];
627
-			if ( is_bool( $matches ) ) {
625
+			if (is_bool($matches)) {
628 626
 				return $matches;
629
-			} elseif ( is_array( $matches ) &&
630
-				$matches['type'] == ConstraintParameterException::class ) {
631
-				throw $this->deserializeConstraintParameterException( $matches );
627
+			} elseif (is_array($matches) &&
628
+				$matches['type'] == ConstraintParameterException::class) {
629
+				throw $this->deserializeConstraintParameterException($matches);
632 630
 			} else {
633 631
 				throw new UnexpectedValueException(
634
-					'Value of unknown type in object cache (' .
635
-					'cache key: ' . $cacheKey . ', ' .
636
-					'cache map key: ' . $textHash . ', ' .
637
-					'value type: ' . gettype( $matches ) . ')'
632
+					'Value of unknown type in object cache ('.
633
+					'cache key: '.$cacheKey.', '.
634
+					'cache map key: '.$textHash.', '.
635
+					'value type: '.gettype($matches).')'
638 636
 				);
639 637
 			}
640 638
 		} else {
641 639
 			$key = 'wikibase.quality.constraints.regex.cache.miss';
642
-			$this->dataFactory->increment( $key );
643
-			return $this->matchesRegularExpressionWithSparql( $text, $regex );
640
+			$this->dataFactory->increment($key);
641
+			return $this->matchesRegularExpressionWithSparql($text, $regex);
644 642
 		}
645 643
 	}
646 644
 
647
-	private function serializeConstraintParameterException( ConstraintParameterException $cpe ) {
645
+	private function serializeConstraintParameterException(ConstraintParameterException $cpe) {
648 646
 		return [
649 647
 			'type' => ConstraintParameterException::class,
650
-			'violationMessage' => $this->violationMessageSerializer->serialize( $cpe->getViolationMessage() ),
648
+			'violationMessage' => $this->violationMessageSerializer->serialize($cpe->getViolationMessage()),
651 649
 		];
652 650
 	}
653 651
 
654
-	private function deserializeConstraintParameterException( array $serialization ) {
652
+	private function deserializeConstraintParameterException(array $serialization) {
655 653
 		$message = $this->violationMessageDeserializer->deserialize(
656 654
 			$serialization['violationMessage']
657 655
 		);
658
-		return new ConstraintParameterException( $message );
656
+		return new ConstraintParameterException($message);
659 657
 	}
660 658
 
661 659
 	/**
@@ -669,25 +667,25 @@  discard block
 block discarded – undo
669 667
 	 * @throws SparqlHelperException if the query times out or some other error occurs
670 668
 	 * @throws ConstraintParameterException if the $regex is invalid
671 669
 	 */
672
-	public function matchesRegularExpressionWithSparql( $text, $regex ) {
673
-		$textStringLiteral = $this->stringLiteral( $text );
674
-		$regexStringLiteral = $this->stringLiteral( '^(?:' . $regex . ')$' );
670
+	public function matchesRegularExpressionWithSparql($text, $regex) {
671
+		$textStringLiteral = $this->stringLiteral($text);
672
+		$regexStringLiteral = $this->stringLiteral('^(?:'.$regex.')$');
675 673
 
676 674
 		$query = <<<EOF
677 675
 SELECT (REGEX($textStringLiteral, $regexStringLiteral) AS ?matches) {}
678 676
 EOF;
679 677
 
680
-		$result = $this->runQuery( $query, false );
678
+		$result = $this->runQuery($query, false);
681 679
 
682 680
 		$vars = $result->getArray()['results']['bindings'][0];
683
-		if ( array_key_exists( 'matches', $vars ) ) {
681
+		if (array_key_exists('matches', $vars)) {
684 682
 			// true or false ⇒ regex okay, text matches or not
685 683
 			return $vars['matches']['value'] === 'true';
686 684
 		} else {
687 685
 			// empty result: regex broken
688 686
 			throw new ConstraintParameterException(
689
-				( new ViolationMessage( 'wbqc-violation-message-parameter-regex' ) )
690
-					->withInlineCode( $regex, Role::CONSTRAINT_PARAMETER_VALUE )
687
+				(new ViolationMessage('wbqc-violation-message-parameter-regex'))
688
+					->withInlineCode($regex, Role::CONSTRAINT_PARAMETER_VALUE)
691 689
 			);
692 690
 		}
693 691
 	}
@@ -699,14 +697,14 @@  discard block
 block discarded – undo
699 697
 	 *
700 698
 	 * @return boolean
701 699
 	 */
702
-	public function isTimeout( $responseContent ) {
703
-		$timeoutRegex = implode( '|', array_map(
704
-			static function ( $fqn ) {
705
-				return preg_quote( $fqn, '/' );
700
+	public function isTimeout($responseContent) {
701
+		$timeoutRegex = implode('|', array_map(
702
+			static function($fqn) {
703
+				return preg_quote($fqn, '/');
706 704
 			},
707 705
 			$this->timeoutExceptionClasses
708
-		) );
709
-		return (bool)preg_match( '/' . $timeoutRegex . '/', $responseContent );
706
+		));
707
+		return (bool) preg_match('/'.$timeoutRegex.'/', $responseContent);
710 708
 	}
711 709
 
712 710
 	/**
@@ -718,17 +716,17 @@  discard block
 block discarded – undo
718 716
 	 * @return int|boolean the max-age (in seconds)
719 717
 	 * or a plain boolean if no max-age can be determined
720 718
 	 */
721
-	public function getCacheMaxAge( $responseHeaders ) {
719
+	public function getCacheMaxAge($responseHeaders) {
722 720
 		if (
723
-			array_key_exists( 'x-cache-status', $responseHeaders ) &&
724
-			preg_match( '/^hit(?:-.*)?$/', $responseHeaders['x-cache-status'][0] )
721
+			array_key_exists('x-cache-status', $responseHeaders) &&
722
+			preg_match('/^hit(?:-.*)?$/', $responseHeaders['x-cache-status'][0])
725 723
 		) {
726 724
 			$maxage = [];
727 725
 			if (
728
-				array_key_exists( 'cache-control', $responseHeaders ) &&
729
-				preg_match( '/\bmax-age=(\d+)\b/', $responseHeaders['cache-control'][0], $maxage )
726
+				array_key_exists('cache-control', $responseHeaders) &&
727
+				preg_match('/\bmax-age=(\d+)\b/', $responseHeaders['cache-control'][0], $maxage)
730 728
 			) {
731
-				return intval( $maxage[1] );
729
+				return intval($maxage[1]);
732 730
 			} else {
733 731
 				return true;
734 732
 			}
@@ -749,34 +747,34 @@  discard block
 block discarded – undo
749 747
 	 * or SparlHelper::EMPTY_RETRY_AFTER if there is an empty Retry-After
750 748
 	 * or SparlHelper::INVALID_RETRY_AFTER if there is something wrong with the format
751 749
 	 */
752
-	public function getThrottling( MWHttpRequest $request ) {
753
-		$retryAfterValue = $request->getResponseHeader( 'Retry-After' );
754
-		if ( $retryAfterValue === null ) {
750
+	public function getThrottling(MWHttpRequest $request) {
751
+		$retryAfterValue = $request->getResponseHeader('Retry-After');
752
+		if ($retryAfterValue === null) {
755 753
 			return self::NO_RETRY_AFTER;
756 754
 		}
757 755
 
758
-		$trimmedRetryAfterValue = trim( $retryAfterValue );
759
-		if ( $trimmedRetryAfterValue === '' ) {
756
+		$trimmedRetryAfterValue = trim($retryAfterValue);
757
+		if ($trimmedRetryAfterValue === '') {
760 758
 			return self::EMPTY_RETRY_AFTER;
761 759
 		}
762 760
 
763
-		if ( is_numeric( $trimmedRetryAfterValue ) ) {
764
-			$delaySeconds = (int)$trimmedRetryAfterValue;
765
-			if ( $delaySeconds >= 0 ) {
766
-				return $this->getTimestampInFuture( new DateInterval( 'PT' . $delaySeconds . 'S' ) );
761
+		if (is_numeric($trimmedRetryAfterValue)) {
762
+			$delaySeconds = (int) $trimmedRetryAfterValue;
763
+			if ($delaySeconds >= 0) {
764
+				return $this->getTimestampInFuture(new DateInterval('PT'.$delaySeconds.'S'));
767 765
 			}
768 766
 		} else {
769
-			$return = strtotime( $trimmedRetryAfterValue );
770
-			if ( $return !== false ) {
771
-				return new ConvertibleTimestamp( $return );
767
+			$return = strtotime($trimmedRetryAfterValue);
768
+			if ($return !== false) {
769
+				return new ConvertibleTimestamp($return);
772 770
 			}
773 771
 		}
774 772
 		return self::INVALID_RETRY_AFTER;
775 773
 	}
776 774
 
777
-	private function getTimestampInFuture( DateInterval $delta ) {
775
+	private function getTimestampInFuture(DateInterval $delta) {
778 776
 		$now = new ConvertibleTimestamp();
779
-		return new ConvertibleTimestamp( $now->timestamp->add( $delta ) );
777
+		return new ConvertibleTimestamp($now->timestamp->add($delta));
780 778
 	}
781 779
 
782 780
 	/**
@@ -790,65 +788,64 @@  discard block
 block discarded – undo
790 788
 	 *
791 789
 	 * @throws SparqlHelperException if the query times out or some other error occurs
792 790
 	 */
793
-	public function runQuery( $query, $needsPrefixes = true ) {
791
+	public function runQuery($query, $needsPrefixes = true) {
794 792
 
795
-		if ( $this->throttlingLock->isLocked( self::EXPIRY_LOCK_ID ) ) {
796
-			$this->dataFactory->increment( 'wikibase.quality.constraints.sparql.throttling' );
793
+		if ($this->throttlingLock->isLocked(self::EXPIRY_LOCK_ID)) {
794
+			$this->dataFactory->increment('wikibase.quality.constraints.sparql.throttling');
797 795
 			throw new TooManySparqlRequestsException();
798 796
 		}
799 797
 
800
-		if ( $this->sparqlHasWikibaseSupport ) {
798
+		if ($this->sparqlHasWikibaseSupport) {
801 799
 			$needsPrefixes = false;
802 800
 		}
803 801
 
804
-		if ( $needsPrefixes ) {
805
-			$query = $this->prefixes . $query;
802
+		if ($needsPrefixes) {
803
+			$query = $this->prefixes.$query;
806 804
 		}
807
-		$query = "#wbqc\n" . $query;
805
+		$query = "#wbqc\n".$query;
808 806
 
809
-		$url = $this->endpoint . '?' . http_build_query(
807
+		$url = $this->endpoint.'?'.http_build_query(
810 808
 			[
811 809
 				'query' => $query,
812 810
 				'format' => 'json',
813 811
 				'maxQueryTimeMillis' => $this->maxQueryTimeMillis,
814 812
 			],
815
-			'', ini_get( 'arg_separator.output' ),
813
+			'', ini_get('arg_separator.output'),
816 814
 			// encode spaces with %20, not +
817 815
 			PHP_QUERY_RFC3986
818 816
 		);
819 817
 
820 818
 		$options = [
821 819
 			'method' => 'GET',
822
-			'timeout' => (int)round( ( $this->maxQueryTimeMillis + 1000 ) / 1000 ),
820
+			'timeout' => (int) round(($this->maxQueryTimeMillis + 1000) / 1000),
823 821
 			'connectTimeout' => 'default',
824 822
 			'userAgent' => $this->defaultUserAgent,
825 823
 		];
826
-		$request = $this->requestFactory->create( $url, $options, __METHOD__ );
827
-		$startTime = microtime( true );
824
+		$request = $this->requestFactory->create($url, $options, __METHOD__);
825
+		$startTime = microtime(true);
828 826
 		$requestStatus = $request->execute();
829
-		$endTime = microtime( true );
827
+		$endTime = microtime(true);
830 828
 		$this->dataFactory->timing(
831 829
 			'wikibase.quality.constraints.sparql.timing',
832
-			( $endTime - $startTime ) * 1000
830
+			($endTime - $startTime) * 1000
833 831
 		);
834 832
 
835
-		$this->guardAgainstTooManyRequestsError( $request );
833
+		$this->guardAgainstTooManyRequestsError($request);
836 834
 
837
-		$maxAge = $this->getCacheMaxAge( $request->getResponseHeaders() );
838
-		if ( $maxAge ) {
839
-			$this->dataFactory->increment( 'wikibase.quality.constraints.sparql.cached' );
835
+		$maxAge = $this->getCacheMaxAge($request->getResponseHeaders());
836
+		if ($maxAge) {
837
+			$this->dataFactory->increment('wikibase.quality.constraints.sparql.cached');
840 838
 		}
841 839
 
842
-		if ( $requestStatus->isOK() ) {
840
+		if ($requestStatus->isOK()) {
843 841
 			$json = $request->getContent();
844
-			$jsonStatus = FormatJson::parse( $json, FormatJson::FORCE_ASSOC );
845
-			if ( $jsonStatus->isOK() ) {
842
+			$jsonStatus = FormatJson::parse($json, FormatJson::FORCE_ASSOC);
843
+			if ($jsonStatus->isOK()) {
846 844
 				return new CachedQueryResults(
847 845
 					$jsonStatus->getValue(),
848 846
 					Metadata::ofCachingMetadata(
849 847
 						$maxAge ?
850
-							CachingMetadata::ofMaximumAgeInSeconds( $maxAge ) :
851
-							CachingMetadata::fresh()
848
+							CachingMetadata::ofMaximumAgeInSeconds($maxAge) : CachingMetadata::fresh()
852 849
 					)
853 850
 				);
854 851
 			} else {
@@ -865,9 +862,9 @@  discard block
 block discarded – undo
865 862
 			// fall through to general error handling
866 863
 		}
867 864
 
868
-		$this->dataFactory->increment( 'wikibase.quality.constraints.sparql.error' );
865
+		$this->dataFactory->increment('wikibase.quality.constraints.sparql.error');
869 866
 
870
-		if ( $this->isTimeout( $request->getContent() ) ) {
867
+		if ($this->isTimeout($request->getContent())) {
871 868
 			$this->dataFactory->increment(
872 869
 				'wikibase.quality.constraints.sparql.error.timeout'
873 870
 			);
@@ -882,29 +879,29 @@  discard block
 block discarded – undo
882 879
 	 * @param MWHttpRequest $request
883 880
 	 * @throws TooManySparqlRequestsException
884 881
 	 */
885
-	private function guardAgainstTooManyRequestsError( MWHttpRequest $request ): void {
886
-		if ( $request->getStatus() !== self::HTTP_TOO_MANY_REQUESTS ) {
882
+	private function guardAgainstTooManyRequestsError(MWHttpRequest $request): void {
883
+		if ($request->getStatus() !== self::HTTP_TOO_MANY_REQUESTS) {
887 884
 			return;
888 885
 		}
889 886
 
890 887
 		$fallbackBlockDuration = $this->sparqlThrottlingFallbackDuration;
891 888
 
892
-		if ( $fallbackBlockDuration < 0 ) {
893
-			throw new InvalidArgumentException( 'Fallback duration must be positive int but is: ' .
894
-				$fallbackBlockDuration );
889
+		if ($fallbackBlockDuration < 0) {
890
+			throw new InvalidArgumentException('Fallback duration must be positive int but is: '.
891
+				$fallbackBlockDuration);
895 892
 		}
896 893
 
897
-		$this->dataFactory->increment( 'wikibase.quality.constraints.sparql.throttling' );
898
-		$throttlingUntil = $this->getThrottling( $request );
899
-		if ( !( $throttlingUntil instanceof ConvertibleTimestamp ) ) {
900
-			$this->loggingHelper->logSparqlHelperTooManyRequestsRetryAfterInvalid( $request );
894
+		$this->dataFactory->increment('wikibase.quality.constraints.sparql.throttling');
895
+		$throttlingUntil = $this->getThrottling($request);
896
+		if (!($throttlingUntil instanceof ConvertibleTimestamp)) {
897
+			$this->loggingHelper->logSparqlHelperTooManyRequestsRetryAfterInvalid($request);
901 898
 			$this->throttlingLock->lock(
902 899
 				self::EXPIRY_LOCK_ID,
903
-				$this->getTimestampInFuture( new DateInterval( 'PT' . $fallbackBlockDuration . 'S' ) )
900
+				$this->getTimestampInFuture(new DateInterval('PT'.$fallbackBlockDuration.'S'))
904 901
 			);
905 902
 		} else {
906
-			$this->loggingHelper->logSparqlHelperTooManyRequestsRetryAfterPresent( $throttlingUntil, $request );
907
-			$this->throttlingLock->lock( self::EXPIRY_LOCK_ID, $throttlingUntil );
903
+			$this->loggingHelper->logSparqlHelperTooManyRequestsRetryAfterPresent($throttlingUntil, $request);
904
+			$this->throttlingLock->lock(self::EXPIRY_LOCK_ID, $throttlingUntil);
908 905
 		}
909 906
 		throw new TooManySparqlRequestsException();
910 907
 	}
Please login to merge, or discard this patch.