wikimedia / mediawiki-extensions-WikibaseQualityConstraints

src/ConstraintCheck/Checker/TypeChecker.php

Spacing +22 added lines, -22 removed lines

@@ -69,32 +69,32 @@ 
 	 *
 	 * @throws SparqlHelperException if the checker uses SPARQL and the query times out or some other error occurs
 	 */
-	public function checkConstraint( Context $context, Constraint $constraint ) {
-		if ( $context->getSnakRank() === Statement::RANK_DEPRECATED ) {
-			return new CheckResult( $context, $constraint, [], CheckResult::STATUS_DEPRECATED );
+	public function checkConstraint(Context $context, Constraint $constraint) {
+		if ($context->getSnakRank() === Statement::RANK_DEPRECATED) {
+			return new CheckResult($context, $constraint, [], CheckResult::STATUS_DEPRECATED);
 		}
-		if ( $context->getType() === Context::TYPE_REFERENCE ) {
-			return new CheckResult( $context, $constraint, [], CheckResult::STATUS_NOT_MAIN_SNAK );
+		if ($context->getType() === Context::TYPE_REFERENCE) {
+			return new CheckResult($context, $constraint, [], CheckResult::STATUS_NOT_MAIN_SNAK);
 		}
 
 		$parameters = [];
 		$constraintParameters = $constraint->getConstraintParameters();
 
-		$classes = $this->constraintParameterParser->parseClassParameter( $constraintParameters, $constraint->getConstraintTypeItemId() );
+		$classes = $this->constraintParameterParser->parseClassParameter($constraintParameters, $constraint->getConstraintTypeItemId());
 		$parameters['class'] = array_map(
-			function( $id ) {
-				return new ItemId( $id );
+			function($id) {
+				return new ItemId($id);
 			},
 			$classes
 		);
 
-		$relation = $this->constraintParameterParser->parseRelationParameter( $constraintParameters, $constraint->getConstraintTypeItemId() );
-		if ( $relation === 'instance' ) {
-			$relationId = $this->config->get( 'WBQualityConstraintsInstanceOfId' );
-		} elseif ( $relation === 'subclass' ) {
-			$relationId = $this->config->get( 'WBQualityConstraintsSubclassOfId' );
+		$relation = $this->constraintParameterParser->parseRelationParameter($constraintParameters, $constraint->getConstraintTypeItemId());
+		if ($relation === 'instance') {
+			$relationId = $this->config->get('WBQualityConstraintsInstanceOfId');
+		} elseif ($relation === 'subclass') {
+			$relationId = $this->config->get('WBQualityConstraintsSubclassOfId');
 		}
-		$parameters['relation'] = [ $relation ];
+		$parameters['relation'] = [$relation];
 
 		$result = $this->typeCheckerHelper->hasClassInRelation(
 			$context->getEntity()->getStatements(),
@@ -102,7 +102,7 @@ 
 			$classes
 		);
 
-		if ( $result->getBool() ) {
+		if ($result->getBool()) {
 			$message = '';
 			$status = CheckResult::STATUS_COMPLIANCE;
 		} else {
@@ -116,21 +116,21 @@ 
 			$status = CheckResult::STATUS_VIOLATION;
 		}
 
-		return ( new CheckResult( $context, $constraint, $parameters, $status, $message ) )
-			->withMetadata( $result->getMetadata() );
+		return (new CheckResult($context, $constraint, $parameters, $status, $message))
+			->withMetadata($result->getMetadata());
 	}
 
-	public function checkConstraintParameters( Constraint $constraint ) {
+	public function checkConstraintParameters(Constraint $constraint) {
 		$constraintParameters = $constraint->getConstraintParameters();
 		$exceptions = [];
 		try {
-			$this->constraintParameterParser->parseClassParameter( $constraintParameters, $constraint->getConstraintTypeItemId() );
-		} catch ( ConstraintParameterException $e ) {
+			$this->constraintParameterParser->parseClassParameter($constraintParameters, $constraint->getConstraintTypeItemId());
+		} catch (ConstraintParameterException $e) {
 			$exceptions[] = $e;
 		}
 		try {
-			$this->constraintParameterParser->parseRelationParameter( $constraintParameters, $constraint->getConstraintTypeItemId() );
-		} catch ( ConstraintParameterException $e ) {
+			$this->constraintParameterParser->parseRelationParameter($constraintParameters, $constraint->getConstraintTypeItemId());
+		} catch (ConstraintParameterException $e) {
 			$exceptions[] = $e;
 		}
 		return $exceptions;

src/ConstraintCheck/Checker/SymmetricChecker.php

Spacing +24 added lines, -24 removed lines

@@ -60,12 +60,12 @@ 
 	 *
 	 * @return CheckResult
 	 */
-	public function checkConstraint( Context $context, Constraint $constraint ) {
-		if ( $context->getSnakRank() === Statement::RANK_DEPRECATED ) {
-			return new CheckResult( $context, $constraint, [], CheckResult::STATUS_DEPRECATED );
+	public function checkConstraint(Context $context, Constraint $constraint) {
+		if ($context->getSnakRank() === Statement::RANK_DEPRECATED) {
+			return new CheckResult($context, $constraint, [], CheckResult::STATUS_DEPRECATED);
 		}
-		if ( $context->getType() !== Context::TYPE_STATEMENT ) {
-			return new CheckResult( $context, $constraint, [], CheckResult::STATUS_NOT_MAIN_SNAK );
+		if ($context->getType() !== Context::TYPE_STATEMENT) {
+			return new CheckResult($context, $constraint, [], CheckResult::STATUS_NOT_MAIN_SNAK);
 		}
 
 		$parameters = [];
@@ -73,9 +73,9 @@ 
 		$snak = $context->getSnak();
 		$propertyId = $context->getSnak()->getPropertyId();
 
-		if ( !$snak instanceof PropertyValueSnak ) {
+		if (!$snak instanceof PropertyValueSnak) {
 			// nothing to check
-			return new CheckResult( $context, $constraint, $parameters, CheckResult::STATUS_COMPLIANCE, '' );
+			return new CheckResult($context, $constraint, $parameters, CheckResult::STATUS_COMPLIANCE, '');
 		}
 
 		$dataValue = $snak->getDataValue();
@@ -84,22 +84,22 @@ 
 		 * error handling:
 		 *   type of $dataValue for properties with 'Symmetric' constraint has to be 'wikibase-entityid'
 		 */
-		if ( $dataValue->getType() !== 'wikibase-entityid' ) {
-			$message = wfMessage( "wbqc-violation-message-value-needed-of-type" )
+		if ($dataValue->getType() !== 'wikibase-entityid') {
+			$message = wfMessage("wbqc-violation-message-value-needed-of-type")
 					 ->rawParams(
-						 $this->constraintParameterRenderer->formatItemId( $constraint->getConstraintTypeItemId(), Role::CONSTRAINT_TYPE_ITEM ),
+						 $this->constraintParameterRenderer->formatItemId($constraint->getConstraintTypeItemId(), Role::CONSTRAINT_TYPE_ITEM),
 						 'wikibase-entityid' // TODO is there a message for this type so we can localize it?
 					 )
 					 ->escaped();
-			return new CheckResult( $context, $constraint, $parameters, CheckResult::STATUS_VIOLATION, $message );
+			return new CheckResult($context, $constraint, $parameters, CheckResult::STATUS_VIOLATION, $message);
 		}
 		/** @var EntityIdValue $dataValue */
 
 		$targetEntityId = $dataValue->getEntityId();
-		$targetEntity = $this->entityLookup->getEntity( $targetEntityId );
-		if ( $targetEntity === null ) {
-			$message = wfMessage( "wbqc-violation-message-target-entity-must-exist" )->escaped();
-			return new CheckResult( $context, $constraint, $parameters, CheckResult::STATUS_VIOLATION, $message );
+		$targetEntity = $this->entityLookup->getEntity($targetEntityId);
+		if ($targetEntity === null) {
+			$message = wfMessage("wbqc-violation-message-target-entity-must-exist")->escaped();
+			return new CheckResult($context, $constraint, $parameters, CheckResult::STATUS_VIOLATION, $message);
 		}
 
 		$symmetricStatement = $this->connectionCheckerHelper->findStatementWithPropertyAndEntityIdValue(
@@ -107,26 +107,26 @@ 
 			$propertyId,
 			$context->getEntity()->getId()
 		);
-		if ( $symmetricStatement !== null ) {
+		if ($symmetricStatement !== null) {
 			$message = '';
 			$status = CheckResult::STATUS_COMPLIANCE;
 		} else {
-			$message = wfMessage( 'wbqc-violation-message-symmetric' )
+			$message = wfMessage('wbqc-violation-message-symmetric')
 					 ->rawParams(
-						 $this->constraintParameterRenderer->formatEntityId( $targetEntityId, Role::SUBJECT ),
-						 $this->constraintParameterRenderer->formatEntityId( $propertyId, Role::PREDICATE ),
-						 $this->constraintParameterRenderer->formatEntityId( $context->getEntity()->getId(), Role::OBJECT )
+						 $this->constraintParameterRenderer->formatEntityId($targetEntityId, Role::SUBJECT),
+						 $this->constraintParameterRenderer->formatEntityId($propertyId, Role::PREDICATE),
+						 $this->constraintParameterRenderer->formatEntityId($context->getEntity()->getId(), Role::OBJECT)
 					 )
 					 ->escaped();
 			$status = CheckResult::STATUS_VIOLATION;
 		}
 
-		return ( new CheckResult( $context, $constraint, $parameters, $status, $message ) )
-			->withMetadata( Metadata::ofDependencyMetadata(
-				DependencyMetadata::ofEntityId( $targetEntityId ) ) );
+		return (new CheckResult($context, $constraint, $parameters, $status, $message))
+			->withMetadata(Metadata::ofDependencyMetadata(
+				DependencyMetadata::ofEntityId($targetEntityId) ));
 	}
 
-	public function checkConstraintParameters( Constraint $constraint ) {
+	public function checkConstraintParameters(Constraint $constraint) {
 		// no parameters
 		return [];
 	}

src/ConstraintCheck/Cache/CachedArray.php

Spacing +1 added lines, -1 removed lines

@@ -20,7 +20,7 @@
 	 */
 	private $metadata;
 
-	public function __construct( array $array, Metadata $metadata ) {
+	public function __construct(array $array, Metadata $metadata) {
 		$this->array = $array;
 		$this->metadata = $metadata;
 	}

src/ConstraintCheck/Cache/DependencyMetadata.php

Spacing +5 added lines, -5 removed lines

@@ -29,7 +29,7 @@ 
 	 * @param EntityId $entityId An entity ID from which the value was derived.
 	 * @return self Indication that a value is was derived from the entity with the given ID.
 	 */
-	public static function ofEntityId( EntityId $entityId ) {
+	public static function ofEntityId(EntityId $entityId) {
 		$ret = new self;
 		$ret->entityIds[] = $entityId;
 		return $ret;
@@ -39,11 +39,11 @@ 
 	 * @param self[] $metadatas
 	 * @return self
 	 */
-	public static function merge( array $metadatas ) {
-		Assert::parameterElementType( self::class, $metadatas, '$metadatas' );
+	public static function merge(array $metadatas) {
+		Assert::parameterElementType(self::class, $metadatas, '$metadatas');
 		$ret = new self;
-		foreach ( $metadatas as $metadata ) {
-			$ret->entityIds = array_merge( $ret->entityIds, $metadata->entityIds );
+		foreach ($metadatas as $metadata) {
+			$ret->entityIds = array_merge($ret->entityIds, $metadata->entityIds);
 		}
 		return $ret;
 	}

src/ConstraintCheck/Cache/CachedBool.php

Spacing +1 added lines, -1 removed lines

@@ -24,7 +24,7 @@
 	 * @param bool $bool
 	 * @param Metadata $metadata
 	 */
-	public function __construct( $bool, Metadata $metadata ) {
+	public function __construct($bool, Metadata $metadata) {
 		$this->bool = $bool;
 		$this->metadata = $metadata;
 	}

src/ConstraintCheck/Cache/CachingMetadata.php

Spacing +8 added lines, -8 removed lines

@@ -29,9 +29,9 @@ 
 	 * @param int $maxAge The maximum age of the cached value (in seconds).
 	 * @return self Indication that a value is possibly outdated by up to this many seconds.
 	 */
-	public static function ofMaximumAgeInSeconds( $maxAge ) {
-		Assert::parameterType( 'integer', $maxAge, '$maxAge' );
-		Assert::parameter( $maxAge > 0, '$maxAge', '$maxage > 0' );
+	public static function ofMaximumAgeInSeconds($maxAge) {
+		Assert::parameterType('integer', $maxAge, '$maxAge');
+		Assert::parameter($maxAge > 0, '$maxAge', '$maxage > 0');
 		$ret = new self;
 		$ret->maxAge = $maxAge;
 		return $ret;
@@ -41,11 +41,11 @@ 
 	 * @param self[] $metadatas
 	 * @return self
 	 */
-	public static function merge( array $metadatas ) {
-		Assert::parameterElementType( self::class, $metadatas, '$metadatas' );
+	public static function merge(array $metadatas) {
+		Assert::parameterElementType(self::class, $metadatas, '$metadatas');
 		$ret = new self;
-		foreach ( $metadatas as $metadata ) {
-			$ret->maxAge = max( $ret->maxAge, $metadata->maxAge );
+		foreach ($metadatas as $metadata) {
+			$ret->maxAge = max($ret->maxAge, $metadata->maxAge);
 		}
 		return $ret;
 	}
@@ -63,7 +63,7 @@ 
 	 * For a fresh value, returns 0.
 	 */
 	public function getMaximumAgeInSeconds() {
-		if ( is_int( $this->maxAge ) ) {
+		if (is_int($this->maxAge)) {
 			return $this->maxAge;
 		} else {
 			return 0;

src/ConstraintCheck/Api/CheckingResultsBuilder.php

Spacing +23 added lines, -24 removed lines

@@ -73,44 +73,43 @@ 
 	) {
 		$response = [];
 		$metadatas = [];
-		foreach ( $entityIds as $entityId ) {
+		foreach ($entityIds as $entityId) {
 			$results = $this->delegatingConstraintChecker->checkAgainstConstraintsOnEntityId(
 				$entityId,
 				$constraintIds,
-				[ $this, 'defaultResults' ]
+				[$this, 'defaultResults']
 			);
-			foreach ( $results as $result ) {
+			foreach ($results as $result) {
 				$metadatas[] = $result->getMetadata();
-				$resultArray = $this->checkResultToArray( $result );
-				$result->getContext()->storeCheckResultInArray( $resultArray, $response );
+				$resultArray = $this->checkResultToArray($result);
+				$result->getContext()->storeCheckResultInArray($resultArray, $response);
 			}
 		}
-		foreach ( $claimIds as $claimId ) {
+		foreach ($claimIds as $claimId) {
 			$results = $this->delegatingConstraintChecker->checkAgainstConstraintsOnClaimId(
 				$claimId,
 				$constraintIds,
-				[ $this, 'defaultResults' ]
+				[$this, 'defaultResults']
 			);
-			foreach ( $results as $result ) {
+			foreach ($results as $result) {
 				$metadatas[] = $result->getMetadata();
-				$resultArray = $this->checkResultToArray( $result );
-				$result->getContext()->storeCheckResultInArray( $resultArray, $response );
+				$resultArray = $this->checkResultToArray($result);
+				$result->getContext()->storeCheckResultInArray($resultArray, $response);
 			}
 		}
 		return new CachedCheckConstraintsResponse(
 			$response,
-			Metadata::merge( $metadatas )
+			Metadata::merge($metadatas)
 		);
 	}
 
-	public function defaultResults( Context $context ) {
+	public function defaultResults(Context $context) {
 		return $context->getType() === Context::TYPE_STATEMENT ?
-			[ new NullResult( $context ) ] :
-			[];
+			[new NullResult($context)] : [];
 	}
 
-	public function checkResultToArray( CheckResult $checkResult ) {
-		if ( $checkResult instanceof NullResult ) {
+	public function checkResultToArray(CheckResult $checkResult) {
+		if ($checkResult instanceof NullResult) {
 			return null;
 		}
 
@@ -118,10 +117,10 @@ 
 		$typeItemId = $checkResult->getConstraint()->getConstraintTypeItemId();
 		$constraintPropertyId = $checkResult->getContext()->getSnak()->getPropertyId();
 
-		$title = $this->entityTitleLookup->getTitleForId( $constraintPropertyId );
-		$typeLabel = $this->entityIdLabelFormatter->formatEntityId( new ItemId( $typeItemId ) );
+		$title = $this->entityTitleLookup->getTitleForId($constraintPropertyId);
+		$typeLabel = $this->entityIdLabelFormatter->formatEntityId(new ItemId($typeItemId));
 		// TODO link to the statement when possible (T169224)
-		$link = $title->getFullUrl() . '#' . $this->config->get( 'WBQualityConstraintsPropertyConstraintId' );
+		$link = $title->getFullUrl().'#'.$this->config->get('WBQualityConstraintsPropertyConstraintId');
 
 		$constraint = [
 			'id' => $constraintId,
@@ -129,11 +128,11 @@ 
 			'typeLabel' => $typeLabel,
 			'link' => $link,
 		];
-		if ( $this->config->get( 'WBQualityConstraintsIncludeDetailInApi' ) ) {
+		if ($this->config->get('WBQualityConstraintsIncludeDetailInApi')) {
 			$parameters = $checkResult->getParameters();
 			$constraint += [
 				'detail' => $parameters,
-				'detailHTML' => $this->constraintParameterRenderer->formatParameters( $parameters ),
+				'detailHTML' => $this->constraintParameterRenderer->formatParameters($parameters),
 			];
 		}
 
@@ -143,14 +142,14 @@ 
 			'constraint' => $constraint
 		];
 		$message = $checkResult->getMessage();
-		if ( $message ) {
+		if ($message) {
 			$result['message-html'] = $message;
 		}
-		if ( $checkResult->getContext()->getType() === Context::TYPE_STATEMENT ) {
+		if ($checkResult->getContext()->getType() === Context::TYPE_STATEMENT) {
 			$result['claim'] = $checkResult->getContext()->getSnakStatement()->getGuid();
 		}
 		$cachingMetadata = $checkResult->getMetadata()->getCachingMetadata();
-		if ( $cachingMetadata->isCached() ) {
+		if ($cachingMetadata->isCached()) {
 			$result['cached'] = [
 				'maximumAgeInSeconds' => $cachingMetadata->getMaximumAgeInSeconds(),
 			];

src/ConstraintCheck/Cache/Metadata.php

Spacing +7 added lines, -7 removed lines

@@ -32,14 +32,14 @@ 
 		return $ret;
 	}
 
-	public static function ofCachingMetadata( CachingMetadata $cachingMetadata ) {
+	public static function ofCachingMetadata(CachingMetadata $cachingMetadata) {
 		$ret = new self;
 		$ret->cachingMetadata = $cachingMetadata;
 		$ret->dependencyMetadata = DependencyMetadata::blank();
 		return $ret;
 	}
 
-	public static function ofDependencyMetadata( DependencyMetadata $dependencyMetadata ) {
+	public static function ofDependencyMetadata(DependencyMetadata $dependencyMetadata) {
 		$ret = new self;
 		$ret->cachingMetadata = CachingMetadata::fresh();
 		$ret->dependencyMetadata = $dependencyMetadata;
@@ -50,17 +50,17 @@ 
 	 * @param self[] $metadatas
 	 * @return self
 	 */
-	public static function merge( array $metadatas ) {
-		Assert::parameterElementType( self::class, $metadatas, '$metadatas' );
+	public static function merge(array $metadatas) {
+		Assert::parameterElementType(self::class, $metadatas, '$metadatas');
 		$cachingMetadatas = [];
 		$dependencyMetadatas = [];
-		foreach ( $metadatas as $metadata ) {
+		foreach ($metadatas as $metadata) {
 			$cachingMetadatas[] = $metadata->cachingMetadata;
 			$dependencyMetadatas[] = $metadata->dependencyMetadata;
 		}
 		$ret = new self;
-		$ret->cachingMetadata = CachingMetadata::merge( $cachingMetadatas );
-		$ret->dependencyMetadata = DependencyMetadata::merge( $dependencyMetadatas );
+		$ret->cachingMetadata = CachingMetadata::merge($cachingMetadatas);
+		$ret->dependencyMetadata = DependencyMetadata::merge($dependencyMetadatas);
 		return $ret;
 	}
 

src/ConstraintCheck/Api/CachingResultsBuilder.php

Spacing +32 added lines, -33 removed lines

@@ -87,26 +87,26 @@ 
 	) {
 		$results = [];
 		$metadatas = [];
-		if ( $this->canUseStoredResults( $entityIds, $claimIds, $constraintIds ) ) {
+		if ($this->canUseStoredResults($entityIds, $claimIds, $constraintIds)) {
 			$storedEntityIds = [];
-			foreach ( $entityIds as $entityId ) {
-				$storedResults = $this->getStoredResults( $entityId );
-				if ( $storedResults !== null ) {
+			foreach ($entityIds as $entityId) {
+				$storedResults = $this->getStoredResults($entityId);
+				if ($storedResults !== null) {
 					$results += $storedResults->getArray();
 					$metadatas[] = $storedResults->getMetadata();
 					$storedEntityIds[] = $entityId;
 				}
 			}
-			$entityIds = array_values( array_diff( $entityIds, $storedEntityIds ) );
+			$entityIds = array_values(array_diff($entityIds, $storedEntityIds));
 		}
-		if ( $entityIds !== [] || $claimIds !== [] ) {
-			$response = $this->getAndStoreResults( $entityIds, $claimIds, $constraintIds );
+		if ($entityIds !== [] || $claimIds !== []) {
+			$response = $this->getAndStoreResults($entityIds, $claimIds, $constraintIds);
 			$results += $response->getArray();
 			$metadatas[] = $response->getMetadata();
 		}
 		return new CachedCheckConstraintsResponse(
 			$results,
-			Metadata::merge( $metadatas )
+			Metadata::merge($metadatas)
 		);
 	}
 
@@ -132,7 +132,7 @@ 
 	 * @param EntityId $entityId
 	 * @return string cache key
 	 */
-	public function getKey( EntityId $entityId ) {
+	public function getKey(EntityId $entityId) {
 		return $this->cache->makeKey(
 			'WikibaseQualityConstraints', // extension
 			'checkConstraints', // action
@@ -152,18 +152,18 @@ 
 		array $claimIds,
 		array $constraintIds = null
 	) {
-		$results = $this->resultsBuilder->getResults( $entityIds, $claimIds, $constraintIds );
+		$results = $this->resultsBuilder->getResults($entityIds, $claimIds, $constraintIds);
 
-		if ( $this->canStoreResults( $entityIds, $claimIds, $constraintIds ) ) {
-			foreach ( $entityIds as $entityId ) {
-				$key = $this->getKey( $entityId );
+		if ($this->canStoreResults($entityIds, $claimIds, $constraintIds)) {
+			foreach ($entityIds as $entityId) {
+				$key = $this->getKey($entityId);
 				$value = [
 					'results' => $results->getArray()[$entityId->getSerialization()],
 					'latestRevisionIds' => $this->getLatestRevisionIds(
 						$results->getMetadata()->getDependencyMetadata()->getEntityIds()
 					),
 				];
-				$this->cache->set( $key, $value, $this->ttlInSeconds );
+				$this->cache->set($key, $value, $this->ttlInSeconds);
 			}
 		}
 
@@ -196,41 +196,40 @@ 
 	public function getStoredResults(
 		EntityId $entityId
 	) {
-		$key = $this->getKey( $entityId );
-		$value = $this->cache->get( $key, $curTTL, [], $asOf );
-		$now = call_user_func( $this->microtime, true );
+		$key = $this->getKey($entityId);
+		$value = $this->cache->get($key, $curTTL, [], $asOf);
+		$now = call_user_func($this->microtime, true);
 
-		if ( $value === false ) {
+		if ($value === false) {
 			return null;
 		}
 
-		$ageInSeconds = (integer)ceil( $now - $asOf );
+		$ageInSeconds = (integer) ceil($now - $asOf);
 
 		$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 new CachedCheckConstraintsResponse(
-			[ $entityId->getSerialization() => $value['results'] ],
+			[$entityId->getSerialization() => $value['results']],
 			array_reduce(
 				$dependedEntityIds,
-				function( Metadata $metadata, EntityId $entityId ) {
-					return Metadata::merge( [
+				function(Metadata $metadata, EntityId $entityId) {
+					return Metadata::merge([
 						$metadata,
 						Metadata::ofDependencyMetadata(
-							DependencyMetadata::ofEntityId( $entityId )
+							DependencyMetadata::ofEntityId($entityId)
 						)
-					] );
+					]);
 				},
 				Metadata::ofCachingMetadata(
 					$ageInSeconds > 0 ?
-						CachingMetadata::ofMaximumAgeInSeconds( $ageInSeconds ) :
-						CachingMetadata::fresh()
+						CachingMetadata::ofMaximumAgeInSeconds($ageInSeconds) : CachingMetadata::fresh()
 				)
 			)
 		);
@@ -240,11 +239,11 @@ 
 	 * @param EntityId[] $entityIds
 	 * @return int[]
 	 */
-	private function getLatestRevisionIds( array $entityIds ) {
+	private function getLatestRevisionIds(array $entityIds) {
 		$latestRevisionIds = [];
-		foreach ( $entityIds as $entityId ) {
+		foreach ($entityIds as $entityId) {
 			$serialization = $entityId->getSerialization();
-			$latestRevisionId = $this->entityRevisionLookup->getLatestRevisionId( $entityId );
+			$latestRevisionId = $this->entityRevisionLookup->getLatestRevisionId($entityId);
 			$latestRevisionIds[$serialization] = $latestRevisionId;
 		}
 		return $latestRevisionIds;
@@ -255,7 +254,7 @@ 
 	 *
 	 * @param callable $microtime
 	 */
-	public function setMicrotimeFunction( callable $microtime ) {
+	public function setMicrotimeFunction(callable $microtime) {
 		$this->microtime = $microtime;
 	}