@@ -16,27 +16,27 @@ |
||
16 | 16 | */ |
17 | 17 | private $timeValueCalculator; |
18 | 18 | |
19 | - public function __construct( TimeValueCalculator $timeValueCalculator = null ) { |
|
19 | + public function __construct(TimeValueCalculator $timeValueCalculator = null) { |
|
20 | 20 | $this->timeValueCalculator = $timeValueCalculator ?: new TimeValueCalculator(); |
21 | 21 | } |
22 | 22 | |
23 | - public function getComparison( TimeValue $lhs, TimeValue $rhs ) { |
|
24 | - $lhsTimestamp = $this->timeValueCalculator->getTimestamp( $lhs ); |
|
25 | - $rhsTimestamp = $this->timeValueCalculator->getTimestamp( $rhs ); |
|
23 | + public function getComparison(TimeValue $lhs, TimeValue $rhs) { |
|
24 | + $lhsTimestamp = $this->timeValueCalculator->getTimestamp($lhs); |
|
25 | + $rhsTimestamp = $this->timeValueCalculator->getTimestamp($rhs); |
|
26 | 26 | |
27 | - if ( $lhsTimestamp === $rhsTimestamp ) { |
|
27 | + if ($lhsTimestamp === $rhsTimestamp) { |
|
28 | 28 | return 0; |
29 | 29 | } |
30 | 30 | |
31 | 31 | return $lhsTimestamp < $rhsTimestamp ? -1 : 1; |
32 | 32 | } |
33 | 33 | |
34 | - public function getMinimum( TimeValue $timeValue1, TimeValue $timeValue2 ) { |
|
35 | - return $this->getComparison( $timeValue1, $timeValue2 ) <= 0 ? $timeValue1 : $timeValue2; |
|
34 | + public function getMinimum(TimeValue $timeValue1, TimeValue $timeValue2) { |
|
35 | + return $this->getComparison($timeValue1, $timeValue2) <= 0 ? $timeValue1 : $timeValue2; |
|
36 | 36 | } |
37 | 37 | |
38 | - public function isFutureTime( TimeValue $timeValue ) { |
|
39 | - return $this->getComparison( $timeValue, new NowValue() ) >= 0; |
|
38 | + public function isFutureTime(TimeValue $timeValue) { |
|
39 | + return $this->getComparison($timeValue, new NowValue()) >= 0; |
|
40 | 40 | } |
41 | 41 | |
42 | 42 | } |
@@ -28,7 +28,7 @@ discard block |
||
28 | 28 | * @return string |
29 | 29 | */ |
30 | 30 | public function getTime() { |
31 | - return gmdate( '+Y-m-d\TH:i:s\Z' ); |
|
31 | + return gmdate('+Y-m-d\TH:i:s\Z'); |
|
32 | 32 | } |
33 | 33 | |
34 | 34 | public function getTimezone() { |
@@ -40,11 +40,11 @@ discard block |
||
40 | 40 | } |
41 | 41 | |
42 | 42 | public function getArrayValue() { |
43 | - throw new LogicException( 'NowValue should never be serialized' ); |
|
43 | + throw new LogicException('NowValue should never be serialized'); |
|
44 | 44 | } |
45 | 45 | |
46 | - public function equals( $value ) { |
|
47 | - return get_class( $value ) === self::class; |
|
46 | + public function equals($value) { |
|
47 | + return get_class($value) === self::class; |
|
48 | 48 | } |
49 | 49 | |
50 | 50 | } |
@@ -37,7 +37,7 @@ discard block |
||
37 | 37 | * @param EntityId $entityId An entity ID from which the value was derived. |
38 | 38 | * @return self Indication that a value was derived from the entity with the given ID. |
39 | 39 | */ |
40 | - public static function ofEntityId( EntityId $entityId ) { |
|
40 | + public static function ofEntityId(EntityId $entityId) { |
|
41 | 41 | $ret = new self; |
42 | 42 | $ret->entityIds[] = $entityId; |
43 | 43 | return $ret; |
@@ -49,7 +49,7 @@ discard block |
||
49 | 49 | * @return self Indication that a value will only remain valid |
50 | 50 | * as long as the given time value is in the future, not in the past. |
51 | 51 | */ |
52 | - public static function ofFutureTime( TimeValue $timeValue ) { |
|
52 | + public static function ofFutureTime(TimeValue $timeValue) { |
|
53 | 53 | $ret = new self; |
54 | 54 | $ret->timeValue = $timeValue; |
55 | 55 | return $ret; |
@@ -59,12 +59,12 @@ discard block |
||
59 | 59 | * @param self[] $metadatas |
60 | 60 | * @return self |
61 | 61 | */ |
62 | - public static function merge( array $metadatas ) { |
|
63 | - Assert::parameterElementType( self::class, $metadatas, '$metadatas' ); |
|
62 | + public static function merge(array $metadatas) { |
|
63 | + Assert::parameterElementType(self::class, $metadatas, '$metadatas'); |
|
64 | 64 | $ret = new self; |
65 | - foreach ( $metadatas as $metadata ) { |
|
66 | - $ret->entityIds = array_merge( $ret->entityIds, $metadata->entityIds ); |
|
67 | - $ret->timeValue = self::minTimeValue( $ret->timeValue, $metadata->timeValue ); |
|
65 | + foreach ($metadatas as $metadata) { |
|
66 | + $ret->entityIds = array_merge($ret->entityIds, $metadata->entityIds); |
|
67 | + $ret->timeValue = self::minTimeValue($ret->timeValue, $metadata->timeValue); |
|
68 | 68 | } |
69 | 69 | return $ret; |
70 | 70 | } |
@@ -74,14 +74,14 @@ discard block |
||
74 | 74 | * @param TimeValue|null $t2 |
75 | 75 | * @return TimeValue|null |
76 | 76 | */ |
77 | - private static function minTimeValue( TimeValue $t1 = null, TimeValue $t2 = null ) { |
|
78 | - if ( $t1 === null ) { |
|
77 | + private static function minTimeValue(TimeValue $t1 = null, TimeValue $t2 = null) { |
|
78 | + if ($t1 === null) { |
|
79 | 79 | return $t2; |
80 | 80 | } |
81 | - if ( $t2 === null ) { |
|
81 | + if ($t2 === null) { |
|
82 | 82 | return $t1; |
83 | 83 | } |
84 | - return ( new TimeValueComparer() )->getMinimum( $t1, $t2 ); |
|
84 | + return (new TimeValueComparer())->getMinimum($t1, $t2); |
|
85 | 85 | } |
86 | 86 | |
87 | 87 | /** |
@@ -91,9 +91,9 @@ discard block |
||
91 | 91 | * @throws ConstraintParameterException |
92 | 92 | * @return CheckResult |
93 | 93 | */ |
94 | - public function checkConstraint( Context $context, Constraint $constraint ) { |
|
95 | - if ( $context->getSnakRank() === Statement::RANK_DEPRECATED ) { |
|
96 | - return new CheckResult( $context, $constraint, [], CheckResult::STATUS_DEPRECATED ); |
|
94 | + public function checkConstraint(Context $context, Constraint $constraint) { |
|
95 | + if ($context->getSnakRank() === Statement::RANK_DEPRECATED) { |
|
96 | + return new CheckResult($context, $constraint, [], CheckResult::STATUS_DEPRECATED); |
|
97 | 97 | } |
98 | 98 | |
99 | 99 | $parameters = []; |
@@ -101,28 +101,28 @@ discard block |
||
101 | 101 | |
102 | 102 | $snak = $context->getSnak(); |
103 | 103 | |
104 | - if ( !$snak instanceof PropertyValueSnak ) { |
|
104 | + if (!$snak instanceof PropertyValueSnak) { |
|
105 | 105 | // nothing to check |
106 | - return new CheckResult( $context, $constraint, $parameters, CheckResult::STATUS_COMPLIANCE ); |
|
106 | + return new CheckResult($context, $constraint, $parameters, CheckResult::STATUS_COMPLIANCE); |
|
107 | 107 | } |
108 | 108 | |
109 | 109 | $dataValue = $snak->getDataValue(); |
110 | 110 | |
111 | - list( $min, $max ) = $this->constraintParameterParser->parseRangeParameter( |
|
111 | + list($min, $max) = $this->constraintParameterParser->parseRangeParameter( |
|
112 | 112 | $constraintParameters, |
113 | 113 | $constraint->getConstraintTypeItemId(), |
114 | 114 | $dataValue->getType() |
115 | 115 | ); |
116 | 116 | $parameterKey = $dataValue->getType() === 'quantity' ? 'quantity' : 'date'; |
117 | - if ( $min !== null ) { |
|
118 | - $parameters['minimum_' . $parameterKey] = [ $min ]; |
|
117 | + if ($min !== null) { |
|
118 | + $parameters['minimum_'.$parameterKey] = [$min]; |
|
119 | 119 | } |
120 | - if ( $max !== null ) { |
|
121 | - $parameters['maximum_' . $parameterKey] = [ $max ]; |
|
120 | + if ($max !== null) { |
|
121 | + $parameters['maximum_'.$parameterKey] = [$max]; |
|
122 | 122 | } |
123 | 123 | |
124 | - if ( $this->rangeCheckerHelper->getComparison( $min, $dataValue ) > 0 || |
|
125 | - $this->rangeCheckerHelper->getComparison( $dataValue, $max ) > 0 |
|
124 | + if ($this->rangeCheckerHelper->getComparison($min, $dataValue) > 0 || |
|
125 | + $this->rangeCheckerHelper->getComparison($dataValue, $max) > 0 |
|
126 | 126 | ) { |
127 | 127 | $message = $this->getViolationMessage( |
128 | 128 | $context->getSnak()->getPropertyId(), |
@@ -138,16 +138,16 @@ discard block |
||
138 | 138 | |
139 | 139 | if ( |
140 | 140 | $dataValue instanceof TimeValue && |
141 | - ( $min instanceof NowValue || $max instanceof NowValue ) && |
|
142 | - $this->rangeCheckerHelper->isFutureTime( $dataValue ) |
|
141 | + ($min instanceof NowValue || $max instanceof NowValue) && |
|
142 | + $this->rangeCheckerHelper->isFutureTime($dataValue) |
|
143 | 143 | ) { |
144 | - $dependencyMetadata = DependencyMetadata::ofFutureTime( $dataValue ); |
|
144 | + $dependencyMetadata = DependencyMetadata::ofFutureTime($dataValue); |
|
145 | 145 | } else { |
146 | 146 | $dependencyMetadata = DependencyMetadata::blank(); |
147 | 147 | } |
148 | 148 | |
149 | - return ( new CheckResult( $context, $constraint, $parameters, $status, $message ) ) |
|
150 | - ->withMetadata( Metadata::ofDependencyMetadata( $dependencyMetadata ) ); |
|
149 | + return (new CheckResult($context, $constraint, $parameters, $status, $message)) |
|
150 | + ->withMetadata(Metadata::ofDependencyMetadata($dependencyMetadata)); |
|
151 | 151 | } |
152 | 152 | |
153 | 153 | /** |
@@ -158,7 +158,7 @@ discard block |
||
158 | 158 | * |
159 | 159 | * @return ViolationMessage |
160 | 160 | */ |
161 | - private function getViolationMessage( PropertyId $predicate, DataValue $value, $min, $max ) { |
|
161 | + private function getViolationMessage(PropertyId $predicate, DataValue $value, $min, $max) { |
|
162 | 162 | // possible message keys: |
163 | 163 | // wbqc-violation-message-range-quantity-closed |
164 | 164 | // wbqc-violation-message-range-quantity-leftopen |
@@ -171,39 +171,39 @@ discard block |
||
171 | 171 | // wbqc-violation-message-range-time-rightopen |
172 | 172 | // wbqc-violation-message-range-time-rightopen-leftnow |
173 | 173 | $messageKey = 'wbqc-violation-message-range'; |
174 | - $messageKey .= '-' . $value->getType(); |
|
174 | + $messageKey .= '-'.$value->getType(); |
|
175 | 175 | // at least one of $min, $max is set, otherwise there could be no violation |
176 | - $messageKey .= '-' . ( $min !== null ? ( $max !== null ? 'closed' : 'rightopen' ) : 'leftopen' ); |
|
177 | - if ( $min instanceof NowValue ) { |
|
176 | + $messageKey .= '-'.($min !== null ? ($max !== null ? 'closed' : 'rightopen') : 'leftopen'); |
|
177 | + if ($min instanceof NowValue) { |
|
178 | 178 | $messageKey .= '-leftnow'; |
179 | - } elseif ( $max instanceof NowValue ) { |
|
179 | + } elseif ($max instanceof NowValue) { |
|
180 | 180 | $messageKey .= '-rightnow'; |
181 | 181 | } |
182 | - $message = ( new ViolationMessage( $messageKey ) ) |
|
183 | - ->withEntityId( $predicate, Role::PREDICATE ) |
|
184 | - ->withDataValue( $value, Role::OBJECT ); |
|
185 | - if ( $min !== null && !( $min instanceof NowValue ) ) { |
|
186 | - $message = $message->withDataValue( $min, Role::OBJECT ); |
|
182 | + $message = (new ViolationMessage($messageKey)) |
|
183 | + ->withEntityId($predicate, Role::PREDICATE) |
|
184 | + ->withDataValue($value, Role::OBJECT); |
|
185 | + if ($min !== null && !($min instanceof NowValue)) { |
|
186 | + $message = $message->withDataValue($min, Role::OBJECT); |
|
187 | 187 | } |
188 | - if ( $max !== null && !( $max instanceof NowValue ) ) { |
|
189 | - $message = $message->withDataValue( $max, Role::OBJECT ); |
|
188 | + if ($max !== null && !($max instanceof NowValue)) { |
|
189 | + $message = $message->withDataValue($max, Role::OBJECT); |
|
190 | 190 | } |
191 | 191 | return $message; |
192 | 192 | } |
193 | 193 | |
194 | - public function checkConstraintParameters( Constraint $constraint ) { |
|
194 | + public function checkConstraintParameters(Constraint $constraint) { |
|
195 | 195 | $constraintParameters = $constraint->getConstraintParameters(); |
196 | 196 | $exceptions = []; |
197 | 197 | try { |
198 | 198 | // we don’t have a data value here, so get the type from the property instead |
199 | 199 | // (the distinction between data type and data value type is irrelevant for 'quantity' and 'time') |
200 | - $type = $this->propertyDataTypeLookup->getDataTypeIdForProperty( $constraint->getPropertyId() ); |
|
200 | + $type = $this->propertyDataTypeLookup->getDataTypeIdForProperty($constraint->getPropertyId()); |
|
201 | 201 | $this->constraintParameterParser->parseRangeParameter( |
202 | 202 | $constraintParameters, |
203 | 203 | $constraint->getConstraintTypeItemId(), |
204 | 204 | $type |
205 | 205 | ); |
206 | - } catch ( ConstraintParameterException $e ) { |
|
206 | + } catch (ConstraintParameterException $e) { |
|
207 | 207 | $exceptions[] = $e; |
208 | 208 | } |
209 | 209 | return $exceptions; |
@@ -142,11 +142,11 @@ discard block |
||
142 | 142 | ) { |
143 | 143 | $results = []; |
144 | 144 | $metadatas = []; |
145 | - if ( $this->canUseStoredResults( $entityIds, $claimIds, $constraintIds, $statuses ) ) { |
|
145 | + if ($this->canUseStoredResults($entityIds, $claimIds, $constraintIds, $statuses)) { |
|
146 | 146 | $storedEntityIds = []; |
147 | - foreach ( $entityIds as $entityId ) { |
|
148 | - $storedResults = $this->getStoredResults( $entityId ); |
|
149 | - if ( $storedResults !== null ) { |
|
147 | + foreach ($entityIds as $entityId) { |
|
148 | + $storedResults = $this->getStoredResults($entityId); |
|
149 | + if ($storedResults !== null) { |
|
150 | 150 | $this->dataFactory->increment( |
151 | 151 | 'wikibase.quality.constraints.cache.entity.hit' |
152 | 152 | ); |
@@ -155,20 +155,20 @@ discard block |
||
155 | 155 | $storedEntityIds[] = $entityId; |
156 | 156 | } |
157 | 157 | } |
158 | - $entityIds = array_values( array_diff( $entityIds, $storedEntityIds ) ); |
|
158 | + $entityIds = array_values(array_diff($entityIds, $storedEntityIds)); |
|
159 | 159 | } |
160 | - if ( $entityIds !== [] || $claimIds !== [] ) { |
|
160 | + if ($entityIds !== [] || $claimIds !== []) { |
|
161 | 161 | $this->dataFactory->updateCount( |
162 | 162 | 'wikibase.quality.constraints.cache.entity.miss', |
163 | - count( $entityIds ) |
|
163 | + count($entityIds) |
|
164 | 164 | ); |
165 | - $response = $this->getAndStoreResults( $entityIds, $claimIds, $constraintIds, $statuses ); |
|
165 | + $response = $this->getAndStoreResults($entityIds, $claimIds, $constraintIds, $statuses); |
|
166 | 166 | $results += $response->getArray(); |
167 | 167 | $metadatas[] = $response->getMetadata(); |
168 | 168 | } |
169 | 169 | return new CachedCheckConstraintsResponse( |
170 | 170 | $results, |
171 | - Metadata::merge( $metadatas ) |
|
171 | + Metadata::merge($metadatas) |
|
172 | 172 | ); |
173 | 173 | } |
174 | 174 | |
@@ -197,13 +197,13 @@ discard block |
||
197 | 197 | array $constraintIds = null, |
198 | 198 | array $statuses |
199 | 199 | ) { |
200 | - if ( $claimIds !== [] ) { |
|
200 | + if ($claimIds !== []) { |
|
201 | 201 | return false; |
202 | 202 | } |
203 | - if ( $constraintIds !== null ) { |
|
203 | + if ($constraintIds !== null) { |
|
204 | 204 | return false; |
205 | 205 | } |
206 | - if ( $statuses != $this->cachedStatuses ) { |
|
206 | + if ($statuses != $this->cachedStatuses) { |
|
207 | 207 | return false; |
208 | 208 | } |
209 | 209 | return true; |
@@ -222,10 +222,10 @@ discard block |
||
222 | 222 | array $constraintIds = null, |
223 | 223 | array $statuses |
224 | 224 | ) { |
225 | - $results = $this->resultsBuilder->getResults( $entityIds, $claimIds, $constraintIds, $statuses ); |
|
225 | + $results = $this->resultsBuilder->getResults($entityIds, $claimIds, $constraintIds, $statuses); |
|
226 | 226 | |
227 | - if ( $this->canStoreResults( $entityIds, $claimIds, $constraintIds, $statuses ) ) { |
|
228 | - foreach ( $entityIds as $entityId ) { |
|
227 | + if ($this->canStoreResults($entityIds, $claimIds, $constraintIds, $statuses)) { |
|
228 | + foreach ($entityIds as $entityId) { |
|
229 | 229 | $value = [ |
230 | 230 | 'results' => $results->getArray()[$entityId->getSerialization()], |
231 | 231 | 'latestRevisionIds' => $this->getLatestRevisionIds( |
@@ -233,10 +233,10 @@ discard block |
||
233 | 233 | ), |
234 | 234 | ]; |
235 | 235 | $futureTime = $results->getMetadata()->getDependencyMetadata()->getFutureTime(); |
236 | - if ( $futureTime !== null ) { |
|
236 | + if ($futureTime !== null) { |
|
237 | 237 | $value['futureTime'] = $futureTime->getArrayValue(); |
238 | 238 | } |
239 | - $this->cache->set( $entityId, $value, $this->ttlInSeconds ); |
|
239 | + $this->cache->set($entityId, $value, $this->ttlInSeconds); |
|
240 | 240 | } |
241 | 241 | } |
242 | 242 | |
@@ -268,10 +268,10 @@ discard block |
||
268 | 268 | array $constraintIds = null, |
269 | 269 | array $statuses |
270 | 270 | ) { |
271 | - if ( $constraintIds !== null ) { |
|
271 | + if ($constraintIds !== null) { |
|
272 | 272 | return false; |
273 | 273 | } |
274 | - if ( $statuses != $this->cachedStatuses ) { |
|
274 | + if ($statuses != $this->cachedStatuses) { |
|
275 | 275 | return false; |
276 | 276 | } |
277 | 277 | return true; |
@@ -284,45 +284,44 @@ discard block |
||
284 | 284 | public function getStoredResults( |
285 | 285 | EntityId $entityId |
286 | 286 | ) { |
287 | - $value = $this->cache->get( $entityId, $curTTL, [], $asOf ); |
|
288 | - $now = call_user_func( $this->microtime, true ); |
|
287 | + $value = $this->cache->get($entityId, $curTTL, [], $asOf); |
|
288 | + $now = call_user_func($this->microtime, true); |
|
289 | 289 | |
290 | - if ( $value === false ) { |
|
290 | + if ($value === false) { |
|
291 | 291 | return null; |
292 | 292 | } |
293 | 293 | |
294 | - $ageInSeconds = (int)ceil( $now - $asOf ); |
|
294 | + $ageInSeconds = (int) ceil($now - $asOf); |
|
295 | 295 | |
296 | 296 | $dependedEntityIds = array_map( |
297 | - [ $this->entityIdParser, "parse" ], |
|
298 | - array_keys( $value['latestRevisionIds'] ) |
|
297 | + [$this->entityIdParser, "parse"], |
|
298 | + array_keys($value['latestRevisionIds']) |
|
299 | 299 | ); |
300 | 300 | |
301 | - if ( $value['latestRevisionIds'] !== $this->getLatestRevisionIds( $dependedEntityIds ) ) { |
|
301 | + if ($value['latestRevisionIds'] !== $this->getLatestRevisionIds($dependedEntityIds)) { |
|
302 | 302 | return null; |
303 | 303 | } |
304 | 304 | |
305 | - if ( array_key_exists( 'futureTime', $value ) ) { |
|
306 | - $futureTime = TimeValue::newFromArray( $value['futureTime'] ); |
|
307 | - if ( !$this->timeValueComparer->isFutureTime( $futureTime ) ) { |
|
305 | + if (array_key_exists('futureTime', $value)) { |
|
306 | + $futureTime = TimeValue::newFromArray($value['futureTime']); |
|
307 | + if (!$this->timeValueComparer->isFutureTime($futureTime)) { |
|
308 | 308 | return null; |
309 | 309 | } |
310 | - $futureTimeDependencyMetadata = DependencyMetadata::ofFutureTime( $futureTime ); |
|
310 | + $futureTimeDependencyMetadata = DependencyMetadata::ofFutureTime($futureTime); |
|
311 | 311 | } else { |
312 | 312 | $futureTimeDependencyMetadata = DependencyMetadata::blank(); |
313 | 313 | } |
314 | 314 | |
315 | 315 | $cachingMetadata = $ageInSeconds > 0 ? |
316 | - CachingMetadata::ofMaximumAgeInSeconds( $ageInSeconds ) : |
|
317 | - CachingMetadata::fresh(); |
|
316 | + CachingMetadata::ofMaximumAgeInSeconds($ageInSeconds) : CachingMetadata::fresh(); |
|
318 | 317 | |
319 | - if ( is_array( $value['results'] ) ) { |
|
320 | - array_walk( $value['results'], [ $this, 'updateCachingMetadata' ], $cachingMetadata ); |
|
318 | + if (is_array($value['results'])) { |
|
319 | + array_walk($value['results'], [$this, 'updateCachingMetadata'], $cachingMetadata); |
|
321 | 320 | } |
322 | 321 | |
323 | 322 | return new CachedCheckConstraintsResponse( |
324 | - [ $entityId->getSerialization() => $value['results'] ], |
|
325 | - $this->mergeStoredMetadata( $cachingMetadata, $dependedEntityIds, $futureTimeDependencyMetadata ) |
|
323 | + [$entityId->getSerialization() => $value['results']], |
|
324 | + $this->mergeStoredMetadata($cachingMetadata, $dependedEntityIds, $futureTimeDependencyMetadata) |
|
326 | 325 | ); |
327 | 326 | } |
328 | 327 | |
@@ -337,58 +336,58 @@ discard block |
||
337 | 336 | array $dependedEntityIds, |
338 | 337 | DependencyMetadata $futureTimeDependencyMetadata = null |
339 | 338 | ) { |
340 | - return Metadata::merge( [ |
|
341 | - Metadata::ofCachingMetadata( $cachingMetadata ), |
|
342 | - Metadata::ofDependencyMetadata( array_reduce( |
|
339 | + return Metadata::merge([ |
|
340 | + Metadata::ofCachingMetadata($cachingMetadata), |
|
341 | + Metadata::ofDependencyMetadata(array_reduce( |
|
343 | 342 | $dependedEntityIds, |
344 | - function( DependencyMetadata $metadata, EntityId $entityId ) { |
|
345 | - return DependencyMetadata::merge( [ |
|
343 | + function(DependencyMetadata $metadata, EntityId $entityId) { |
|
344 | + return DependencyMetadata::merge([ |
|
346 | 345 | $metadata, |
347 | - DependencyMetadata::ofEntityId( $entityId ) |
|
348 | - ] ); |
|
346 | + DependencyMetadata::ofEntityId($entityId) |
|
347 | + ]); |
|
349 | 348 | }, |
350 | 349 | $futureTimeDependencyMetadata |
351 | - ) ) |
|
352 | - ] ); |
|
350 | + )) |
|
351 | + ]); |
|
353 | 352 | } |
354 | 353 | |
355 | 354 | /** |
356 | 355 | * @param EntityId[] $entityIds |
357 | 356 | * @return int[] |
358 | 357 | */ |
359 | - private function getLatestRevisionIds( array $entityIds ) { |
|
358 | + private function getLatestRevisionIds(array $entityIds) { |
|
360 | 359 | $revisionInformations = $this->wikiPageEntityMetaDataAccessor->loadRevisionInformation( |
361 | 360 | $entityIds, |
362 | 361 | EntityRevisionLookup::LATEST_FROM_REPLICA |
363 | 362 | ); |
364 | 363 | $latestRevisionIds = []; |
365 | - foreach ( $revisionInformations as $serialization => $revisionInformation ) { |
|
364 | + foreach ($revisionInformations as $serialization => $revisionInformation) { |
|
366 | 365 | $latestRevisionIds[$serialization] = $revisionInformation->page_latest; |
367 | 366 | } |
368 | 367 | return $latestRevisionIds; |
369 | 368 | } |
370 | 369 | |
371 | - public function updateCachingMetadata( &$element, $key, CachingMetadata $cachingMetadata ) { |
|
372 | - if ( $key === 'cached' ) { |
|
373 | - $element = CachingMetadata::merge( [ |
|
370 | + public function updateCachingMetadata(&$element, $key, CachingMetadata $cachingMetadata) { |
|
371 | + if ($key === 'cached') { |
|
372 | + $element = CachingMetadata::merge([ |
|
374 | 373 | $cachingMetadata, |
375 | - CachingMetadata::ofArray( $element ), |
|
376 | - ] )->toArray(); |
|
374 | + CachingMetadata::ofArray($element), |
|
375 | + ])->toArray(); |
|
377 | 376 | } |
378 | 377 | if ( |
379 | - is_array( $element ) && |
|
380 | - array_key_exists( 'constraint', $element ) && |
|
381 | - in_array( $element['constraint']['type'], $this->possiblyStaleConstraintTypes, true ) |
|
378 | + is_array($element) && |
|
379 | + array_key_exists('constraint', $element) && |
|
380 | + in_array($element['constraint']['type'], $this->possiblyStaleConstraintTypes, true) |
|
382 | 381 | ) { |
383 | - $element['cached'] = CachingMetadata::merge( [ |
|
382 | + $element['cached'] = CachingMetadata::merge([ |
|
384 | 383 | $cachingMetadata, |
385 | 384 | CachingMetadata::ofArray( |
386 | - array_key_exists( 'cached', $element ) ? $element['cached'] : null |
|
385 | + array_key_exists('cached', $element) ? $element['cached'] : null |
|
387 | 386 | ), |
388 | - ] )->toArray(); |
|
387 | + ])->toArray(); |
|
389 | 388 | } |
390 | - if ( is_array( $element ) ) { |
|
391 | - array_walk( $element, [ $this, __FUNCTION__ ], $cachingMetadata ); |
|
389 | + if (is_array($element)) { |
|
390 | + array_walk($element, [$this, __FUNCTION__], $cachingMetadata); |
|
392 | 391 | } |
393 | 392 | } |
394 | 393 | |
@@ -397,7 +396,7 @@ discard block |
||
397 | 396 | * |
398 | 397 | * @param callable $microtime |
399 | 398 | */ |
400 | - public function setMicrotimeFunction( callable $microtime ) { |
|
399 | + public function setMicrotimeFunction(callable $microtime) { |
|
401 | 400 | $this->microtime = $microtime; |
402 | 401 | } |
403 | 402 |
@@ -16,7 +16,7 @@ discard block |
||
16 | 16 | /** |
17 | 17 | * @param bool $serializeConstraintParameters Whether to serialize constraint parameters or not. |
18 | 18 | */ |
19 | - public function __construct( $serializeConstraintParameters = true ) { |
|
19 | + public function __construct($serializeConstraintParameters = true) { |
|
20 | 20 | $this->serializeConstraintParameters = $serializeConstraintParameters; |
21 | 21 | } |
22 | 22 | |
@@ -24,13 +24,13 @@ discard block |
||
24 | 24 | * @param Constraint $constraint |
25 | 25 | * @return array |
26 | 26 | */ |
27 | - public function serialize( Constraint $constraint ) { |
|
27 | + public function serialize(Constraint $constraint) { |
|
28 | 28 | $serialization = [ |
29 | 29 | 'id' => $constraint->getConstraintId(), |
30 | 30 | 'pid' => $constraint->getPropertyId()->getSerialization(), |
31 | 31 | 'qid' => $constraint->getConstraintTypeItemId(), |
32 | 32 | ]; |
33 | - if ( $this->serializeConstraintParameters ) { |
|
33 | + if ($this->serializeConstraintParameters) { |
|
34 | 34 | $serialization['params'] = $constraint->getConstraintParameters(); |
35 | 35 | } |
36 | 36 | return $serialization; |
@@ -10,14 +10,13 @@ |
||
10 | 10 | */ |
11 | 11 | class ConstraintDeserializer { |
12 | 12 | |
13 | - public function deserialize( array $serialization ) { |
|
13 | + public function deserialize(array $serialization) { |
|
14 | 14 | return new Constraint( |
15 | 15 | $serialization['id'], |
16 | - new PropertyId( $serialization['pid'] ), |
|
16 | + new PropertyId($serialization['pid']), |
|
17 | 17 | $serialization['qid'], |
18 | - array_key_exists( 'params', $serialization ) ? |
|
19 | - $serialization['params'] : |
|
20 | - [] |
|
18 | + array_key_exists('params', $serialization) ? |
|
19 | + $serialization['params'] : [] |
|
21 | 20 | ); |
22 | 21 | } |
23 | 22 |
@@ -74,20 +74,20 @@ discard block |
||
74 | 74 | * |
75 | 75 | * @return self |
76 | 76 | */ |
77 | - public static function newFromGlobalState( ApiMain $main, $name, $prefix = '' ) { |
|
77 | + public static function newFromGlobalState(ApiMain $main, $name, $prefix = '') { |
|
78 | 78 | $constraintReportFactory = ConstraintReportFactory::getDefaultInstance(); |
79 | 79 | $repo = WikibaseRepo::getDefaultInstance(); |
80 | - $helperFactory = $repo->getApiHelperFactory( RequestContext::getMain() ); |
|
80 | + $helperFactory = $repo->getApiHelperFactory(RequestContext::getMain()); |
|
81 | 81 | $language = $repo->getUserLanguage(); |
82 | 82 | |
83 | 83 | $languageFallbackLabelDescriptionLookupFactory = $repo->getLanguageFallbackLabelDescriptionLookupFactory(); |
84 | - $labelDescriptionLookup = $languageFallbackLabelDescriptionLookupFactory->newLabelDescriptionLookup( $language ); |
|
84 | + $labelDescriptionLookup = $languageFallbackLabelDescriptionLookupFactory->newLabelDescriptionLookup($language); |
|
85 | 85 | $entityIdHtmlLinkFormatterFactory = $repo->getEntityIdHtmlLinkFormatterFactory(); |
86 | - $entityIdHtmlLinkFormatter = $entityIdHtmlLinkFormatterFactory->getEntityIdFormatter( $labelDescriptionLookup ); |
|
86 | + $entityIdHtmlLinkFormatter = $entityIdHtmlLinkFormatterFactory->getEntityIdFormatter($labelDescriptionLookup); |
|
87 | 87 | $formatterOptions = new FormatterOptions(); |
88 | - $formatterOptions->setOption( SnakFormatter::OPT_LANG, $language->getCode() ); |
|
88 | + $formatterOptions->setOption(SnakFormatter::OPT_LANG, $language->getCode()); |
|
89 | 89 | $valueFormatterFactory = $repo->getValueFormatterFactory(); |
90 | - $dataValueFormatter = $valueFormatterFactory->getValueFormatter( SnakFormatter::FORMAT_HTML, $formatterOptions ); |
|
90 | + $dataValueFormatter = $valueFormatterFactory->getValueFormatter(SnakFormatter::FORMAT_HTML, $formatterOptions); |
|
91 | 91 | $config = MediaWikiServices::getInstance()->getMainConfig(); |
92 | 92 | $violationMessageRenderer = new MultilingualTextViolationMessageRenderer( |
93 | 93 | $entityIdHtmlLinkFormatter, |
@@ -126,9 +126,9 @@ discard block |
||
126 | 126 | StatementGuidParser $statementGuidParser, |
127 | 127 | IBufferingStatsdDataFactory $dataFactory |
128 | 128 | ) { |
129 | - parent::__construct( $main, $name, $prefix ); |
|
129 | + parent::__construct($main, $name, $prefix); |
|
130 | 130 | |
131 | - $this->apiErrorReporter = $apiHelperFactory->getErrorReporter( $this ); |
|
131 | + $this->apiErrorReporter = $apiHelperFactory->getErrorReporter($this); |
|
132 | 132 | $this->delegatingConstraintChecker = $delegatingConstraintChecker; |
133 | 133 | $this->violationMessageRenderer = $violationMessageRenderer; |
134 | 134 | $this->statementGuidParser = $statementGuidParser; |
@@ -143,39 +143,39 @@ discard block |
||
143 | 143 | $params = $this->extractRequestParams(); |
144 | 144 | $result = $this->getResult(); |
145 | 145 | |
146 | - $propertyIds = $this->parsePropertyIds( $params[self::PARAM_PROPERTY_ID] ); |
|
147 | - $constraintIds = $this->parseConstraintIds( $params[self::PARAM_CONSTRAINT_ID] ); |
|
146 | + $propertyIds = $this->parsePropertyIds($params[self::PARAM_PROPERTY_ID]); |
|
147 | + $constraintIds = $this->parseConstraintIds($params[self::PARAM_CONSTRAINT_ID]); |
|
148 | 148 | |
149 | - $this->checkPropertyIds( $propertyIds, $result ); |
|
150 | - $this->checkConstraintIds( $constraintIds, $result ); |
|
149 | + $this->checkPropertyIds($propertyIds, $result); |
|
150 | + $this->checkConstraintIds($constraintIds, $result); |
|
151 | 151 | |
152 | - $result->addValue( null, 'success', 1 ); |
|
152 | + $result->addValue(null, 'success', 1); |
|
153 | 153 | } |
154 | 154 | |
155 | 155 | /** |
156 | 156 | * @param array|null $propertyIdSerializations |
157 | 157 | * @return PropertyId[] |
158 | 158 | */ |
159 | - private function parsePropertyIds( $propertyIdSerializations ) { |
|
160 | - if ( $propertyIdSerializations === null ) { |
|
159 | + private function parsePropertyIds($propertyIdSerializations) { |
|
160 | + if ($propertyIdSerializations === null) { |
|
161 | 161 | return []; |
162 | - } elseif ( empty( $propertyIdSerializations ) ) { |
|
162 | + } elseif (empty($propertyIdSerializations)) { |
|
163 | 163 | $this->apiErrorReporter->dieError( |
164 | - 'If ' . self::PARAM_PROPERTY_ID . ' is specified, it must be nonempty.', |
|
164 | + 'If '.self::PARAM_PROPERTY_ID.' is specified, it must be nonempty.', |
|
165 | 165 | 'no-data' |
166 | 166 | ); |
167 | 167 | } |
168 | 168 | |
169 | 169 | return array_map( |
170 | - function( $propertyIdSerialization ) { |
|
170 | + function($propertyIdSerialization) { |
|
171 | 171 | try { |
172 | - return new PropertyId( $propertyIdSerialization ); |
|
173 | - } catch ( InvalidArgumentException $e ) { |
|
172 | + return new PropertyId($propertyIdSerialization); |
|
173 | + } catch (InvalidArgumentException $e) { |
|
174 | 174 | $this->apiErrorReporter->dieError( |
175 | 175 | "Invalid id: $propertyIdSerialization", |
176 | 176 | 'invalid-property-id', |
177 | 177 | 0, // default argument |
178 | - [ self::PARAM_PROPERTY_ID => $propertyIdSerialization ] |
|
178 | + [self::PARAM_PROPERTY_ID => $propertyIdSerialization] |
|
179 | 179 | ); |
180 | 180 | } |
181 | 181 | }, |
@@ -187,35 +187,35 @@ discard block |
||
187 | 187 | * @param array|null $constraintIds |
188 | 188 | * @return string[] |
189 | 189 | */ |
190 | - private function parseConstraintIds( $constraintIds ) { |
|
191 | - if ( $constraintIds === null ) { |
|
190 | + private function parseConstraintIds($constraintIds) { |
|
191 | + if ($constraintIds === null) { |
|
192 | 192 | return []; |
193 | - } elseif ( empty( $constraintIds ) ) { |
|
193 | + } elseif (empty($constraintIds)) { |
|
194 | 194 | $this->apiErrorReporter->dieError( |
195 | - 'If ' . self::PARAM_CONSTRAINT_ID . ' is specified, it must be nonempty.', |
|
195 | + 'If '.self::PARAM_CONSTRAINT_ID.' is specified, it must be nonempty.', |
|
196 | 196 | 'no-data' |
197 | 197 | ); |
198 | 198 | } |
199 | 199 | |
200 | 200 | return array_map( |
201 | - function( $constraintId ) { |
|
201 | + function($constraintId) { |
|
202 | 202 | try { |
203 | - $propertyId = $this->statementGuidParser->parse( $constraintId )->getEntityId(); |
|
204 | - if ( !$propertyId instanceof PropertyId ) { |
|
203 | + $propertyId = $this->statementGuidParser->parse($constraintId)->getEntityId(); |
|
204 | + if (!$propertyId instanceof PropertyId) { |
|
205 | 205 | $this->apiErrorReporter->dieError( |
206 | 206 | "Invalid property ID: {$propertyId->getSerialization()}", |
207 | 207 | 'invalid-property-id', |
208 | 208 | 0, // default argument |
209 | - [ self::PARAM_CONSTRAINT_ID => $constraintId ] |
|
209 | + [self::PARAM_CONSTRAINT_ID => $constraintId] |
|
210 | 210 | ); |
211 | 211 | } |
212 | 212 | return $constraintId; |
213 | - } catch ( StatementGuidParsingException $e ) { |
|
213 | + } catch (StatementGuidParsingException $e) { |
|
214 | 214 | $this->apiErrorReporter->dieError( |
215 | 215 | "Invalid statement GUID: $constraintId", |
216 | 216 | 'invalid-guid', |
217 | 217 | 0, // default argument |
218 | - [ self::PARAM_CONSTRAINT_ID => $constraintId ] |
|
218 | + [self::PARAM_CONSTRAINT_ID => $constraintId] |
|
219 | 219 | ); |
220 | 220 | } |
221 | 221 | }, |
@@ -227,12 +227,12 @@ discard block |
||
227 | 227 | * @param PropertyId[] $propertyIds |
228 | 228 | * @param ApiResult $result |
229 | 229 | */ |
230 | - private function checkPropertyIds( array $propertyIds, ApiResult $result ) { |
|
231 | - foreach ( $propertyIds as $propertyId ) { |
|
232 | - $result->addArrayType( $this->getResultPathForPropertyId( $propertyId ), 'assoc' ); |
|
233 | - $allConstraintExceptions = $this->delegatingConstraintChecker->checkConstraintParametersOnPropertyId( $propertyId ); |
|
234 | - foreach ( $allConstraintExceptions as $constraintId => $constraintParameterExceptions ) { |
|
235 | - $this->addConstraintParameterExceptionsToResult( $constraintId, $constraintParameterExceptions, $result ); |
|
230 | + private function checkPropertyIds(array $propertyIds, ApiResult $result) { |
|
231 | + foreach ($propertyIds as $propertyId) { |
|
232 | + $result->addArrayType($this->getResultPathForPropertyId($propertyId), 'assoc'); |
|
233 | + $allConstraintExceptions = $this->delegatingConstraintChecker->checkConstraintParametersOnPropertyId($propertyId); |
|
234 | + foreach ($allConstraintExceptions as $constraintId => $constraintParameterExceptions) { |
|
235 | + $this->addConstraintParameterExceptionsToResult($constraintId, $constraintParameterExceptions, $result); |
|
236 | 236 | } |
237 | 237 | } |
238 | 238 | } |
@@ -241,14 +241,14 @@ discard block |
||
241 | 241 | * @param string[] $constraintIds |
242 | 242 | * @param ApiResult $result |
243 | 243 | */ |
244 | - private function checkConstraintIds( array $constraintIds, ApiResult $result ) { |
|
245 | - foreach ( $constraintIds as $constraintId ) { |
|
246 | - if ( $result->getResultData( $this->getResultPathForConstraintId( $constraintId ) ) ) { |
|
244 | + private function checkConstraintIds(array $constraintIds, ApiResult $result) { |
|
245 | + foreach ($constraintIds as $constraintId) { |
|
246 | + if ($result->getResultData($this->getResultPathForConstraintId($constraintId))) { |
|
247 | 247 | // already checked as part of checkPropertyIds() |
248 | 248 | continue; |
249 | 249 | } |
250 | - $constraintParameterExceptions = $this->delegatingConstraintChecker->checkConstraintParametersOnConstraintId( $constraintId ); |
|
251 | - $this->addConstraintParameterExceptionsToResult( $constraintId, $constraintParameterExceptions, $result ); |
|
250 | + $constraintParameterExceptions = $this->delegatingConstraintChecker->checkConstraintParametersOnConstraintId($constraintId); |
|
251 | + $this->addConstraintParameterExceptionsToResult($constraintId, $constraintParameterExceptions, $result); |
|
252 | 252 | } |
253 | 253 | } |
254 | 254 | |
@@ -256,17 +256,17 @@ discard block |
||
256 | 256 | * @param PropertyId $propertyId |
257 | 257 | * @return string[] |
258 | 258 | */ |
259 | - private function getResultPathForPropertyId( PropertyId $propertyId ) { |
|
260 | - return [ $this->getModuleName(), $propertyId->getSerialization() ]; |
|
259 | + private function getResultPathForPropertyId(PropertyId $propertyId) { |
|
260 | + return [$this->getModuleName(), $propertyId->getSerialization()]; |
|
261 | 261 | } |
262 | 262 | |
263 | 263 | /** |
264 | 264 | * @param string $constraintId |
265 | 265 | * @return string[] |
266 | 266 | */ |
267 | - private function getResultPathForConstraintId( $constraintId ) { |
|
268 | - $propertyId = $this->statementGuidParser->parse( $constraintId )->getEntityId(); |
|
269 | - return array_merge( $this->getResultPathForPropertyId( $propertyId ), [ $constraintId ] ); |
|
267 | + private function getResultPathForConstraintId($constraintId) { |
|
268 | + $propertyId = $this->statementGuidParser->parse($constraintId)->getEntityId(); |
|
269 | + return array_merge($this->getResultPathForPropertyId($propertyId), [$constraintId]); |
|
270 | 270 | } |
271 | 271 | |
272 | 272 | /** |
@@ -276,9 +276,9 @@ discard block |
||
276 | 276 | * @param ConstraintParameterException[]|null $constraintParameterExceptions |
277 | 277 | * @param ApiResult $result |
278 | 278 | */ |
279 | - private function addConstraintParameterExceptionsToResult( $constraintId, $constraintParameterExceptions, ApiResult $result ) { |
|
280 | - $path = $this->getResultPathForConstraintId( $constraintId ); |
|
281 | - if ( $constraintParameterExceptions === null ) { |
|
279 | + private function addConstraintParameterExceptionsToResult($constraintId, $constraintParameterExceptions, ApiResult $result) { |
|
280 | + $path = $this->getResultPathForConstraintId($constraintId); |
|
281 | + if ($constraintParameterExceptions === null) { |
|
282 | 282 | $result->addValue( |
283 | 283 | $path, |
284 | 284 | self::KEY_STATUS, |
@@ -288,12 +288,12 @@ discard block |
||
288 | 288 | $result->addValue( |
289 | 289 | $path, |
290 | 290 | self::KEY_STATUS, |
291 | - empty( $constraintParameterExceptions ) ? self::STATUS_OKAY : self::STATUS_NOT_OKAY |
|
291 | + empty($constraintParameterExceptions) ? self::STATUS_OKAY : self::STATUS_NOT_OKAY |
|
292 | 292 | ); |
293 | 293 | $result->addValue( |
294 | 294 | $path, |
295 | 295 | self::KEY_PROBLEMS, |
296 | - array_map( [ $this, 'formatConstraintParameterException' ], $constraintParameterExceptions ) |
|
296 | + array_map([$this, 'formatConstraintParameterException'], $constraintParameterExceptions) |
|
297 | 297 | ); |
298 | 298 | } |
299 | 299 | } |
@@ -304,7 +304,7 @@ discard block |
||
304 | 304 | * @param ConstraintParameterException $e |
305 | 305 | * @return array |
306 | 306 | */ |
307 | - private function formatConstraintParameterException( ConstraintParameterException $e ) { |
|
307 | + private function formatConstraintParameterException(ConstraintParameterException $e) { |
|
308 | 308 | return [ |
309 | 309 | self::KEY_MESSAGE_HTML => $this->violationMessageRenderer->render( |
310 | 310 | $e->getViolationMessage() |
@@ -107,18 +107,18 @@ discard block |
||
107 | 107 | $this->violationMessageDeserializer = $violationMessageDeserializer; |
108 | 108 | $this->dataFactory = $dataFactory; |
109 | 109 | |
110 | - $this->entityPrefix = $rdfVocabulary->getNamespaceURI( RdfVocabulary::NS_ENTITY ); |
|
110 | + $this->entityPrefix = $rdfVocabulary->getNamespaceURI(RdfVocabulary::NS_ENTITY); |
|
111 | 111 | $this->prefixes = <<<EOT |
112 | -PREFIX wd: <{$rdfVocabulary->getNamespaceURI( RdfVocabulary::NS_ENTITY )}> |
|
113 | -PREFIX wds: <{$rdfVocabulary->getNamespaceURI( RdfVocabulary::NS_STATEMENT )}> |
|
114 | -PREFIX wdt: <{$rdfVocabulary->getNamespaceURI( RdfVocabulary::NSP_DIRECT_CLAIM )}> |
|
115 | -PREFIX wdv: <{$rdfVocabulary->getNamespaceURI( RdfVocabulary::NS_VALUE )}> |
|
116 | -PREFIX p: <{$rdfVocabulary->getNamespaceURI( RdfVocabulary::NSP_CLAIM )}> |
|
117 | -PREFIX ps: <{$rdfVocabulary->getNamespaceURI( RdfVocabulary::NSP_CLAIM_STATEMENT )}> |
|
118 | -PREFIX pq: <{$rdfVocabulary->getNamespaceURI( RdfVocabulary::NSP_QUALIFIER )}> |
|
119 | -PREFIX pqv: <{$rdfVocabulary->getNamespaceURI( RdfVocabulary::NSP_QUALIFIER_VALUE )}> |
|
120 | -PREFIX pr: <{$rdfVocabulary->getNamespaceURI( RdfVocabulary::NSP_REFERENCE )}> |
|
121 | -PREFIX prv: <{$rdfVocabulary->getNamespaceURI( RdfVocabulary::NSP_REFERENCE_VALUE )}> |
|
112 | +PREFIX wd: <{$rdfVocabulary->getNamespaceURI(RdfVocabulary::NS_ENTITY)}> |
|
113 | +PREFIX wds: <{$rdfVocabulary->getNamespaceURI(RdfVocabulary::NS_STATEMENT)}> |
|
114 | +PREFIX wdt: <{$rdfVocabulary->getNamespaceURI(RdfVocabulary::NSP_DIRECT_CLAIM)}> |
|
115 | +PREFIX wdv: <{$rdfVocabulary->getNamespaceURI(RdfVocabulary::NS_VALUE)}> |
|
116 | +PREFIX p: <{$rdfVocabulary->getNamespaceURI(RdfVocabulary::NSP_CLAIM)}> |
|
117 | +PREFIX ps: <{$rdfVocabulary->getNamespaceURI(RdfVocabulary::NSP_CLAIM_STATEMENT)}> |
|
118 | +PREFIX pq: <{$rdfVocabulary->getNamespaceURI(RdfVocabulary::NSP_QUALIFIER)}> |
|
119 | +PREFIX pqv: <{$rdfVocabulary->getNamespaceURI(RdfVocabulary::NSP_QUALIFIER_VALUE)}> |
|
120 | +PREFIX pr: <{$rdfVocabulary->getNamespaceURI(RdfVocabulary::NSP_REFERENCE)}> |
|
121 | +PREFIX prv: <{$rdfVocabulary->getNamespaceURI(RdfVocabulary::NSP_REFERENCE_VALUE)}> |
|
122 | 122 | PREFIX wikibase: <http://wikiba.se/ontology#> |
123 | 123 | PREFIX wikibase-beta: <http://wikiba.se/ontology-beta#> |
124 | 124 | EOT; |
@@ -133,21 +133,21 @@ discard block |
||
133 | 133 | * @return CachedBool |
134 | 134 | * @throws SparqlHelperException if the query times out or some other error occurs |
135 | 135 | */ |
136 | - public function hasType( $id, array $classes, $withInstance ) { |
|
137 | - $instanceOfId = $this->config->get( 'WBQualityConstraintsInstanceOfId' ); |
|
138 | - $subclassOfId = $this->config->get( 'WBQualityConstraintsSubclassOfId' ); |
|
136 | + public function hasType($id, array $classes, $withInstance) { |
|
137 | + $instanceOfId = $this->config->get('WBQualityConstraintsInstanceOfId'); |
|
138 | + $subclassOfId = $this->config->get('WBQualityConstraintsSubclassOfId'); |
|
139 | 139 | |
140 | - $path = ( $withInstance ? "wdt:$instanceOfId/" : "" ) . "wdt:$subclassOfId*"; |
|
140 | + $path = ($withInstance ? "wdt:$instanceOfId/" : "")."wdt:$subclassOfId*"; |
|
141 | 141 | |
142 | 142 | $metadatas = []; |
143 | 143 | |
144 | - foreach ( array_chunk( $classes, 20 ) as $classesChunk ) { |
|
145 | - $classesValues = implode( ' ', array_map( |
|
146 | - function( $class ) { |
|
147 | - return 'wd:' . $class; |
|
144 | + foreach (array_chunk($classes, 20) as $classesChunk) { |
|
145 | + $classesValues = implode(' ', array_map( |
|
146 | + function($class) { |
|
147 | + return 'wd:'.$class; |
|
148 | 148 | }, |
149 | 149 | $classesChunk |
150 | - ) ); |
|
150 | + )); |
|
151 | 151 | |
152 | 152 | $query = <<<EOF |
153 | 153 | ASK { |
@@ -158,19 +158,19 @@ discard block |
||
158 | 158 | EOF; |
159 | 159 | // TODO hint:gearing is a workaround for T168973 and can hopefully be removed eventually |
160 | 160 | |
161 | - $result = $this->runQuery( $query ); |
|
161 | + $result = $this->runQuery($query); |
|
162 | 162 | $metadatas[] = $result->getMetadata(); |
163 | - if ( $result->getArray()['boolean'] ) { |
|
163 | + if ($result->getArray()['boolean']) { |
|
164 | 164 | return new CachedBool( |
165 | 165 | true, |
166 | - Metadata::merge( $metadatas ) |
|
166 | + Metadata::merge($metadatas) |
|
167 | 167 | ); |
168 | 168 | } |
169 | 169 | } |
170 | 170 | |
171 | 171 | return new CachedBool( |
172 | 172 | false, |
173 | - Metadata::merge( $metadatas ) |
|
173 | + Metadata::merge($metadatas) |
|
174 | 174 | ); |
175 | 175 | } |
176 | 176 | |
@@ -186,10 +186,10 @@ discard block |
||
186 | 186 | $ignoreDeprecatedStatements |
187 | 187 | ) { |
188 | 188 | $pid = $statement->getPropertyId()->serialize(); |
189 | - $guid = str_replace( '$', '-', $statement->getGuid() ); |
|
189 | + $guid = str_replace('$', '-', $statement->getGuid()); |
|
190 | 190 | |
191 | 191 | $deprecatedFilter = ''; |
192 | - if ( $ignoreDeprecatedStatements ) { |
|
192 | + if ($ignoreDeprecatedStatements) { |
|
193 | 193 | $deprecatedFilter .= 'MINUS { ?otherStatement wikibase:rank wikibase:DeprecatedRank. }'; |
194 | 194 | $deprecatedFilter .= 'MINUS { ?otherStatement wikibase-beta:rank wikibase-beta:DeprecatedRank. }'; |
195 | 195 | } |
@@ -209,9 +209,9 @@ discard block |
||
209 | 209 | LIMIT 10 |
210 | 210 | EOF; |
211 | 211 | |
212 | - $result = $this->runQuery( $query ); |
|
212 | + $result = $this->runQuery($query); |
|
213 | 213 | |
214 | - return $this->getOtherEntities( $result ); |
|
214 | + return $this->getOtherEntities($result); |
|
215 | 215 | } |
216 | 216 | |
217 | 217 | /** |
@@ -236,16 +236,15 @@ discard block |
||
236 | 236 | $dataType = $this->propertyDataTypeLookup->getDataTypeIdForProperty( |
237 | 237 | $snak->getPropertyId() |
238 | 238 | ); |
239 | - list( $value, $isFullValue ) = $this->getRdfLiteral( $dataType, $dataValue ); |
|
240 | - if ( $isFullValue ) { |
|
239 | + list($value, $isFullValue) = $this->getRdfLiteral($dataType, $dataValue); |
|
240 | + if ($isFullValue) { |
|
241 | 241 | $prefix .= 'v'; |
242 | 242 | } |
243 | 243 | $path = $type === Context::TYPE_QUALIFIER ? |
244 | - "$prefix:$pid" : |
|
245 | - "prov:wasDerivedFrom/$prefix:$pid"; |
|
244 | + "$prefix:$pid" : "prov:wasDerivedFrom/$prefix:$pid"; |
|
246 | 245 | |
247 | 246 | $deprecatedFilter = ''; |
248 | - if ( $ignoreDeprecatedStatements ) { |
|
247 | + if ($ignoreDeprecatedStatements) { |
|
249 | 248 | $deprecatedFilter = <<< EOF |
250 | 249 | MINUS { ?otherStatement wikibase:rank wikibase:DeprecatedRank. } |
251 | 250 | MINUS { ?otherStatement wikibase-beta:rank wikibase-beta:DeprecatedRank. } |
@@ -266,9 +265,9 @@ discard block |
||
266 | 265 | LIMIT 10 |
267 | 266 | EOF; |
268 | 267 | |
269 | - $result = $this->runQuery( $query ); |
|
268 | + $result = $this->runQuery($query); |
|
270 | 269 | |
271 | - return $this->getOtherEntities( $result ); |
|
270 | + return $this->getOtherEntities($result); |
|
272 | 271 | } |
273 | 272 | |
274 | 273 | /** |
@@ -278,8 +277,8 @@ discard block |
||
278 | 277 | * |
279 | 278 | * @return string |
280 | 279 | */ |
281 | - private function stringLiteral( $text ) { |
|
282 | - return '"' . strtr( $text, [ '"' => '\\"', '\\' => '\\\\' ] ) . '"'; |
|
280 | + private function stringLiteral($text) { |
|
281 | + return '"'.strtr($text, ['"' => '\\"', '\\' => '\\\\']).'"'; |
|
283 | 282 | } |
284 | 283 | |
285 | 284 | /** |
@@ -289,17 +288,17 @@ discard block |
||
289 | 288 | * |
290 | 289 | * @return CachedEntityIds |
291 | 290 | */ |
292 | - private function getOtherEntities( CachedQueryResults $results ) { |
|
293 | - return new CachedEntityIds( array_map( |
|
294 | - function ( $resultBindings ) { |
|
291 | + private function getOtherEntities(CachedQueryResults $results) { |
|
292 | + return new CachedEntityIds(array_map( |
|
293 | + function($resultBindings) { |
|
295 | 294 | $entityIRI = $resultBindings['otherEntity']['value']; |
296 | - $entityPrefixLength = strlen( $this->entityPrefix ); |
|
297 | - if ( substr( $entityIRI, 0, $entityPrefixLength ) === $this->entityPrefix ) { |
|
295 | + $entityPrefixLength = strlen($this->entityPrefix); |
|
296 | + if (substr($entityIRI, 0, $entityPrefixLength) === $this->entityPrefix) { |
|
298 | 297 | try { |
299 | 298 | return $this->entityIdParser->parse( |
300 | - substr( $entityIRI, $entityPrefixLength ) |
|
299 | + substr($entityIRI, $entityPrefixLength) |
|
301 | 300 | ); |
302 | - } catch ( EntityIdParsingException $e ) { |
|
301 | + } catch (EntityIdParsingException $e) { |
|
303 | 302 | // fall through |
304 | 303 | } |
305 | 304 | } |
@@ -307,7 +306,7 @@ discard block |
||
307 | 306 | return null; |
308 | 307 | }, |
309 | 308 | $results->getArray()['results']['bindings'] |
310 | - ), $results->getMetadata() ); |
|
309 | + ), $results->getMetadata()); |
|
311 | 310 | } |
312 | 311 | |
313 | 312 | // @codingStandardsIgnoreStart cyclomatic complexity of this function is too high |
@@ -320,47 +319,47 @@ discard block |
||
320 | 319 | * @return array the literal or IRI as a string in SPARQL syntax, |
321 | 320 | * and a boolean indicating whether it refers to a full value node or not |
322 | 321 | */ |
323 | - private function getRdfLiteral( $dataType, DataValue $dataValue ) { |
|
324 | - switch ( $dataType ) { |
|
322 | + private function getRdfLiteral($dataType, DataValue $dataValue) { |
|
323 | + switch ($dataType) { |
|
325 | 324 | case 'string': |
326 | 325 | case 'external-id': |
327 | - return [ $this->stringLiteral( $dataValue->getValue() ), false ]; |
|
326 | + return [$this->stringLiteral($dataValue->getValue()), false]; |
|
328 | 327 | case 'commonsMedia': |
329 | - $url = $this->rdfVocabulary->getMediaFileURI( $dataValue->getValue() ); |
|
330 | - return [ '<' . $url . '>', false ]; |
|
328 | + $url = $this->rdfVocabulary->getMediaFileURI($dataValue->getValue()); |
|
329 | + return ['<'.$url.'>', false]; |
|
331 | 330 | case 'geo-shape': |
332 | - $url = $this->rdfVocabulary->getGeoShapeURI( $dataValue->getValue() ); |
|
333 | - return [ '<' . $url . '>', false ]; |
|
331 | + $url = $this->rdfVocabulary->getGeoShapeURI($dataValue->getValue()); |
|
332 | + return ['<'.$url.'>', false]; |
|
334 | 333 | case 'tabular-data': |
335 | - $url = $this->rdfVocabulary->getTabularDataURI( $dataValue->getValue() ); |
|
336 | - return [ '<' . $url . '>', false ]; |
|
334 | + $url = $this->rdfVocabulary->getTabularDataURI($dataValue->getValue()); |
|
335 | + return ['<'.$url.'>', false]; |
|
337 | 336 | case 'url': |
338 | 337 | $url = $dataValue->getValue(); |
339 | - if ( !preg_match( '/^[^<>"{}\\\\|^`\\x00-\\x20]*$/D', $url ) ) { |
|
338 | + if (!preg_match('/^[^<>"{}\\\\|^`\\x00-\\x20]*$/D', $url)) { |
|
340 | 339 | // not a valid URL for SPARQL (see SPARQL spec, production 139 IRIREF) |
341 | 340 | // such an URL should never reach us, so just throw |
342 | - throw new InvalidArgumentException( 'invalid URL: ' . $url ); |
|
341 | + throw new InvalidArgumentException('invalid URL: '.$url); |
|
343 | 342 | } |
344 | - return [ '<' . $url . '>', false ]; |
|
343 | + return ['<'.$url.'>', false]; |
|
345 | 344 | case 'wikibase-item': |
346 | 345 | case 'wikibase-property': |
347 | 346 | /** @var EntityIdValue $dataValue */ |
348 | - return [ 'wd:' . $dataValue->getEntityId()->getSerialization(), false ]; |
|
347 | + return ['wd:'.$dataValue->getEntityId()->getSerialization(), false]; |
|
349 | 348 | case 'monolingualtext': |
350 | 349 | /** @var MonolingualTextValue $dataValue */ |
351 | 350 | $lang = $dataValue->getLanguageCode(); |
352 | - if ( !preg_match( '/^[a-zA-Z]+(-[a-zA-Z0-9]+)*$/D', $lang ) ) { |
|
351 | + if (!preg_match('/^[a-zA-Z]+(-[a-zA-Z0-9]+)*$/D', $lang)) { |
|
353 | 352 | // not a valid language tag for SPARQL (see SPARQL spec, production 145 LANGTAG) |
354 | 353 | // such a language tag should never reach us, so just throw |
355 | - throw new InvalidArgumentException( 'invalid language tag: ' . $lang ); |
|
354 | + throw new InvalidArgumentException('invalid language tag: '.$lang); |
|
356 | 355 | } |
357 | - return [ $this->stringLiteral( $dataValue->getText() ) . '@' . $lang, false ]; |
|
356 | + return [$this->stringLiteral($dataValue->getText()).'@'.$lang, false]; |
|
358 | 357 | case 'globe-coordinate': |
359 | 358 | case 'quantity': |
360 | 359 | case 'time': |
361 | - return [ 'wdv:' . $dataValue->getHash(), true ]; |
|
360 | + return ['wdv:'.$dataValue->getHash(), true]; |
|
362 | 361 | default: |
363 | - throw new InvalidArgumentException( 'unknown data type: ' . $dataType ); |
|
362 | + throw new InvalidArgumentException('unknown data type: '.$dataType); |
|
364 | 363 | } |
365 | 364 | } |
366 | 365 | // @codingStandardsIgnoreEnd |
@@ -373,44 +372,44 @@ discard block |
||
373 | 372 | * @throws SparqlHelperException if the query times out or some other error occurs |
374 | 373 | * @throws ConstraintParameterException if the $regex is invalid |
375 | 374 | */ |
376 | - public function matchesRegularExpression( $text, $regex ) { |
|
375 | + public function matchesRegularExpression($text, $regex) { |
|
377 | 376 | // caching wrapper around matchesRegularExpressionWithSparql |
378 | 377 | |
379 | - $textHash = hash( 'sha256', $text ); |
|
378 | + $textHash = hash('sha256', $text); |
|
380 | 379 | $cacheKey = $this->cache->makeKey( |
381 | 380 | 'WikibaseQualityConstraints', // extension |
382 | 381 | 'regex', // action |
383 | 382 | 'WDQS-Java', // regex flavor |
384 | - hash( 'sha256', $regex ) |
|
383 | + hash('sha256', $regex) |
|
385 | 384 | ); |
386 | - $cacheMapSize = $this->config->get( 'WBQualityConstraintsFormatCacheMapSize' ); |
|
385 | + $cacheMapSize = $this->config->get('WBQualityConstraintsFormatCacheMapSize'); |
|
387 | 386 | |
388 | 387 | $cacheMapArray = $this->cache->getWithSetCallback( |
389 | 388 | $cacheKey, |
390 | 389 | WANObjectCache::TTL_DAY, |
391 | - function( $cacheMapArray ) use ( $text, $regex, $textHash, $cacheMapSize ) { |
|
390 | + function($cacheMapArray) use ($text, $regex, $textHash, $cacheMapSize) { |
|
392 | 391 | // Initialize the cache map if not set |
393 | - if ( $cacheMapArray === false ) { |
|
392 | + if ($cacheMapArray === false) { |
|
394 | 393 | $key = 'wikibase.quality.constraints.regex.cache.refresh.init'; |
395 | - $this->dataFactory->increment( $key ); |
|
394 | + $this->dataFactory->increment($key); |
|
396 | 395 | return []; |
397 | 396 | } |
398 | 397 | |
399 | 398 | $key = 'wikibase.quality.constraints.regex.cache.refresh'; |
400 | - $this->dataFactory->increment( $key ); |
|
401 | - $cacheMap = MapCacheLRU::newFromArray( $cacheMapArray, $cacheMapSize ); |
|
402 | - if ( $cacheMap->has( $textHash ) ) { |
|
399 | + $this->dataFactory->increment($key); |
|
400 | + $cacheMap = MapCacheLRU::newFromArray($cacheMapArray, $cacheMapSize); |
|
401 | + if ($cacheMap->has($textHash)) { |
|
403 | 402 | $key = 'wikibase.quality.constraints.regex.cache.refresh.hit'; |
404 | - $this->dataFactory->increment( $key ); |
|
405 | - $cacheMap->get( $textHash ); // ping cache |
|
403 | + $this->dataFactory->increment($key); |
|
404 | + $cacheMap->get($textHash); // ping cache |
|
406 | 405 | } else { |
407 | 406 | $key = 'wikibase.quality.constraints.regex.cache.refresh.miss'; |
408 | - $this->dataFactory->increment( $key ); |
|
407 | + $this->dataFactory->increment($key); |
|
409 | 408 | try { |
410 | - $matches = $this->matchesRegularExpressionWithSparql( $text, $regex ); |
|
411 | - } catch ( ConstraintParameterException $e ) { |
|
412 | - $matches = $this->serializeConstraintParameterException( $e ); |
|
413 | - } catch ( SparqlHelperException $e ) { |
|
409 | + $matches = $this->matchesRegularExpressionWithSparql($text, $regex); |
|
410 | + } catch (ConstraintParameterException $e) { |
|
411 | + $matches = $this->serializeConstraintParameterException($e); |
|
412 | + } catch (SparqlHelperException $e) { |
|
414 | 413 | // don’t cache this |
415 | 414 | return $cacheMap->toArray(); |
416 | 415 | } |
@@ -434,36 +433,36 @@ discard block |
||
434 | 433 | ] |
435 | 434 | ); |
436 | 435 | |
437 | - if ( isset( $cacheMapArray[$textHash] ) ) { |
|
436 | + if (isset($cacheMapArray[$textHash])) { |
|
438 | 437 | $key = 'wikibase.quality.constraints.regex.cache.hit'; |
439 | - $this->dataFactory->increment( $key ); |
|
438 | + $this->dataFactory->increment($key); |
|
440 | 439 | $matches = $cacheMapArray[$textHash]; |
441 | - if ( is_bool( $matches ) ) { |
|
440 | + if (is_bool($matches)) { |
|
442 | 441 | return $matches; |
443 | - } elseif ( is_array( $matches ) && |
|
444 | - $matches['type'] == ConstraintParameterException::class ) { |
|
445 | - throw $this->deserializeConstraintParameterException( $matches ); |
|
442 | + } elseif (is_array($matches) && |
|
443 | + $matches['type'] == ConstraintParameterException::class) { |
|
444 | + throw $this->deserializeConstraintParameterException($matches); |
|
446 | 445 | } else { |
447 | 446 | throw new MWException( |
448 | - 'Value of unknown type in object cache (' . |
|
449 | - 'cache key: ' . $cacheKey . ', ' . |
|
450 | - 'cache map key: ' . $textHash . ', ' . |
|
451 | - 'value type: ' . gettype( $matches ) . ')' |
|
447 | + 'Value of unknown type in object cache ('. |
|
448 | + 'cache key: '.$cacheKey.', '. |
|
449 | + 'cache map key: '.$textHash.', '. |
|
450 | + 'value type: '.gettype($matches).')' |
|
452 | 451 | ); |
453 | 452 | } |
454 | 453 | } else { |
455 | 454 | $key = 'wikibase.quality.constraints.regex.cache.miss'; |
456 | - $this->dataFactory->increment( $key ); |
|
457 | - return $this->matchesRegularExpressionWithSparql( $text, $regex ); |
|
455 | + $this->dataFactory->increment($key); |
|
456 | + return $this->matchesRegularExpressionWithSparql($text, $regex); |
|
458 | 457 | } |
459 | 458 | } |
460 | 459 | |
461 | - private function serializeConstraintParameterException( ConstraintParameterException $cpe ) { |
|
460 | + private function serializeConstraintParameterException(ConstraintParameterException $cpe) { |
|
462 | 461 | $message = $cpe->getViolationMessage(); |
463 | - if ( $message instanceof ViolationMessage ) { |
|
462 | + if ($message instanceof ViolationMessage) { |
|
464 | 463 | return [ |
465 | 464 | 'type' => ConstraintParameterException::class, |
466 | - 'violationMessage' => $this->violationMessageSerializer->serialize( $message ), |
|
465 | + 'violationMessage' => $this->violationMessageSerializer->serialize($message), |
|
467 | 466 | ]; |
468 | 467 | } else { |
469 | 468 | return [ |
@@ -473,15 +472,15 @@ discard block |
||
473 | 472 | } |
474 | 473 | } |
475 | 474 | |
476 | - private function deserializeConstraintParameterException( array $serialization ) { |
|
477 | - if ( array_key_exists( 'violationMessage', $serialization ) ) { |
|
475 | + private function deserializeConstraintParameterException(array $serialization) { |
|
476 | + if (array_key_exists('violationMessage', $serialization)) { |
|
478 | 477 | $message = $this->violationMessageDeserializer->deserialize( |
479 | 478 | $serialization['violationMessage'] |
480 | 479 | ); |
481 | 480 | } else { |
482 | 481 | $message = $serialization['message']; |
483 | 482 | } |
484 | - return new ConstraintParameterException( $message ); |
|
483 | + return new ConstraintParameterException($message); |
|
485 | 484 | } |
486 | 485 | |
487 | 486 | /** |
@@ -495,25 +494,25 @@ discard block |
||
495 | 494 | * @throws SparqlHelperException if the query times out or some other error occurs |
496 | 495 | * @throws ConstraintParameterException if the $regex is invalid |
497 | 496 | */ |
498 | - public function matchesRegularExpressionWithSparql( $text, $regex ) { |
|
499 | - $textStringLiteral = $this->stringLiteral( $text ); |
|
500 | - $regexStringLiteral = $this->stringLiteral( '^' . $regex . '$' ); |
|
497 | + public function matchesRegularExpressionWithSparql($text, $regex) { |
|
498 | + $textStringLiteral = $this->stringLiteral($text); |
|
499 | + $regexStringLiteral = $this->stringLiteral('^'.$regex.'$'); |
|
501 | 500 | |
502 | 501 | $query = <<<EOF |
503 | 502 | SELECT (REGEX($textStringLiteral, $regexStringLiteral) AS ?matches) {} |
504 | 503 | EOF; |
505 | 504 | |
506 | - $result = $this->runQuery( $query ); |
|
505 | + $result = $this->runQuery($query); |
|
507 | 506 | |
508 | 507 | $vars = $result->getArray()['results']['bindings'][0]; |
509 | - if ( array_key_exists( 'matches', $vars ) ) { |
|
508 | + if (array_key_exists('matches', $vars)) { |
|
510 | 509 | // true or false ⇒ regex okay, text matches or not |
511 | 510 | return $vars['matches']['value'] === 'true'; |
512 | 511 | } else { |
513 | 512 | // empty result: regex broken |
514 | 513 | throw new ConstraintParameterException( |
515 | - ( new ViolationMessage( 'wbqc-violation-message-parameter-regex' ) ) |
|
516 | - ->withInlineCode( $regex, Role::CONSTRAINT_PARAMETER_VALUE ) |
|
514 | + (new ViolationMessage('wbqc-violation-message-parameter-regex')) |
|
515 | + ->withInlineCode($regex, Role::CONSTRAINT_PARAMETER_VALUE) |
|
517 | 516 | ); |
518 | 517 | } |
519 | 518 | } |
@@ -525,14 +524,14 @@ discard block |
||
525 | 524 | * |
526 | 525 | * @return boolean |
527 | 526 | */ |
528 | - public function isTimeout( $responseContent ) { |
|
529 | - $timeoutRegex = implode( '|', array_map( |
|
530 | - function ( $fqn ) { |
|
531 | - return preg_quote( $fqn, '/' ); |
|
527 | + public function isTimeout($responseContent) { |
|
528 | + $timeoutRegex = implode('|', array_map( |
|
529 | + function($fqn) { |
|
530 | + return preg_quote($fqn, '/'); |
|
532 | 531 | }, |
533 | - $this->config->get( 'WBQualityConstraintsSparqlTimeoutExceptionClasses' ) |
|
534 | - ) ); |
|
535 | - return (bool)preg_match( '/' . $timeoutRegex . '/', $responseContent ); |
|
532 | + $this->config->get('WBQualityConstraintsSparqlTimeoutExceptionClasses') |
|
533 | + )); |
|
534 | + return (bool) preg_match('/'.$timeoutRegex.'/', $responseContent); |
|
536 | 535 | } |
537 | 536 | |
538 | 537 | /** |
@@ -544,17 +543,17 @@ discard block |
||
544 | 543 | * @return integer|boolean the max-age (in seconds) |
545 | 544 | * or a plain boolean if no max-age can be determined |
546 | 545 | */ |
547 | - public function getCacheMaxAge( $responseHeaders ) { |
|
546 | + public function getCacheMaxAge($responseHeaders) { |
|
548 | 547 | if ( |
549 | - array_key_exists( 'x-cache-status', $responseHeaders ) && |
|
550 | - preg_match( '/^hit(?:-.*)?$/', $responseHeaders['x-cache-status'][0] ) |
|
548 | + array_key_exists('x-cache-status', $responseHeaders) && |
|
549 | + preg_match('/^hit(?:-.*)?$/', $responseHeaders['x-cache-status'][0]) |
|
551 | 550 | ) { |
552 | 551 | $maxage = []; |
553 | 552 | if ( |
554 | - array_key_exists( 'cache-control', $responseHeaders ) && |
|
555 | - preg_match( '/\bmax-age=(\d+)\b/', $responseHeaders['cache-control'][0], $maxage ) |
|
553 | + array_key_exists('cache-control', $responseHeaders) && |
|
554 | + preg_match('/\bmax-age=(\d+)\b/', $responseHeaders['cache-control'][0], $maxage) |
|
556 | 555 | ) { |
557 | - return intval( $maxage[1] ); |
|
556 | + return intval($maxage[1]); |
|
558 | 557 | } else { |
559 | 558 | return true; |
560 | 559 | } |
@@ -572,59 +571,58 @@ discard block |
||
572 | 571 | * |
573 | 572 | * @throws SparqlHelperException if the query times out or some other error occurs |
574 | 573 | */ |
575 | - public function runQuery( $query ) { |
|
574 | + public function runQuery($query) { |
|
576 | 575 | |
577 | - $endpoint = $this->config->get( 'WBQualityConstraintsSparqlEndpoint' ); |
|
578 | - $maxQueryTimeMillis = $this->config->get( 'WBQualityConstraintsSparqlMaxMillis' ); |
|
579 | - $url = $endpoint . '?' . http_build_query( |
|
576 | + $endpoint = $this->config->get('WBQualityConstraintsSparqlEndpoint'); |
|
577 | + $maxQueryTimeMillis = $this->config->get('WBQualityConstraintsSparqlMaxMillis'); |
|
578 | + $url = $endpoint.'?'.http_build_query( |
|
580 | 579 | [ |
581 | - 'query' => "#wbqc\n" . $this->prefixes . $query, |
|
580 | + 'query' => "#wbqc\n".$this->prefixes.$query, |
|
582 | 581 | 'format' => 'json', |
583 | 582 | 'maxQueryTimeMillis' => $maxQueryTimeMillis, |
584 | 583 | ], |
585 | - null, ini_get( 'arg_separator.output' ), |
|
584 | + null, ini_get('arg_separator.output'), |
|
586 | 585 | // encode spaces with %20, not + |
587 | 586 | PHP_QUERY_RFC3986 |
588 | 587 | ); |
589 | 588 | |
590 | 589 | $options = [ |
591 | 590 | 'method' => 'GET', |
592 | - 'timeout' => (int)round( ( $maxQueryTimeMillis + 1000 ) / 1000 ), |
|
591 | + 'timeout' => (int) round(($maxQueryTimeMillis + 1000) / 1000), |
|
593 | 592 | 'connectTimeout' => 'default', |
594 | 593 | ]; |
595 | - $request = MWHttpRequest::factory( $url, $options ); |
|
596 | - $startTime = microtime( true ); |
|
594 | + $request = MWHttpRequest::factory($url, $options); |
|
595 | + $startTime = microtime(true); |
|
597 | 596 | $status = $request->execute(); |
598 | - $endTime = microtime( true ); |
|
597 | + $endTime = microtime(true); |
|
599 | 598 | $this->dataFactory->timing( |
600 | 599 | 'wikibase.quality.constraints.sparql.timing', |
601 | - ( $endTime - $startTime ) * 1000 |
|
600 | + ($endTime - $startTime) * 1000 |
|
602 | 601 | ); |
603 | 602 | |
604 | - $maxAge = $this->getCacheMaxAge( $request->getResponseHeaders() ); |
|
605 | - if ( $maxAge ) { |
|
606 | - $this->dataFactory->increment( 'wikibase.quality.constraints.sparql.cached' ); |
|
603 | + $maxAge = $this->getCacheMaxAge($request->getResponseHeaders()); |
|
604 | + if ($maxAge) { |
|
605 | + $this->dataFactory->increment('wikibase.quality.constraints.sparql.cached'); |
|
607 | 606 | } |
608 | 607 | |
609 | - if ( $status->isOK() ) { |
|
608 | + if ($status->isOK()) { |
|
610 | 609 | $json = $request->getContent(); |
611 | - $arr = json_decode( $json, true ); |
|
610 | + $arr = json_decode($json, true); |
|
612 | 611 | return new CachedQueryResults( |
613 | 612 | $arr, |
614 | 613 | Metadata::ofCachingMetadata( |
615 | 614 | $maxAge ? |
616 | - CachingMetadata::ofMaximumAgeInSeconds( $maxAge ) : |
|
617 | - CachingMetadata::fresh() |
|
615 | + CachingMetadata::ofMaximumAgeInSeconds($maxAge) : CachingMetadata::fresh() |
|
618 | 616 | ) |
619 | 617 | ); |
620 | 618 | } else { |
621 | - $this->dataFactory->increment( 'wikibase.quality.constraints.sparql.error' ); |
|
619 | + $this->dataFactory->increment('wikibase.quality.constraints.sparql.error'); |
|
622 | 620 | |
623 | 621 | $this->dataFactory->increment( |
624 | 622 | "wikibase.quality.constraints.sparql.error.http.{$request->getStatus()}" |
625 | 623 | ); |
626 | 624 | |
627 | - if ( $this->isTimeout( $request->getContent() ) ) { |
|
625 | + if ($this->isTimeout($request->getContent())) { |
|
628 | 626 | $this->dataFactory->increment( |
629 | 627 | 'wikibase.quality.constraints.sparql.error.timeout' |
630 | 628 | ); |