@@ -76,14 +76,14 @@ discard block |
||
| 76 | 76 | * @param CheckResult $checkResult |
| 77 | 77 | * @return array |
| 78 | 78 | */ |
| 79 | - public function serialize( CheckResult $checkResult ) { |
|
| 79 | + public function serialize(CheckResult $checkResult) { |
|
| 80 | 80 | $contextCursor = $checkResult->getContextCursor(); |
| 81 | 81 | |
| 82 | 82 | $serialization = [ |
| 83 | - self::KEY_CONTEXT_CURSOR => $this->contextCursorSerializer->serialize( $contextCursor ), |
|
| 83 | + self::KEY_CONTEXT_CURSOR => $this->contextCursorSerializer->serialize($contextCursor), |
|
| 84 | 84 | ]; |
| 85 | 85 | |
| 86 | - if ( $checkResult instanceof NullResult ) { |
|
| 86 | + if ($checkResult instanceof NullResult) { |
|
| 87 | 87 | $serialization[self::KEY_NULL_RESULT] = 1; |
| 88 | 88 | } else { |
| 89 | 89 | $constraint = $checkResult->getConstraint(); |
@@ -91,21 +91,21 @@ discard block |
||
| 91 | 91 | $violationMessage = $checkResult->getMessage(); |
| 92 | 92 | |
| 93 | 93 | $serialization[self::KEY_CONSTRAINT] = |
| 94 | - $this->constraintSerializer->serialize( $constraint ); |
|
| 94 | + $this->constraintSerializer->serialize($constraint); |
|
| 95 | 95 | $serialization[self::KEY_CHECK_RESULT_STATUS] = |
| 96 | 96 | $checkResult->getStatus(); |
| 97 | 97 | $serialization[self::KEY_CACHING_METADATA] = |
| 98 | - $this->serializeCachingMetadata( $cachingMetadata ); |
|
| 98 | + $this->serializeCachingMetadata($cachingMetadata); |
|
| 99 | 99 | |
| 100 | - if ( $violationMessage !== null ) { |
|
| 100 | + if ($violationMessage !== null) { |
|
| 101 | 101 | $serialization[self::KEY_VIOLATION_MESSAGE] = |
| 102 | - $this->violationMessageSerializer->serialize( $violationMessage ); |
|
| 102 | + $this->violationMessageSerializer->serialize($violationMessage); |
|
| 103 | 103 | } |
| 104 | 104 | } |
| 105 | 105 | |
| 106 | - if ( $this->serializeDependencyMetadata ) { |
|
| 106 | + if ($this->serializeDependencyMetadata) { |
|
| 107 | 107 | $serialization[self::KEY_DEPENDENCY_METADATA] = |
| 108 | - $this->serializeDependencyMetadata( $checkResult ); |
|
| 108 | + $this->serializeDependencyMetadata($checkResult); |
|
| 109 | 109 | } |
| 110 | 110 | |
| 111 | 111 | return $serialization; |
@@ -115,12 +115,12 @@ discard block |
||
| 115 | 115 | * @param CachingMetadata $cachingMetadata |
| 116 | 116 | * @return array |
| 117 | 117 | */ |
| 118 | - private function serializeCachingMetadata( CachingMetadata $cachingMetadata ) { |
|
| 118 | + private function serializeCachingMetadata(CachingMetadata $cachingMetadata) { |
|
| 119 | 119 | $maximumAge = $cachingMetadata->getMaximumAgeInSeconds(); |
| 120 | 120 | |
| 121 | 121 | $serialization = []; |
| 122 | 122 | |
| 123 | - if ( $maximumAge > 0 ) { |
|
| 123 | + if ($maximumAge > 0) { |
|
| 124 | 124 | $serialization[self::KEY_CACHING_METADATA_MAX_AGE] = $maximumAge; |
| 125 | 125 | } |
| 126 | 126 | |
@@ -131,21 +131,21 @@ discard block |
||
| 131 | 131 | * @param CheckResult $checkResult |
| 132 | 132 | * @return array |
| 133 | 133 | */ |
| 134 | - private function serializeDependencyMetadata( CheckResult $checkResult ) { |
|
| 134 | + private function serializeDependencyMetadata(CheckResult $checkResult) { |
|
| 135 | 135 | $dependencyMetadata = $checkResult->getMetadata()->getDependencyMetadata(); |
| 136 | 136 | $entityIds = $dependencyMetadata->getEntityIds(); |
| 137 | 137 | $futureTime = $dependencyMetadata->getFutureTime(); |
| 138 | 138 | |
| 139 | 139 | $serialization = [ |
| 140 | 140 | self::KEY_DEPENDENCY_METADATA_ENTITY_IDS => array_map( |
| 141 | - function ( EntityId $entityId ) { |
|
| 141 | + function(EntityId $entityId) { |
|
| 142 | 142 | return $entityId->getSerialization(); |
| 143 | 143 | }, |
| 144 | 144 | $entityIds |
| 145 | 145 | ), |
| 146 | 146 | ]; |
| 147 | 147 | |
| 148 | - if ( $futureTime !== null ) { |
|
| 148 | + if ($futureTime !== null) { |
|
| 149 | 149 | $serialization[self::KEY_DEPENDENCY_METADATA_FUTURE_TIME] = |
| 150 | 150 | $futureTime->getArrayValue(); |
| 151 | 151 | } |
@@ -13,8 +13,8 @@ discard block |
||
| 13 | 13 | * @param ContextCursor $cursor |
| 14 | 14 | * @return array |
| 15 | 15 | */ |
| 16 | - public function serialize( ContextCursor $cursor ) { |
|
| 17 | - if ( $cursor instanceof EntityContextCursor ) { |
|
| 16 | + public function serialize(ContextCursor $cursor) { |
|
| 17 | + if ($cursor instanceof EntityContextCursor) { |
|
| 18 | 18 | return [ |
| 19 | 19 | 't' => '\entity', |
| 20 | 20 | 'i' => $cursor->getEntityId(), |
@@ -30,9 +30,9 @@ discard block |
||
| 30 | 30 | 'h' => $cursor->getSnakHash(), |
| 31 | 31 | ]; |
| 32 | 32 | |
| 33 | - if ( $type === Context::TYPE_QUALIFIER || $type === Context::TYPE_REFERENCE ) { |
|
| 33 | + if ($type === Context::TYPE_QUALIFIER || $type === Context::TYPE_REFERENCE) { |
|
| 34 | 34 | $serialization['P'] = $cursor->getSnakPropertyId(); |
| 35 | - if ( $type === Context::TYPE_REFERENCE ) { |
|
| 35 | + if ($type === Context::TYPE_REFERENCE) { |
|
| 36 | 36 | /** @var ReferenceContextCursor $cursor */ |
| 37 | 37 | $serialization['r'] = $cursor->getReferenceHash(); |
| 38 | 38 | } |
@@ -143,7 +143,7 @@ discard block |
||
| 143 | 143 | CheckResult::STATUS_WARNING, |
| 144 | 144 | CheckResult::STATUS_BAD_PARAMETERS, |
| 145 | 145 | ]; |
| 146 | - $this->cachedStatusesFlipped = array_flip( $this->cachedStatuses ); |
|
| 146 | + $this->cachedStatusesFlipped = array_flip($this->cachedStatuses); |
|
| 147 | 147 | } |
| 148 | 148 | |
| 149 | 149 | public function getResults( |
@@ -154,15 +154,15 @@ discard block |
||
| 154 | 154 | ) { |
| 155 | 155 | $results = []; |
| 156 | 156 | $metadatas = []; |
| 157 | - $statusesFlipped = array_flip( $statuses ); |
|
| 158 | - if ( $this->canUseStoredResults( $entityIds, $claimIds, $constraintIds, $statuses ) ) { |
|
| 157 | + $statusesFlipped = array_flip($statuses); |
|
| 158 | + if ($this->canUseStoredResults($entityIds, $claimIds, $constraintIds, $statuses)) { |
|
| 159 | 159 | $storedEntityIds = []; |
| 160 | - foreach ( $entityIds as $entityId ) { |
|
| 161 | - $storedResults = $this->getStoredResults( $entityId ); |
|
| 162 | - if ( $storedResults !== null ) { |
|
| 163 | - $this->loggingHelper->logCheckConstraintsCacheHit( $entityId ); |
|
| 164 | - foreach ( $storedResults->getArray() as $checkResult ) { |
|
| 165 | - if ( $this->statusSelected( $statusesFlipped, $checkResult ) ) { |
|
| 160 | + foreach ($entityIds as $entityId) { |
|
| 161 | + $storedResults = $this->getStoredResults($entityId); |
|
| 162 | + if ($storedResults !== null) { |
|
| 163 | + $this->loggingHelper->logCheckConstraintsCacheHit($entityId); |
|
| 164 | + foreach ($storedResults->getArray() as $checkResult) { |
|
| 165 | + if ($this->statusSelected($statusesFlipped, $checkResult)) { |
|
| 166 | 166 | $results[] = $checkResult; |
| 167 | 167 | } |
| 168 | 168 | } |
@@ -170,19 +170,19 @@ discard block |
||
| 170 | 170 | $storedEntityIds[] = $entityId; |
| 171 | 171 | } |
| 172 | 172 | } |
| 173 | - $entityIds = array_values( array_diff( $entityIds, $storedEntityIds ) ); |
|
| 173 | + $entityIds = array_values(array_diff($entityIds, $storedEntityIds)); |
|
| 174 | 174 | } |
| 175 | - if ( $entityIds !== [] || $claimIds !== [] ) { |
|
| 176 | - if ( $entityIds !== [] ) { |
|
| 177 | - $this->loggingHelper->logCheckConstraintsCacheMisses( $entityIds ); |
|
| 175 | + if ($entityIds !== [] || $claimIds !== []) { |
|
| 176 | + if ($entityIds !== []) { |
|
| 177 | + $this->loggingHelper->logCheckConstraintsCacheMisses($entityIds); |
|
| 178 | 178 | } |
| 179 | - $response = $this->getAndStoreResults( $entityIds, $claimIds, $constraintIds, $statuses ); |
|
| 180 | - $results = array_merge( $results, $response->getArray() ); |
|
| 179 | + $response = $this->getAndStoreResults($entityIds, $claimIds, $constraintIds, $statuses); |
|
| 180 | + $results = array_merge($results, $response->getArray()); |
|
| 181 | 181 | $metadatas[] = $response->getMetadata(); |
| 182 | 182 | } |
| 183 | 183 | return new CachedCheckResults( |
| 184 | 184 | $results, |
| 185 | - Metadata::merge( $metadatas ) |
|
| 185 | + Metadata::merge($metadatas) |
|
| 186 | 186 | ); |
| 187 | 187 | } |
| 188 | 188 | |
@@ -205,13 +205,13 @@ discard block |
||
| 205 | 205 | array $constraintIds = null, |
| 206 | 206 | array $statuses |
| 207 | 207 | ) { |
| 208 | - if ( $claimIds !== [] ) { |
|
| 208 | + if ($claimIds !== []) { |
|
| 209 | 209 | return false; |
| 210 | 210 | } |
| 211 | - if ( $constraintIds !== null ) { |
|
| 211 | + if ($constraintIds !== null) { |
|
| 212 | 212 | return false; |
| 213 | 213 | } |
| 214 | - if ( array_diff( $statuses, $this->cachedStatuses ) !== [] ) { |
|
| 214 | + if (array_diff($statuses, $this->cachedStatuses) !== []) { |
|
| 215 | 215 | return false; |
| 216 | 216 | } |
| 217 | 217 | return true; |
@@ -226,8 +226,8 @@ discard block |
||
| 226 | 226 | * @param CheckResult $result |
| 227 | 227 | * @return bool |
| 228 | 228 | */ |
| 229 | - private function statusSelected( array $statusesFlipped, CheckResult $result ) { |
|
| 230 | - return array_key_exists( $result->getStatus(), $statusesFlipped ) || |
|
| 229 | + private function statusSelected(array $statusesFlipped, CheckResult $result) { |
|
| 230 | + return array_key_exists($result->getStatus(), $statusesFlipped) || |
|
| 231 | 231 | $result instanceof NullResult; |
| 232 | 232 | } |
| 233 | 233 | |
@@ -244,11 +244,11 @@ discard block |
||
| 244 | 244 | array $constraintIds = null, |
| 245 | 245 | array $statuses |
| 246 | 246 | ) { |
| 247 | - $results = $this->resultsSource->getResults( $entityIds, $claimIds, $constraintIds, $statuses ); |
|
| 247 | + $results = $this->resultsSource->getResults($entityIds, $claimIds, $constraintIds, $statuses); |
|
| 248 | 248 | |
| 249 | - if ( $this->canStoreResults( $entityIds, $claimIds, $constraintIds, $statuses ) ) { |
|
| 250 | - foreach ( $entityIds as $entityId ) { |
|
| 251 | - $this->storeResults( $entityId, $results ); |
|
| 249 | + if ($this->canStoreResults($entityIds, $claimIds, $constraintIds, $statuses)) { |
|
| 250 | + foreach ($entityIds as $entityId) { |
|
| 251 | + $this->storeResults($entityId, $results); |
|
| 252 | 252 | } |
| 253 | 253 | } |
| 254 | 254 | |
@@ -279,10 +279,10 @@ discard block |
||
| 279 | 279 | array $constraintIds = null, |
| 280 | 280 | array $statuses |
| 281 | 281 | ) { |
| 282 | - if ( $constraintIds !== null ) { |
|
| 282 | + if ($constraintIds !== null) { |
|
| 283 | 283 | return false; |
| 284 | 284 | } |
| 285 | - if ( array_diff( $this->cachedStatuses, $statuses ) !== [] ) { |
|
| 285 | + if (array_diff($this->cachedStatuses, $statuses) !== []) { |
|
| 286 | 286 | return false; |
| 287 | 287 | } |
| 288 | 288 | return true; |
@@ -296,21 +296,21 @@ discard block |
||
| 296 | 296 | * May include check results for other entity IDs as well, |
| 297 | 297 | * or check results with statuses that we’re not interested in caching. |
| 298 | 298 | */ |
| 299 | - private function storeResults( EntityId $entityId, CachedCheckResults $results ) { |
|
| 299 | + private function storeResults(EntityId $entityId, CachedCheckResults $results) { |
|
| 300 | 300 | $latestRevisionIds = $this->getLatestRevisionIds( |
| 301 | 301 | $results->getMetadata()->getDependencyMetadata()->getEntityIds() |
| 302 | 302 | ); |
| 303 | - if ( $latestRevisionIds === null ) { |
|
| 303 | + if ($latestRevisionIds === null) { |
|
| 304 | 304 | return; |
| 305 | 305 | } |
| 306 | 306 | |
| 307 | 307 | $resultSerializations = []; |
| 308 | - foreach ( $results->getArray() as $checkResult ) { |
|
| 309 | - if ( $checkResult->getContextCursor()->getEntityId() !== $entityId->getSerialization() ) { |
|
| 308 | + foreach ($results->getArray() as $checkResult) { |
|
| 309 | + if ($checkResult->getContextCursor()->getEntityId() !== $entityId->getSerialization()) { |
|
| 310 | 310 | continue; |
| 311 | 311 | } |
| 312 | - if ( $this->statusSelected( $this->cachedStatusesFlipped, $checkResult ) ) { |
|
| 313 | - $resultSerializations[] = $this->checkResultSerializer->serialize( $checkResult ); |
|
| 312 | + if ($this->statusSelected($this->cachedStatusesFlipped, $checkResult)) { |
|
| 313 | + $resultSerializations[] = $this->checkResultSerializer->serialize($checkResult); |
|
| 314 | 314 | } |
| 315 | 315 | } |
| 316 | 316 | |
@@ -319,11 +319,11 @@ discard block |
||
| 319 | 319 | 'latestRevisionIds' => $latestRevisionIds, |
| 320 | 320 | ]; |
| 321 | 321 | $futureTime = $results->getMetadata()->getDependencyMetadata()->getFutureTime(); |
| 322 | - if ( $futureTime !== null ) { |
|
| 322 | + if ($futureTime !== null) { |
|
| 323 | 323 | $value['futureTime'] = $futureTime->getArrayValue(); |
| 324 | 324 | } |
| 325 | 325 | |
| 326 | - $this->cache->set( $entityId, $value, $this->ttlInSeconds ); |
|
| 326 | + $this->cache->set($entityId, $value, $this->ttlInSeconds); |
|
| 327 | 327 | } |
| 328 | 328 | |
| 329 | 329 | /** |
@@ -333,30 +333,29 @@ discard block |
||
| 333 | 333 | public function getStoredResults( |
| 334 | 334 | EntityId $entityId |
| 335 | 335 | ) { |
| 336 | - $value = $this->cache->get( $entityId, $curTTL, [], $asOf ); |
|
| 337 | - $now = call_user_func( $this->microtime, true ); |
|
| 336 | + $value = $this->cache->get($entityId, $curTTL, [], $asOf); |
|
| 337 | + $now = call_user_func($this->microtime, true); |
|
| 338 | 338 | |
| 339 | - $dependencyMetadata = $this->checkDependencyMetadata( $value ); |
|
| 340 | - if ( $dependencyMetadata === null ) { |
|
| 339 | + $dependencyMetadata = $this->checkDependencyMetadata($value); |
|
| 340 | + if ($dependencyMetadata === null) { |
|
| 341 | 341 | return null; |
| 342 | 342 | } |
| 343 | 343 | |
| 344 | - $ageInSeconds = (int)ceil( $now - $asOf ); |
|
| 344 | + $ageInSeconds = (int) ceil($now - $asOf); |
|
| 345 | 345 | $cachingMetadata = $ageInSeconds > 0 ? |
| 346 | - CachingMetadata::ofMaximumAgeInSeconds( $ageInSeconds ) : |
|
| 347 | - CachingMetadata::fresh(); |
|
| 346 | + CachingMetadata::ofMaximumAgeInSeconds($ageInSeconds) : CachingMetadata::fresh(); |
|
| 348 | 347 | |
| 349 | 348 | $results = []; |
| 350 | - foreach ( $value['results'] as $resultSerialization ) { |
|
| 351 | - $results[] = $this->deserializeCheckResult( $resultSerialization, $cachingMetadata ); |
|
| 349 | + foreach ($value['results'] as $resultSerialization) { |
|
| 350 | + $results[] = $this->deserializeCheckResult($resultSerialization, $cachingMetadata); |
|
| 352 | 351 | } |
| 353 | 352 | |
| 354 | 353 | return new CachedCheckResults( |
| 355 | 354 | $results, |
| 356 | - Metadata::merge( [ |
|
| 357 | - Metadata::ofCachingMetadata( $cachingMetadata ), |
|
| 358 | - Metadata::ofDependencyMetadata( $dependencyMetadata ), |
|
| 359 | - ] ) |
|
| 355 | + Metadata::merge([ |
|
| 356 | + Metadata::ofCachingMetadata($cachingMetadata), |
|
| 357 | + Metadata::ofDependencyMetadata($dependencyMetadata), |
|
| 358 | + ]) |
|
| 360 | 359 | ); |
| 361 | 360 | } |
| 362 | 361 | |
@@ -368,37 +367,37 @@ discard block |
||
| 368 | 367 | * @return DependencyMetadata|null the dependency metadata, |
| 369 | 368 | * or null if $value should no longer be used |
| 370 | 369 | */ |
| 371 | - private function checkDependencyMetadata( $value ) { |
|
| 372 | - if ( $value === false ) { |
|
| 370 | + private function checkDependencyMetadata($value) { |
|
| 371 | + if ($value === false) { |
|
| 373 | 372 | return null; |
| 374 | 373 | } |
| 375 | 374 | |
| 376 | - if ( array_key_exists( 'futureTime', $value ) ) { |
|
| 377 | - $futureTime = TimeValue::newFromArray( $value['futureTime'] ); |
|
| 378 | - if ( !$this->timeValueComparer->isFutureTime( $futureTime ) ) { |
|
| 375 | + if (array_key_exists('futureTime', $value)) { |
|
| 376 | + $futureTime = TimeValue::newFromArray($value['futureTime']); |
|
| 377 | + if (!$this->timeValueComparer->isFutureTime($futureTime)) { |
|
| 379 | 378 | return null; |
| 380 | 379 | } |
| 381 | - $futureTimeDependencyMetadata = DependencyMetadata::ofFutureTime( $futureTime ); |
|
| 380 | + $futureTimeDependencyMetadata = DependencyMetadata::ofFutureTime($futureTime); |
|
| 382 | 381 | } else { |
| 383 | 382 | $futureTimeDependencyMetadata = DependencyMetadata::blank(); |
| 384 | 383 | } |
| 385 | 384 | |
| 386 | 385 | $dependedEntityIds = array_map( |
| 387 | - [ $this->entityIdParser, "parse" ], |
|
| 388 | - array_keys( $value['latestRevisionIds'] ) |
|
| 386 | + [$this->entityIdParser, "parse"], |
|
| 387 | + array_keys($value['latestRevisionIds']) |
|
| 389 | 388 | ); |
| 390 | 389 | |
| 391 | - if ( $value['latestRevisionIds'] !== $this->getLatestRevisionIds( $dependedEntityIds ) ) { |
|
| 390 | + if ($value['latestRevisionIds'] !== $this->getLatestRevisionIds($dependedEntityIds)) { |
|
| 392 | 391 | return null; |
| 393 | 392 | } |
| 394 | 393 | |
| 395 | 394 | return array_reduce( |
| 396 | 395 | $dependedEntityIds, |
| 397 | - function( DependencyMetadata $metadata, EntityId $entityId ) { |
|
| 398 | - return DependencyMetadata::merge( [ |
|
| 396 | + function(DependencyMetadata $metadata, EntityId $entityId) { |
|
| 397 | + return DependencyMetadata::merge([ |
|
| 399 | 398 | $metadata, |
| 400 | - DependencyMetadata::ofEntityId( $entityId ) |
|
| 401 | - ] ); |
|
| 399 | + DependencyMetadata::ofEntityId($entityId) |
|
| 400 | + ]); |
|
| 402 | 401 | }, |
| 403 | 402 | $futureTimeDependencyMetadata |
| 404 | 403 | ); |
@@ -418,13 +417,13 @@ discard block |
||
| 418 | 417 | array $resultSerialization, |
| 419 | 418 | CachingMetadata $cachingMetadata |
| 420 | 419 | ) { |
| 421 | - $result = $this->checkResultDeserializer->deserialize( $resultSerialization ); |
|
| 422 | - if ( $this->isPossiblyStaleResult( $result ) ) { |
|
| 420 | + $result = $this->checkResultDeserializer->deserialize($resultSerialization); |
|
| 421 | + if ($this->isPossiblyStaleResult($result)) { |
|
| 423 | 422 | $result->withMetadata( |
| 424 | - Metadata::merge( [ |
|
| 423 | + Metadata::merge([ |
|
| 425 | 424 | $result->getMetadata(), |
| 426 | - Metadata::ofCachingMetadata( $cachingMetadata ), |
|
| 427 | - ] ) |
|
| 425 | + Metadata::ofCachingMetadata($cachingMetadata), |
|
| 426 | + ]) |
|
| 428 | 427 | ); |
| 429 | 428 | } |
| 430 | 429 | return $result; |
@@ -434,8 +433,8 @@ discard block |
||
| 434 | 433 | * @param CheckResult $result |
| 435 | 434 | * @return bool |
| 436 | 435 | */ |
| 437 | - private function isPossiblyStaleResult( CheckResult $result ) { |
|
| 438 | - if ( $result instanceof NullResult ) { |
|
| 436 | + private function isPossiblyStaleResult(CheckResult $result) { |
|
| 437 | + if ($result instanceof NullResult) { |
|
| 439 | 438 | return false; |
| 440 | 439 | } |
| 441 | 440 | |
@@ -450,14 +449,14 @@ discard block |
||
| 450 | 449 | * @return int[]|null array from entity ID serializations to revision ID, |
| 451 | 450 | * or null to indicate that not all revision IDs could be loaded |
| 452 | 451 | */ |
| 453 | - private function getLatestRevisionIds( array $entityIds ) { |
|
| 454 | - if ( $entityIds === [] ) { |
|
| 452 | + private function getLatestRevisionIds(array $entityIds) { |
|
| 453 | + if ($entityIds === []) { |
|
| 455 | 454 | $this->loggingHelper->logEmptyDependencyMetadata(); |
| 456 | 455 | return []; |
| 457 | 456 | } |
| 458 | - if ( count( $entityIds ) > $this->maxRevisionIds ) { |
|
| 457 | + if (count($entityIds) > $this->maxRevisionIds) { |
|
| 459 | 458 | // one of those entities will probably be edited soon, so might as well skip caching |
| 460 | - $this->loggingHelper->logHugeDependencyMetadata( $entityIds, $this->maxRevisionIds ); |
|
| 459 | + $this->loggingHelper->logHugeDependencyMetadata($entityIds, $this->maxRevisionIds); |
|
| 461 | 460 | return null; |
| 462 | 461 | } |
| 463 | 462 | |
@@ -465,7 +464,7 @@ discard block |
||
| 465 | 464 | $entityIds, |
| 466 | 465 | EntityRevisionLookup::LATEST_FROM_REPLICA |
| 467 | 466 | ); |
| 468 | - if ( $this->hasFalseElements( $latestRevisionIds ) ) { |
|
| 467 | + if ($this->hasFalseElements($latestRevisionIds)) { |
|
| 469 | 468 | return null; |
| 470 | 469 | } |
| 471 | 470 | return $latestRevisionIds; |
@@ -475,8 +474,8 @@ discard block |
||
| 475 | 474 | * @param array $array |
| 476 | 475 | * @return bool |
| 477 | 476 | */ |
| 478 | - private function hasFalseElements( array $array ) { |
|
| 479 | - return in_array( false, $array, true ); |
|
| 477 | + private function hasFalseElements(array $array) { |
|
| 478 | + return in_array(false, $array, true); |
|
| 480 | 479 | } |
| 481 | 480 | |
| 482 | 481 | /** |
@@ -484,7 +483,7 @@ discard block |
||
| 484 | 483 | * |
| 485 | 484 | * @param callable $microtime |
| 486 | 485 | */ |
| 487 | - public function setMicrotimeFunction( callable $microtime ) { |
|
| 486 | + public function setMicrotimeFunction(callable $microtime) { |
|
| 488 | 487 | $this->microtime = $microtime; |
| 489 | 488 | } |
| 490 | 489 | |
@@ -44,57 +44,56 @@ |
||
| 44 | 44 | ) { |
| 45 | 45 | $results = []; |
| 46 | 46 | $metadatas = []; |
| 47 | - $statusesFlipped = array_flip( $statuses ); |
|
| 48 | - foreach ( $entityIds as $entityId ) { |
|
| 47 | + $statusesFlipped = array_flip($statuses); |
|
| 48 | + foreach ($entityIds as $entityId) { |
|
| 49 | 49 | $entityResults = $this->delegatingConstraintChecker->checkAgainstConstraintsOnEntityId( |
| 50 | 50 | $entityId, |
| 51 | 51 | $constraintIds, |
| 52 | - [ $this, 'defaultResultsPerContext' ], |
|
| 53 | - [ $this, 'defaultResultsPerEntity' ] |
|
| 52 | + [$this, 'defaultResultsPerContext'], |
|
| 53 | + [$this, 'defaultResultsPerEntity'] |
|
| 54 | 54 | ); |
| 55 | - foreach ( $entityResults as $result ) { |
|
| 55 | + foreach ($entityResults as $result) { |
|
| 56 | 56 | $metadatas[] = $result->getMetadata(); |
| 57 | - if ( $this->statusSelected( $statusesFlipped, $result ) ) { |
|
| 57 | + if ($this->statusSelected($statusesFlipped, $result)) { |
|
| 58 | 58 | $results[] = $result; |
| 59 | 59 | } |
| 60 | 60 | } |
| 61 | 61 | } |
| 62 | - foreach ( $claimIds as $claimId ) { |
|
| 62 | + foreach ($claimIds as $claimId) { |
|
| 63 | 63 | $claimResults = $this->delegatingConstraintChecker->checkAgainstConstraintsOnClaimId( |
| 64 | 64 | $claimId, |
| 65 | 65 | $constraintIds, |
| 66 | - [ $this, 'defaultResultsPerContext' ] |
|
| 66 | + [$this, 'defaultResultsPerContext'] |
|
| 67 | 67 | ); |
| 68 | - foreach ( $claimResults as $result ) { |
|
| 68 | + foreach ($claimResults as $result) { |
|
| 69 | 69 | $metadatas[] = $result->getMetadata(); |
| 70 | - if ( $this->statusSelected( $statusesFlipped, $result ) ) { |
|
| 70 | + if ($this->statusSelected($statusesFlipped, $result)) { |
|
| 71 | 71 | $results[] = $result; |
| 72 | 72 | } |
| 73 | 73 | } |
| 74 | 74 | } |
| 75 | 75 | return new CachedCheckResults( |
| 76 | 76 | $results, |
| 77 | - Metadata::merge( $metadatas ) |
|
| 77 | + Metadata::merge($metadatas) |
|
| 78 | 78 | ); |
| 79 | 79 | } |
| 80 | 80 | |
| 81 | - public function defaultResultsPerContext( Context $context ) { |
|
| 81 | + public function defaultResultsPerContext(Context $context) { |
|
| 82 | 82 | return $context->getType() === Context::TYPE_STATEMENT ? |
| 83 | - [ new NullResult( $context->getCursor() ) ] : |
|
| 84 | - []; |
|
| 83 | + [new NullResult($context->getCursor())] : []; |
|
| 85 | 84 | } |
| 86 | 85 | |
| 87 | - public function defaultResultsPerEntity( EntityId $entityId ) { |
|
| 86 | + public function defaultResultsPerEntity(EntityId $entityId) { |
|
| 88 | 87 | return [ |
| 89 | - ( new NullResult( new EntityContextCursor( $entityId->getSerialization() ) ) ) |
|
| 90 | - ->withMetadata( Metadata::ofDependencyMetadata( |
|
| 91 | - DependencyMetadata::ofEntityId( $entityId ) |
|
| 92 | - ) ) |
|
| 88 | + (new NullResult(new EntityContextCursor($entityId->getSerialization()))) |
|
| 89 | + ->withMetadata(Metadata::ofDependencyMetadata( |
|
| 90 | + DependencyMetadata::ofEntityId($entityId) |
|
| 91 | + )) |
|
| 93 | 92 | ]; |
| 94 | 93 | } |
| 95 | 94 | |
| 96 | - public function statusSelected( array $statusesFlipped, CheckResult $result ) { |
|
| 97 | - return array_key_exists( $result->getStatus(), $statusesFlipped ) || |
|
| 95 | + public function statusSelected(array $statusesFlipped, CheckResult $result) { |
|
| 96 | + return array_key_exists($result->getStatus(), $statusesFlipped) || |
|
| 98 | 97 | $result instanceof NullResult; |
| 99 | 98 | } |
| 100 | 99 | |
@@ -56,13 +56,13 @@ discard block |
||
| 56 | 56 | * @param array $serialization |
| 57 | 57 | * @return CheckResult |
| 58 | 58 | */ |
| 59 | - public function deserialize( array $serialization ) { |
|
| 59 | + public function deserialize(array $serialization) { |
|
| 60 | 60 | $contextCursor = $this->contextCursorDeserializer->deserialize( |
| 61 | 61 | $serialization[CheckResultSerializer::KEY_CONTEXT_CURSOR] |
| 62 | 62 | ); |
| 63 | 63 | |
| 64 | - if ( array_key_exists( CheckResultSerializer::KEY_NULL_RESULT, $serialization ) ) { |
|
| 65 | - $result = new NullResult( $contextCursor ); |
|
| 64 | + if (array_key_exists(CheckResultSerializer::KEY_NULL_RESULT, $serialization)) { |
|
| 65 | + $result = new NullResult($contextCursor); |
|
| 66 | 66 | $cachingMetadata = CachingMetadata::fresh(); |
| 67 | 67 | } else { |
| 68 | 68 | $constraint = $this->constraintDeserializer->deserialize( |
@@ -73,7 +73,7 @@ discard block |
||
| 73 | 73 | |
| 74 | 74 | $status = $serialization[CheckResultSerializer::KEY_CHECK_RESULT_STATUS]; |
| 75 | 75 | |
| 76 | - $violationMessage = $this->getViolationMessageFromSerialization( $serialization ); |
|
| 76 | + $violationMessage = $this->getViolationMessageFromSerialization($serialization); |
|
| 77 | 77 | |
| 78 | 78 | $result = new CheckResult( |
| 79 | 79 | $contextCursor, |
@@ -88,13 +88,13 @@ discard block |
||
| 88 | 88 | ); |
| 89 | 89 | } |
| 90 | 90 | |
| 91 | - $dependencyMetadata = $this->getDependencyMetadataFromSerialization( $serialization ); |
|
| 91 | + $dependencyMetadata = $this->getDependencyMetadataFromSerialization($serialization); |
|
| 92 | 92 | |
| 93 | 93 | return $result->withMetadata( |
| 94 | - Metadata::merge( [ |
|
| 95 | - Metadata::ofCachingMetadata( $cachingMetadata ), |
|
| 96 | - Metadata::ofDependencyMetadata( $dependencyMetadata ), |
|
| 97 | - ] ) |
|
| 94 | + Metadata::merge([ |
|
| 95 | + Metadata::ofCachingMetadata($cachingMetadata), |
|
| 96 | + Metadata::ofDependencyMetadata($dependencyMetadata), |
|
| 97 | + ]) |
|
| 98 | 98 | ); |
| 99 | 99 | } |
| 100 | 100 | |
@@ -102,8 +102,8 @@ discard block |
||
| 102 | 102 | * @param array $serialization |
| 103 | 103 | * @return null|ViolationMessage |
| 104 | 104 | */ |
| 105 | - private function getViolationMessageFromSerialization( array $serialization ) { |
|
| 106 | - if ( array_key_exists( CheckResultSerializer::KEY_VIOLATION_MESSAGE, $serialization ) ) { |
|
| 105 | + private function getViolationMessageFromSerialization(array $serialization) { |
|
| 106 | + if (array_key_exists(CheckResultSerializer::KEY_VIOLATION_MESSAGE, $serialization)) { |
|
| 107 | 107 | return $this->violationMessageDeserializer->deserialize( |
| 108 | 108 | $serialization[CheckResultSerializer::KEY_VIOLATION_MESSAGE] |
| 109 | 109 | ); |
@@ -116,8 +116,8 @@ discard block |
||
| 116 | 116 | * @param array $serialization |
| 117 | 117 | * @return DependencyMetadata |
| 118 | 118 | */ |
| 119 | - private function getDependencyMetadataFromSerialization( array $serialization ) { |
|
| 120 | - if ( array_key_exists( CheckResultSerializer::KEY_DEPENDENCY_METADATA, $serialization ) ) { |
|
| 119 | + private function getDependencyMetadataFromSerialization(array $serialization) { |
|
| 120 | + if (array_key_exists(CheckResultSerializer::KEY_DEPENDENCY_METADATA, $serialization)) { |
|
| 121 | 121 | return $this->deserializeDependencyMetadata( |
| 122 | 122 | $serialization[CheckResultSerializer::KEY_DEPENDENCY_METADATA] |
| 123 | 123 | ); |
@@ -130,7 +130,7 @@ discard block |
||
| 130 | 130 | * @param array $serialization |
| 131 | 131 | * @return CachingMetadata |
| 132 | 132 | */ |
| 133 | - private function deserializeCachingMetadata( array $serialization ) { |
|
| 133 | + private function deserializeCachingMetadata(array $serialization) { |
|
| 134 | 134 | if ( |
| 135 | 135 | array_key_exists( |
| 136 | 136 | CheckResultSerializer::KEY_CACHING_METADATA_MAX_AGE, |
@@ -149,7 +149,7 @@ discard block |
||
| 149 | 149 | * @param array $serialization |
| 150 | 150 | * @return DependencyMetadata |
| 151 | 151 | */ |
| 152 | - private function deserializeDependencyMetadata( array $serialization ) { |
|
| 152 | + private function deserializeDependencyMetadata(array $serialization) { |
|
| 153 | 153 | if ( |
| 154 | 154 | array_key_exists( |
| 155 | 155 | CheckResultSerializer::KEY_DEPENDENCY_METADATA_FUTURE_TIME, |
@@ -159,20 +159,20 @@ discard block |
||
| 159 | 159 | $futureTime = TimeValue::newFromArray( |
| 160 | 160 | $serialization[CheckResultSerializer::KEY_DEPENDENCY_METADATA_FUTURE_TIME] |
| 161 | 161 | ); |
| 162 | - $futureTimeDependencyMetadata = DependencyMetadata::ofFutureTime( $futureTime ); |
|
| 162 | + $futureTimeDependencyMetadata = DependencyMetadata::ofFutureTime($futureTime); |
|
| 163 | 163 | } else { |
| 164 | 164 | $futureTimeDependencyMetadata = DependencyMetadata::blank(); |
| 165 | 165 | } |
| 166 | 166 | |
| 167 | 167 | $dependencyMetadata = array_reduce( |
| 168 | 168 | $serialization[CheckResultSerializer::KEY_DEPENDENCY_METADATA_ENTITY_IDS], |
| 169 | - function ( DependencyMetadata $metadata, $entityIdSerialization ) { |
|
| 170 | - $entityId = $this->entityIdParser->parse( $entityIdSerialization ); |
|
| 169 | + function(DependencyMetadata $metadata, $entityIdSerialization) { |
|
| 170 | + $entityId = $this->entityIdParser->parse($entityIdSerialization); |
|
| 171 | 171 | |
| 172 | - return DependencyMetadata::merge( [ |
|
| 172 | + return DependencyMetadata::merge([ |
|
| 173 | 173 | $metadata, |
| 174 | - DependencyMetadata::ofEntityId( $entityId ) |
|
| 175 | - ] ); |
|
| 174 | + DependencyMetadata::ofEntityId($entityId) |
|
| 175 | + ]); |
|
| 176 | 176 | }, |
| 177 | 177 | $futureTimeDependencyMetadata |
| 178 | 178 | ); |
@@ -4,17 +4,17 @@ |
||
| 4 | 4 | * @license GPL-2.0-or-later |
| 5 | 5 | */ |
| 6 | 6 | |
| 7 | -if ( function_exists( 'wfLoadExtension' ) ) { |
|
| 8 | - wfLoadExtension( 'WikibaseQualityConstraints', __DIR__ . '/extension.json' ); |
|
| 7 | +if (function_exists('wfLoadExtension')) { |
|
| 8 | + wfLoadExtension('WikibaseQualityConstraints', __DIR__.'/extension.json'); |
|
| 9 | 9 | // Keep i18n globals so mergeMessageFileList.php doesn't break |
| 10 | - $wgMessagesDirs['WikibaseQualityConstraints'] = __DIR__ . '/i18n'; |
|
| 11 | - $wgExtensionMessagesFiles['WikibaseQualityConstraintsAlias'] = __DIR__ . '/WikibaseQualityConstraints.alias.php'; |
|
| 10 | + $wgMessagesDirs['WikibaseQualityConstraints'] = __DIR__.'/i18n'; |
|
| 11 | + $wgExtensionMessagesFiles['WikibaseQualityConstraintsAlias'] = __DIR__.'/WikibaseQualityConstraints.alias.php'; |
|
| 12 | 12 | wfWarn( |
| 13 | - 'Deprecated PHP entry point used for WikibaseQualityConstraints extension. ' . |
|
| 14 | - 'Please use wfLoadExtension instead, ' . |
|
| 13 | + 'Deprecated PHP entry point used for WikibaseQualityConstraints extension. '. |
|
| 14 | + 'Please use wfLoadExtension instead, '. |
|
| 15 | 15 | 'see https://www.mediawiki.org/wiki/Extension_registration for more details.' |
| 16 | 16 | ); |
| 17 | 17 | return; |
| 18 | 18 | } else { |
| 19 | - die( 'This version of the WikibaseQualityConstraints extension requires MediaWiki 1.25+' ); |
|
| 19 | + die('This version of the WikibaseQualityConstraints extension requires MediaWiki 1.25+'); |
|
| 20 | 20 | } |
@@ -39,17 +39,17 @@ discard block |
||
| 39 | 39 | ]; |
| 40 | 40 | } |
| 41 | 41 | |
| 42 | - public function checkConstraint( Context $context, Constraint $constraint ) { |
|
| 43 | - if ( $context->getSnak()->getType() !== 'value' ) { |
|
| 44 | - return new CheckResult( $context, $constraint, [], CheckResult::STATUS_COMPLIANCE ); |
|
| 42 | + public function checkConstraint(Context $context, Constraint $constraint) { |
|
| 43 | + if ($context->getSnak()->getType() !== 'value') { |
|
| 44 | + return new CheckResult($context, $constraint, [], CheckResult::STATUS_COMPLIANCE); |
|
| 45 | 45 | } |
| 46 | 46 | |
| 47 | 47 | /** @var PropertyValueSnak $snak */ |
| 48 | 48 | $snak = $context->getSnak(); |
| 49 | 49 | |
| 50 | - if ( $snak->getDataValue() instanceof QuantityValue ) { |
|
| 51 | - $message = ( new ViolationMessage( 'wbqc-violation-message-noBounds' ) ) |
|
| 52 | - ->withEntityId( $context->getSnak()->getPropertyId(), Role::CONSTRAINT_PROPERTY ); |
|
| 50 | + if ($snak->getDataValue() instanceof QuantityValue) { |
|
| 51 | + $message = (new ViolationMessage('wbqc-violation-message-noBounds')) |
|
| 52 | + ->withEntityId($context->getSnak()->getPropertyId(), Role::CONSTRAINT_PROPERTY); |
|
| 53 | 53 | return new CheckResult( |
| 54 | 54 | $context, |
| 55 | 55 | $constraint, |
@@ -59,10 +59,10 @@ discard block |
||
| 59 | 59 | ); |
| 60 | 60 | } |
| 61 | 61 | |
| 62 | - return new CheckResult( $context, $constraint, [], CheckResult::STATUS_COMPLIANCE ); |
|
| 62 | + return new CheckResult($context, $constraint, [], CheckResult::STATUS_COMPLIANCE); |
|
| 63 | 63 | } |
| 64 | 64 | |
| 65 | - public function checkConstraintParameters( Constraint $constraint ) { |
|
| 65 | + public function checkConstraintParameters(Constraint $constraint) { |
|
| 66 | 66 | // no parameters |
| 67 | 67 | return []; |
| 68 | 68 | } |
@@ -21,9 +21,9 @@ |
||
| 21 | 21 | /** |
| 22 | 22 | * @param ViolationMessage $violationMessage |
| 23 | 23 | */ |
| 24 | - public function __construct( ViolationMessage $violationMessage ) { |
|
| 25 | - $message = '⧼' . $violationMessage->getMessageKey() . '⧽'; |
|
| 26 | - parent::__construct( $message ); |
|
| 24 | + public function __construct(ViolationMessage $violationMessage) { |
|
| 25 | + $message = '⧼'.$violationMessage->getMessageKey().'⧽'; |
|
| 26 | + parent::__construct($message); |
|
| 27 | 27 | |
| 28 | 28 | $this->violationMessage = $violationMessage; |
| 29 | 29 | } |
@@ -55,34 +55,34 @@ discard block |
||
| 55 | 55 | * (temporarily, pre-rendered strings are allowed and returned without changes) |
| 56 | 56 | * @return string |
| 57 | 57 | */ |
| 58 | - public function render( ViolationMessage $violationMessage ) { |
|
| 59 | - if ( !array_key_exists( $violationMessage->getMessageKey(), $this->alternativeMessageKeys ) ) { |
|
| 60 | - return parent::render( $violationMessage ); |
|
| 58 | + public function render(ViolationMessage $violationMessage) { |
|
| 59 | + if (!array_key_exists($violationMessage->getMessageKey(), $this->alternativeMessageKeys)) { |
|
| 60 | + return parent::render($violationMessage); |
|
| 61 | 61 | } |
| 62 | 62 | |
| 63 | 63 | $arguments = $violationMessage->getArguments(); |
| 64 | - $multilingualTextArgument = array_pop( $arguments ); |
|
| 64 | + $multilingualTextArgument = array_pop($arguments); |
|
| 65 | 65 | $multilingualTextParams = $this->renderMultilingualText( |
| 66 | 66 | $multilingualTextArgument['value'], |
| 67 | 67 | $multilingualTextArgument['role'] |
| 68 | 68 | ); |
| 69 | 69 | |
| 70 | - $paramsLists = [ [] ]; |
|
| 71 | - foreach ( $arguments as $argument ) { |
|
| 72 | - $paramsLists[] = $this->renderArgument( $argument ); |
|
| 70 | + $paramsLists = [[]]; |
|
| 71 | + foreach ($arguments as $argument) { |
|
| 72 | + $paramsLists[] = $this->renderArgument($argument); |
|
| 73 | 73 | } |
| 74 | - $regularParams = call_user_func_array( 'array_merge', $paramsLists ); |
|
| 74 | + $regularParams = call_user_func_array('array_merge', $paramsLists); |
|
| 75 | 75 | |
| 76 | - if ( $multilingualTextParams === null ) { |
|
| 76 | + if ($multilingualTextParams === null) { |
|
| 77 | 77 | return $this->messageLocalizer |
| 78 | - ->msg( $this->alternativeMessageKeys[$violationMessage->getMessageKey()] ) |
|
| 79 | - ->params( $regularParams ) |
|
| 78 | + ->msg($this->alternativeMessageKeys[$violationMessage->getMessageKey()]) |
|
| 79 | + ->params($regularParams) |
|
| 80 | 80 | ->escaped(); |
| 81 | 81 | } else { |
| 82 | 82 | return $this->messageLocalizer |
| 83 | - ->msg( $violationMessage->getMessageKey() ) |
|
| 84 | - ->params( $regularParams ) |
|
| 85 | - ->params( $multilingualTextParams ) |
|
| 83 | + ->msg($violationMessage->getMessageKey()) |
|
| 84 | + ->params($regularParams) |
|
| 85 | + ->params($multilingualTextParams) |
|
| 86 | 86 | ->escaped(); |
| 87 | 87 | } |
| 88 | 88 | } |
@@ -93,18 +93,18 @@ discard block |
||
| 93 | 93 | * @return array[]|null list of parameters as accepted by Message::params(), |
| 94 | 94 | * or null if the text is not available in the user’s language |
| 95 | 95 | */ |
| 96 | - protected function renderMultilingualText( MultilingualTextValue $text, $role ) { |
|
| 96 | + protected function renderMultilingualText(MultilingualTextValue $text, $role) { |
|
| 97 | 97 | global $wgLang; |
| 98 | 98 | $languageCodes = $wgLang->getFallbackLanguages(); |
| 99 | - array_unshift( $languageCodes, $wgLang->getCode() ); |
|
| 99 | + array_unshift($languageCodes, $wgLang->getCode()); |
|
| 100 | 100 | |
| 101 | 101 | $texts = $text->getTexts(); |
| 102 | - foreach ( $languageCodes as $languageCode ) { |
|
| 103 | - if ( array_key_exists( $languageCode, $texts ) ) { |
|
| 104 | - return [ Message::rawParam( $this->addRole( |
|
| 105 | - htmlspecialchars( $texts[$languageCode]->getText() ), |
|
| 102 | + foreach ($languageCodes as $languageCode) { |
|
| 103 | + if (array_key_exists($languageCode, $texts)) { |
|
| 104 | + return [Message::rawParam($this->addRole( |
|
| 105 | + htmlspecialchars($texts[$languageCode]->getText()), |
|
| 106 | 106 | $role |
| 107 | - ) ) ]; |
|
| 107 | + ))]; |
|
| 108 | 108 | } |
| 109 | 109 | } |
| 110 | 110 | |