wikimedia / mediawiki-extensions-WikibaseQualityConstraints

src/Api/CachingResultsSource.php

Spacing +75 added lines, -76 removed lines

@@ -143,7 +143,7 @@ 
 			CheckResult::STATUS_WARNING,
 			CheckResult::STATUS_BAD_PARAMETERS,
 		];
-		$this->cachedStatusesFlipped = array_flip( $this->cachedStatuses );
+		$this->cachedStatusesFlipped = array_flip($this->cachedStatuses);
 	}
 
 	public function getResults(
@@ -154,15 +154,15 @@ 
 	) {
 		$results = [];
 		$metadatas = [];
-		$statusesFlipped = array_flip( $statuses );
-		if ( $this->canUseStoredResults( $entityIds, $claimIds, $constraintIds, $statuses ) ) {
+		$statusesFlipped = array_flip($statuses);
+		if ($this->canUseStoredResults($entityIds, $claimIds, $constraintIds, $statuses)) {
 			$storedEntityIds = [];
-			foreach ( $entityIds as $entityId ) {
-				$storedResults = $this->getStoredResults( $entityId );
-				if ( $storedResults !== null ) {
-					$this->loggingHelper->logCheckConstraintsCacheHit( $entityId );
-					foreach ( $storedResults->getArray() as $checkResult ) {
-						if ( $this->statusSelected( $statusesFlipped, $checkResult ) ) {
+			foreach ($entityIds as $entityId) {
+				$storedResults = $this->getStoredResults($entityId);
+				if ($storedResults !== null) {
+					$this->loggingHelper->logCheckConstraintsCacheHit($entityId);
+					foreach ($storedResults->getArray() as $checkResult) {
+						if ($this->statusSelected($statusesFlipped, $checkResult)) {
 							$results[] = $checkResult;
 						}
 					}
@@ -170,19 +170,19 @@ 
 					$storedEntityIds[] = $entityId;
 				}
 			}
-			$entityIds = array_values( array_diff( $entityIds, $storedEntityIds ) );
+			$entityIds = array_values(array_diff($entityIds, $storedEntityIds));
 		}
-		if ( $entityIds !== [] || $claimIds !== [] ) {
-			if ( $entityIds !== [] ) {
-				$this->loggingHelper->logCheckConstraintsCacheMisses( $entityIds );
+		if ($entityIds !== [] || $claimIds !== []) {
+			if ($entityIds !== []) {
+				$this->loggingHelper->logCheckConstraintsCacheMisses($entityIds);
 			}
-			$response = $this->getAndStoreResults( $entityIds, $claimIds, $constraintIds, $statuses );
-			$results = array_merge( $results, $response->getArray() );
+			$response = $this->getAndStoreResults($entityIds, $claimIds, $constraintIds, $statuses);
+			$results = array_merge($results, $response->getArray());
 			$metadatas[] = $response->getMetadata();
 		}
 		return new CachedCheckResults(
 			$results,
-			Metadata::merge( $metadatas )
+			Metadata::merge($metadatas)
 		);
 	}
 
@@ -205,13 +205,13 @@ 
 		array $constraintIds = null,
 		array $statuses
 	) {
-		if ( $claimIds !== [] ) {
+		if ($claimIds !== []) {
 			return false;
 		}
-		if ( $constraintIds !== null ) {
+		if ($constraintIds !== null) {
 			return false;
 		}
-		if ( array_diff( $statuses, $this->cachedStatuses ) !== [] ) {
+		if (array_diff($statuses, $this->cachedStatuses) !== []) {
 			return false;
 		}
 		return true;
@@ -226,8 +226,8 @@ 
 	 * @param CheckResult $result
 	 * @return bool
 	 */
-	private function statusSelected( array $statusesFlipped, CheckResult $result ) {
-		return array_key_exists( $result->getStatus(), $statusesFlipped ) ||
+	private function statusSelected(array $statusesFlipped, CheckResult $result) {
+		return array_key_exists($result->getStatus(), $statusesFlipped) ||
 			$result instanceof NullResult;
 	}
 
@@ -244,11 +244,11 @@ 
 		array $constraintIds = null,
 		array $statuses
 	) {
-		$results = $this->resultsSource->getResults( $entityIds, $claimIds, $constraintIds, $statuses );
+		$results = $this->resultsSource->getResults($entityIds, $claimIds, $constraintIds, $statuses);
 
-		if ( $this->canStoreResults( $entityIds, $claimIds, $constraintIds, $statuses ) ) {
-			foreach ( $entityIds as $entityId ) {
-				$this->storeResults( $entityId, $results );
+		if ($this->canStoreResults($entityIds, $claimIds, $constraintIds, $statuses)) {
+			foreach ($entityIds as $entityId) {
+				$this->storeResults($entityId, $results);
 			}
 		}
 
@@ -279,10 +279,10 @@ 
 		array $constraintIds = null,
 		array $statuses
 	) {
-		if ( $constraintIds !== null ) {
+		if ($constraintIds !== null) {
 			return false;
 		}
-		if ( array_diff( $this->cachedStatuses, $statuses ) !== [] ) {
+		if (array_diff($this->cachedStatuses, $statuses) !== []) {
 			return false;
 		}
 		return true;
@@ -296,21 +296,21 @@ 
 	 * May include check results for other entity IDs as well,
 	 * or check results with statuses that we’re not interested in caching.
 	 */
-	private function storeResults( EntityId $entityId, CachedCheckResults $results ) {
+	private function storeResults(EntityId $entityId, CachedCheckResults $results) {
 		$latestRevisionIds = $this->getLatestRevisionIds(
 			$results->getMetadata()->getDependencyMetadata()->getEntityIds()
 		);
-		if ( $latestRevisionIds === null ) {
+		if ($latestRevisionIds === null) {
 			return;
 		}
 
 		$resultSerializations = [];
-		foreach ( $results->getArray() as $checkResult ) {
-			if ( $checkResult->getContextCursor()->getEntityId() !== $entityId->getSerialization() ) {
+		foreach ($results->getArray() as $checkResult) {
+			if ($checkResult->getContextCursor()->getEntityId() !== $entityId->getSerialization()) {
 				continue;
 			}
-			if ( $this->statusSelected( $this->cachedStatusesFlipped, $checkResult ) ) {
-				$resultSerializations[] = $this->checkResultSerializer->serialize( $checkResult );
+			if ($this->statusSelected($this->cachedStatusesFlipped, $checkResult)) {
+				$resultSerializations[] = $this->checkResultSerializer->serialize($checkResult);
 			}
 		}
 
@@ -319,11 +319,11 @@ 
 			'latestRevisionIds' => $latestRevisionIds,
 		];
 		$futureTime = $results->getMetadata()->getDependencyMetadata()->getFutureTime();
-		if ( $futureTime !== null ) {
+		if ($futureTime !== null) {
 			$value['futureTime'] = $futureTime->getArrayValue();
 		}
 
-		$this->cache->set( $entityId, $value, $this->ttlInSeconds );
+		$this->cache->set($entityId, $value, $this->ttlInSeconds);
 	}
 
 	/**
@@ -333,30 +333,29 @@ 
 	public function getStoredResults(
 		EntityId $entityId
 	) {
-		$value = $this->cache->get( $entityId, $curTTL, [], $asOf );
-		$now = call_user_func( $this->microtime, true );
+		$value = $this->cache->get($entityId, $curTTL, [], $asOf);
+		$now = call_user_func($this->microtime, true);
 
-		$dependencyMetadata = $this->checkDependencyMetadata( $value );
-		if ( $dependencyMetadata === null ) {
+		$dependencyMetadata = $this->checkDependencyMetadata($value);
+		if ($dependencyMetadata === null) {
 			return null;
 		}
 
-		$ageInSeconds = (int)ceil( $now - $asOf );
+		$ageInSeconds = (int) ceil($now - $asOf);
 		$cachingMetadata = $ageInSeconds > 0 ?
-			CachingMetadata::ofMaximumAgeInSeconds( $ageInSeconds ) :
-			CachingMetadata::fresh();
+			CachingMetadata::ofMaximumAgeInSeconds($ageInSeconds) : CachingMetadata::fresh();
 
 		$results = [];
-		foreach ( $value['results'] as $resultSerialization ) {
-			$results[] = $this->deserializeCheckResult( $resultSerialization, $cachingMetadata );
+		foreach ($value['results'] as $resultSerialization) {
+			$results[] = $this->deserializeCheckResult($resultSerialization, $cachingMetadata);
 		}
 
 		return new CachedCheckResults(
 			$results,
-			Metadata::merge( [
-				Metadata::ofCachingMetadata( $cachingMetadata ),
-				Metadata::ofDependencyMetadata( $dependencyMetadata ),
-			] )
+			Metadata::merge([
+				Metadata::ofCachingMetadata($cachingMetadata),
+				Metadata::ofDependencyMetadata($dependencyMetadata),
+			])
 		);
 	}
 
@@ -368,37 +367,37 @@ 
 	 * @return DependencyMetadata|null the dependency metadata,
 	 * or null if $value should no longer be used
 	 */
-	private function checkDependencyMetadata( $value ) {
-		if ( $value === false ) {
+	private function checkDependencyMetadata($value) {
+		if ($value === false) {
 			return null;
 		}
 
-		if ( array_key_exists( 'futureTime', $value ) ) {
-			$futureTime = TimeValue::newFromArray( $value['futureTime'] );
-			if ( !$this->timeValueComparer->isFutureTime( $futureTime ) ) {
+		if (array_key_exists('futureTime', $value)) {
+			$futureTime = TimeValue::newFromArray($value['futureTime']);
+			if (!$this->timeValueComparer->isFutureTime($futureTime)) {
 				return null;
 			}
-			$futureTimeDependencyMetadata = DependencyMetadata::ofFutureTime( $futureTime );
+			$futureTimeDependencyMetadata = DependencyMetadata::ofFutureTime($futureTime);
 		} else {
 			$futureTimeDependencyMetadata = DependencyMetadata::blank();
 		}
 
 		$dependedEntityIds = array_map(
-			[ $this->entityIdParser, "parse" ],
-			array_keys( $value['latestRevisionIds'] )
+			[$this->entityIdParser, "parse"],
+			array_keys($value['latestRevisionIds'])
 		);
 
-		if ( $value['latestRevisionIds'] !== $this->getLatestRevisionIds( $dependedEntityIds ) ) {
+		if ($value['latestRevisionIds'] !== $this->getLatestRevisionIds($dependedEntityIds)) {
 			return null;
 		}
 
 		return array_reduce(
 			$dependedEntityIds,
-			function( DependencyMetadata $metadata, EntityId $entityId ) {
-				return DependencyMetadata::merge( [
+			function(DependencyMetadata $metadata, EntityId $entityId) {
+				return DependencyMetadata::merge([
 					$metadata,
-					DependencyMetadata::ofEntityId( $entityId )
-				] );
+					DependencyMetadata::ofEntityId($entityId)
+				]);
 			},
 			$futureTimeDependencyMetadata
 		);
@@ -418,13 +417,13 @@ 
 		array $resultSerialization,
 		CachingMetadata $cachingMetadata
 	) {
-		$result = $this->checkResultDeserializer->deserialize( $resultSerialization );
-		if ( $this->isPossiblyStaleResult( $result ) ) {
+		$result = $this->checkResultDeserializer->deserialize($resultSerialization);
+		if ($this->isPossiblyStaleResult($result)) {
 			$result->withMetadata(
-				Metadata::merge( [
+				Metadata::merge([
 					$result->getMetadata(),
-					Metadata::ofCachingMetadata( $cachingMetadata ),
-				] )
+					Metadata::ofCachingMetadata($cachingMetadata),
+				])
 			);
 		}
 		return $result;
@@ -434,8 +433,8 @@ 
 	 * @param CheckResult $result
 	 * @return bool
 	 */
-	private function isPossiblyStaleResult( CheckResult $result ) {
-		if ( $result instanceof NullResult ) {
+	private function isPossiblyStaleResult(CheckResult $result) {
+		if ($result instanceof NullResult) {
 			return false;
 		}
 
@@ -450,14 +449,14 @@ 
 	 * @return int[]|null array from entity ID serializations to revision ID,
 	 * or null to indicate that not all revision IDs could be loaded
 	 */
-	private function getLatestRevisionIds( array $entityIds ) {
-		if ( $entityIds === [] ) {
+	private function getLatestRevisionIds(array $entityIds) {
+		if ($entityIds === []) {
 			$this->loggingHelper->logEmptyDependencyMetadata();
 			return [];
 		}
-		if ( count( $entityIds ) > $this->maxRevisionIds ) {
+		if (count($entityIds) > $this->maxRevisionIds) {
 			// one of those entities will probably be edited soon, so might as well skip caching
-			$this->loggingHelper->logHugeDependencyMetadata( $entityIds, $this->maxRevisionIds );
+			$this->loggingHelper->logHugeDependencyMetadata($entityIds, $this->maxRevisionIds);
 			return null;
 		}
 
@@ -465,7 +464,7 @@ 
 			$entityIds,
 			EntityRevisionLookup::LATEST_FROM_REPLICA
 		);
-		if ( $this->hasFalseElements( $latestRevisionIds ) ) {
+		if ($this->hasFalseElements($latestRevisionIds)) {
 			return null;
 		}
 		return $latestRevisionIds;
@@ -475,8 +474,8 @@ 
 	 * @param array $array
 	 * @return bool
 	 */
-	private function hasFalseElements( array $array ) {
-		return in_array( false, $array, true );
+	private function hasFalseElements(array $array) {
+		return in_array(false, $array, true);
 	}
 
 	/**
@@ -484,7 +483,7 @@ 
 	 *
 	 * @param callable $microtime
 	 */
-	public function setMicrotimeFunction( callable $microtime ) {
+	public function setMicrotimeFunction(callable $microtime) {
 		$this->microtime = $microtime;
 	}
 

src/Api/CheckingResultsSource.php

Spacing +20 added lines, -21 removed lines

@@ -44,57 +44,56 @@
 	) {
 		$results = [];
 		$metadatas = [];
-		$statusesFlipped = array_flip( $statuses );
-		foreach ( $entityIds as $entityId ) {
+		$statusesFlipped = array_flip($statuses);
+		foreach ($entityIds as $entityId) {
 			$entityResults = $this->delegatingConstraintChecker->checkAgainstConstraintsOnEntityId(
 				$entityId,
 				$constraintIds,
-				[ $this, 'defaultResultsPerContext' ],
-				[ $this, 'defaultResultsPerEntity' ]
+				[$this, 'defaultResultsPerContext'],
+				[$this, 'defaultResultsPerEntity']
 			);
-			foreach ( $entityResults as $result ) {
+			foreach ($entityResults as $result) {
 				$metadatas[] = $result->getMetadata();
-				if ( $this->statusSelected( $statusesFlipped, $result ) ) {
+				if ($this->statusSelected($statusesFlipped, $result)) {
 					$results[] = $result;
 				}
 			}
 		}
-		foreach ( $claimIds as $claimId ) {
+		foreach ($claimIds as $claimId) {
 			$claimResults = $this->delegatingConstraintChecker->checkAgainstConstraintsOnClaimId(
 				$claimId,
 				$constraintIds,
-				[ $this, 'defaultResultsPerContext' ]
+				[$this, 'defaultResultsPerContext']
 			);
-			foreach ( $claimResults as $result ) {
+			foreach ($claimResults as $result) {
 				$metadatas[] = $result->getMetadata();
-				if ( $this->statusSelected( $statusesFlipped, $result ) ) {
+				if ($this->statusSelected($statusesFlipped, $result)) {
 					$results[] = $result;
 				}
 			}
 		}
 		return new CachedCheckResults(
 			$results,
-			Metadata::merge( $metadatas )
+			Metadata::merge($metadatas)
 		);
 	}
 
-	public function defaultResultsPerContext( Context $context ) {
+	public function defaultResultsPerContext(Context $context) {
 		return $context->getType() === Context::TYPE_STATEMENT ?
-			[ new NullResult( $context->getCursor() ) ] :
-			[];
+			[new NullResult($context->getCursor())] : [];
 	}
 
-	public function defaultResultsPerEntity( EntityId $entityId ) {
+	public function defaultResultsPerEntity(EntityId $entityId) {
 		return [
-			( new NullResult( new EntityContextCursor( $entityId->getSerialization() ) ) )
-				->withMetadata( Metadata::ofDependencyMetadata(
-					DependencyMetadata::ofEntityId( $entityId )
-				) )
+			(new NullResult(new EntityContextCursor($entityId->getSerialization())))
+				->withMetadata(Metadata::ofDependencyMetadata(
+					DependencyMetadata::ofEntityId($entityId)
+				))
 		];
 	}
 
-	public function statusSelected( array $statusesFlipped, CheckResult $result ) {
-		return array_key_exists( $result->getStatus(), $statusesFlipped ) ||
+	public function statusSelected(array $statusesFlipped, CheckResult $result) {
+		return array_key_exists($result->getStatus(), $statusesFlipped) ||
 			$result instanceof NullResult;
 	}