@@ -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() |
@@ -21,13 +21,13 @@ |
||
21 | 21 | /** |
22 | 22 | * @param ViolationMessage|string $violationMessage |
23 | 23 | */ |
24 | - public function __construct( $violationMessage ) { |
|
25 | - if ( $violationMessage instanceof ViolationMessage ) { |
|
26 | - $message = '⧼' . $violationMessage->getMessageKey() . '⧽'; |
|
24 | + public function __construct($violationMessage) { |
|
25 | + if ($violationMessage instanceof ViolationMessage) { |
|
26 | + $message = '⧼'.$violationMessage->getMessageKey().'⧽'; |
|
27 | 27 | } else { |
28 | 28 | $message = $violationMessage; |
29 | 29 | } |
30 | - parent::__construct( $message ); |
|
30 | + parent::__construct($message); |
|
31 | 31 | |
32 | 32 | // TODO remove support for string $violationMessage (see ViolationMessageRenderer::render()) |
33 | 33 | $this->violationMessage = $violationMessage; |