wikimedia / mediawiki-extensions-WikibaseQualityConstraints

src/Html/HtmlTableBuilder.php

Spacing +29 added lines, -29 removed lines

@@ -32,9 +32,9 @@ 
 	/**
 	 * @param array $headers
 	 */
-	public function __construct( array $headers ) {
-		foreach ( $headers as $header ) {
-			$this->addHeader( $header );
+	public function __construct(array $headers) {
+		foreach ($headers as $header) {
+			$this->addHeader($header);
 		}
 	}
 
@@ -43,16 +43,16 @@ 
 	 *
 	 * @throws InvalidArgumentException
 	 */
-	private function addHeader( $header ) {
-		Assert::parameterType( 'string|' . HtmlTableHeaderBuilder::class, $header, '$header' );
+	private function addHeader($header) {
+		Assert::parameterType('string|'.HtmlTableHeaderBuilder::class, $header, '$header');
 
-		if ( is_string( $header ) ) {
-			$header = new HtmlTableHeaderBuilder( $header );
+		if (is_string($header)) {
+			$header = new HtmlTableHeaderBuilder($header);
 		}
 
 		$this->headers[] = $header;
 
-		if ( $header->getIsSortable() ) {
+		if ($header->getIsSortable()) {
 			$this->isSortable = true;
 		}
 	}
@@ -85,12 +85,12 @@ 
 	 *
 	 * @throws InvalidArgumentException
 	 */
-	public function appendRow( array $cells ) {
-		foreach ( $cells as $key => $cell ) {
-			if ( is_string( $cell ) ) {
-				$cells[$key] = new HtmlTableCellBuilder( $cell );
-			} elseif ( !( $cell instanceof HtmlTableCellBuilder ) ) {
-				throw new InvalidArgumentException( '$cells must be array of HtmlTableCell objects.' );
+	public function appendRow(array $cells) {
+		foreach ($cells as $key => $cell) {
+			if (is_string($cell)) {
+				$cells[$key] = new HtmlTableCellBuilder($cell);
+			} elseif (!($cell instanceof HtmlTableCellBuilder)) {
+				throw new InvalidArgumentException('$cells must be array of HtmlTableCell objects.');
 			}
 		}
 
@@ -104,13 +104,13 @@ 
 	 *
 	 * @throws InvalidArgumentException
 	 */
-	public function appendRows( array $rows ) {
-		foreach ( $rows as $cells ) {
-			if ( !is_array( $cells ) ) {
-				throw new InvalidArgumentException( '$rows must be array of arrays of HtmlTableCell objects.' );
+	public function appendRows(array $rows) {
+		foreach ($rows as $cells) {
+			if (!is_array($cells)) {
+				throw new InvalidArgumentException('$rows must be array of arrays of HtmlTableCell objects.');
 			}
 
-			$this->appendRow( $cells );
+			$this->appendRow($cells);
 		}
 	}
 
@@ -122,34 +122,34 @@ 
 	public function toHtml() {
 		// Open table
 		$tableClasses = 'wikitable';
-		if ( $this->isSortable ) {
+		if ($this->isSortable) {
 			$tableClasses .= ' sortable jquery-tablesort';
 		}
-		$html = Html::openElement( 'table', [ 'class' => $tableClasses ] );
+		$html = Html::openElement('table', ['class' => $tableClasses]);
 
 		// Write headers
-		$html .= Html::openElement( 'tr' );
-		foreach ( $this->headers as $header ) {
+		$html .= Html::openElement('tr');
+		foreach ($this->headers as $header) {
 			$html .= $header->toHtml();
 		}
-		$html .= Html::closeElement( 'tr' );
+		$html .= Html::closeElement('tr');
 
 		// Write rows
-		foreach ( $this->rows as $row ) {
-			$html .= Html::openElement( 'tr' );
+		foreach ($this->rows as $row) {
+			$html .= Html::openElement('tr');
 
 			/**
 			 * @var HtmlTableCellBuilder $cell
 			 */
-			foreach ( $row as $cell ) {
+			foreach ($row as $cell) {
 				$html .= $cell->toHtml();
 			}
 
-			$html .= Html::closeElement( 'tr' );
+			$html .= Html::closeElement('tr');
 		}
 
 		// Close table
-		$html .= Html::closeElement( 'table' );
+		$html .= Html::closeElement('table');
 
 		return $html;
 	}

src/WikibaseQualityConstraintsHooks.php

Spacing +46 added lines, -46 removed lines

@@ -31,25 +31,25 @@ 
 	/**
 	 * @param DatabaseUpdater $updater
 	 */
-	public static function onCreateSchema( DatabaseUpdater $updater ) {
+	public static function onCreateSchema(DatabaseUpdater $updater) {
 		$updater->addExtensionTable(
 			'wbqc_constraints',
-			__DIR__ . '/../sql/create_wbqc_constraints.sql'
+			__DIR__.'/../sql/create_wbqc_constraints.sql'
 		);
 		$updater->addExtensionField(
 			'wbqc_constraints',
 			'constraint_id',
-			__DIR__ . '/../sql/patch-wbqc_constraints-constraint_id.sql'
+			__DIR__.'/../sql/patch-wbqc_constraints-constraint_id.sql'
 		);
 		$updater->addExtensionIndex(
 			'wbqc_constraints',
 			'wbqc_constraints_guid_uniq',
-			__DIR__ . '/../sql/patch-wbqc_constraints-wbqc_constraints_guid_uniq.sql'
+			__DIR__.'/../sql/patch-wbqc_constraints-wbqc_constraints_guid_uniq.sql'
 		);
 	}
 
-	public static function onWikibaseChange( Change $change ) {
-		if ( !( $change instanceof EntityChange ) ) {
+	public static function onWikibaseChange(Change $change) {
+		if (!($change instanceof EntityChange)) {
 			return;
 		}
 
@@ -58,44 +58,44 @@ 
 
 		// If jobs are enabled and the results would be stored in some way run a job.
 		if (
-			$config->get( 'WBQualityConstraintsEnableConstraintsCheckJobs' ) &&
-			$config->get( 'WBQualityConstraintsCacheCheckConstraintsResults' ) &&
+			$config->get('WBQualityConstraintsEnableConstraintsCheckJobs') &&
+			$config->get('WBQualityConstraintsCacheCheckConstraintsResults') &&
 			self::isSelectedForJobRunBasedOnPercentage()
 		) {
-			$params = [ 'entityId' => $change->getEntityId()->getSerialization() ];
+			$params = ['entityId' => $change->getEntityId()->getSerialization()];
 			JobQueueGroup::singleton()->push(
-				new JobSpecification( CheckConstraintsJob::COMMAND, $params )
+				new JobSpecification(CheckConstraintsJob::COMMAND, $params)
 			);
 		}
 
-		if ( $config->get( 'WBQualityConstraintsEnableConstraintsImportFromStatements' ) &&
-			self::isConstraintStatementsChange( $config, $change )
+		if ($config->get('WBQualityConstraintsEnableConstraintsImportFromStatements') &&
+			self::isConstraintStatementsChange($config, $change)
 		) {
-			$params = [ 'propertyId' => $change->getEntityId()->getSerialization() ];
+			$params = ['propertyId' => $change->getEntityId()->getSerialization()];
 			JobQueueGroup::singleton()->push(
-				new JobSpecification( 'constraintsTableUpdate', $params )
+				new JobSpecification('constraintsTableUpdate', $params)
 			);
 		}
 	}
 
 	private static function isSelectedForJobRunBasedOnPercentage() {
 		$config = MediaWikiServices::getInstance()->getMainConfig();
-		$percentage = $config->get( 'WBQualityConstraintsEnableConstraintsCheckJobsRatio' );
+		$percentage = $config->get('WBQualityConstraintsEnableConstraintsCheckJobsRatio');
 
-		return mt_rand( 1, 100 ) <= $percentage;
+		return mt_rand(1, 100) <= $percentage;
 	}
 
-	public static function isConstraintStatementsChange( Config $config, Change $change ) {
-		if ( !( $change instanceof EntityChange ) ||
+	public static function isConstraintStatementsChange(Config $config, Change $change) {
+		if (!($change instanceof EntityChange) ||
 			 $change->getAction() !== EntityChange::UPDATE ||
-			 !( $change->getEntityId() instanceof PropertyId )
+			 !($change->getEntityId() instanceof PropertyId)
 		) {
 			return false;
 		}
 
 		$info = $change->getInfo();
 
-		if ( !array_key_exists( 'compactDiff', $info ) ) {
+		if (!array_key_exists('compactDiff', $info)) {
 			// the non-compact diff ($info['diff']) does not contain statement diffs (T110996),
 			// so we only know that the change *might* affect the constraint statements
 			return true;
@@ -104,46 +104,46 @@ 
 		/** @var EntityDiffChangedAspects $aspects */
 		$aspects = $info['compactDiff'];
 
-		$propertyConstraintId = $config->get( 'WBQualityConstraintsPropertyConstraintId' );
-		return in_array( $propertyConstraintId, $aspects->getStatementChanges() );
+		$propertyConstraintId = $config->get('WBQualityConstraintsPropertyConstraintId');
+		return in_array($propertyConstraintId, $aspects->getStatementChanges());
 	}
 
-	public static function onArticlePurge( WikiPage $wikiPage ) {
+	public static function onArticlePurge(WikiPage $wikiPage) {
 		$repo = WikibaseRepo::getDefaultInstance();
 
 		$entityContentFactory = $repo->getEntityContentFactory();
-		if ( $entityContentFactory->isEntityContentModel( $wikiPage->getContentModel() ) ) {
-			$entityId = $entityContentFactory->getEntityIdForTitle( $wikiPage->getTitle() );
-			if ( $entityId !== null ) {
+		if ($entityContentFactory->isEntityContentModel($wikiPage->getContentModel())) {
+			$entityId = $entityContentFactory->getEntityIdForTitle($wikiPage->getTitle());
+			if ($entityId !== null) {
 				$resultsCache = ResultsCache::getDefaultInstance();
-				$resultsCache->delete( $entityId );
+				$resultsCache->delete($entityId);
 			}
 		}
 	}
 
-	public static function onBeforePageDisplay( OutputPage $out, Skin $skin ) {
+	public static function onBeforePageDisplay(OutputPage $out, Skin $skin) {
 		$repo = WikibaseRepo::getDefaultInstance();
 
 		$lookup = $repo->getEntityNamespaceLookup();
 		$title = $out->getTitle();
-		if ( $title === null ) {
+		if ($title === null) {
 			return;
 		}
 
-		if ( !$lookup->isEntityNamespace( $title->getNamespace() ) ) {
+		if (!$lookup->isEntityNamespace($title->getNamespace())) {
 			return;
 		}
-		if ( empty( $out->getJsConfigVars()['wbIsEditView'] ) ) {
+		if (empty($out->getJsConfigVars()['wbIsEditView'])) {
 			return;
 		}
 
-		$out->addModules( 'wikibase.quality.constraints.suggestions' );
+		$out->addModules('wikibase.quality.constraints.suggestions');
 
-		if ( !$out->getUser()->isLoggedIn() ) {
+		if (!$out->getUser()->isLoggedIn()) {
 			return;
 		}
 
-		$out->addModules( 'wikibase.quality.constraints.gadget' );
+		$out->addModules('wikibase.quality.constraints.gadget');
 	}
 
 	/**
@@ -152,10 +152,10 @@ 
 	 * @param User $user
 	 * @param array[] &$prefs
 	 */
-	public static function onGetBetaFeaturePreferences( User $user, array &$prefs ) {
+	public static function onGetBetaFeaturePreferences(User $user, array &$prefs) {
 		$config = MediaWikiServices::getInstance()->getMainConfig();
-		$extensionAssetsPath = $config->get( 'ExtensionAssetsPath' );
-		if ( $config->get( 'WBQualityConstraintsSuggestionsBetaFeature' ) ) {
+		$extensionAssetsPath = $config->get('ExtensionAssetsPath');
+		if ($config->get('WBQualityConstraintsSuggestionsBetaFeature')) {
 			$prefs['constraint-suggestions'] = [
 					'label-message' => 'wbqc-beta-feature-label-message',
 					'desc-message' => 'wbqc-beta-feature-description-message',
@@ -179,20 +179,20 @@ 
 	 * @param array &$vars
 	 * @param OutputPage $out
 	 */
-	public static function addVariables( &$vars, OutputPage $out ) {
+	public static function addVariables(&$vars, OutputPage $out) {
 		$config = MediaWikiServices::getInstance()->getMainConfig();
 
-		$vars['wbQualityConstraintsPropertyConstraintId'] = $config->get( 'WBQualityConstraintsPropertyConstraintId' );
-		$vars['wbQualityConstraintsOneOfConstraintId'] = $config->get( 'WBQualityConstraintsOneOfConstraintId' );
-		$vars['wbQualityConstraintsAllowedQualifierConstraintId'] = $config->get( 'WBQualityConstraintsAllowedQualifiersConstraintId' );
-		$vars['wbQualityConstraintsPropertyId'] = $config->get( 'WBQualityConstraintsPropertyId' );
-		$vars['wbQualityConstraintsQualifierOfPropertyConstraintId'] = $config->get( 'WBQualityConstraintsQualifierOfPropertyConstraintId' );
+		$vars['wbQualityConstraintsPropertyConstraintId'] = $config->get('WBQualityConstraintsPropertyConstraintId');
+		$vars['wbQualityConstraintsOneOfConstraintId'] = $config->get('WBQualityConstraintsOneOfConstraintId');
+		$vars['wbQualityConstraintsAllowedQualifierConstraintId'] = $config->get('WBQualityConstraintsAllowedQualifiersConstraintId');
+		$vars['wbQualityConstraintsPropertyId'] = $config->get('WBQualityConstraintsPropertyId');
+		$vars['wbQualityConstraintsQualifierOfPropertyConstraintId'] = $config->get('WBQualityConstraintsQualifierOfPropertyConstraintId');
 
 		$vars['wbQualityConstraintsSuggestionsGloballyEnabled'] = false;
 
-		if ( $config->get( 'WBQualityConstraintsSuggestionsBetaFeature' ) &&
-			ExtensionRegistry::getInstance()->isLoaded( 'BetaFeatures' ) &&
-			BetaFeatures::isFeatureEnabled( $out->getUser(), 'constraint-suggestions' )
+		if ($config->get('WBQualityConstraintsSuggestionsBetaFeature') &&
+			ExtensionRegistry::getInstance()->isLoaded('BetaFeatures') &&
+			BetaFeatures::isFeatureEnabled($out->getUser(), 'constraint-suggestions')
 			) {
 			$vars['wbQualityConstraintsSuggestionsGloballyEnabled'] = true;
 		}

src/Job/CheckConstraintsJob.php

Spacing +13 added lines, -13 removed lines

@@ -42,25 +42,25 @@ 
 	 * @param Title $title
 	 * @param string[] $params should contain 'entityId' => 'Q1234'
 	 */
-	public function __construct( Title $title, array $params ) {
-		parent::__construct( self::COMMAND, $title, $params );
+	public function __construct(Title $title, array $params) {
+		parent::__construct(self::COMMAND, $title, $params);
 		$this->removeDuplicates = true;
 
-		Assert::parameterType( 'string', $params['entityId'], '$params[\'entityId\']' );
+		Assert::parameterType('string', $params['entityId'], '$params[\'entityId\']');
 		$this->entityId = $params['entityId'];
 
-		$resultSource = ConstraintsServices::getResultsSource( MediaWikiServices::getInstance() );
+		$resultSource = ConstraintsServices::getResultsSource(MediaWikiServices::getInstance());
 		// This job should only ever be used when caching result sources are used.
-		$this->setResultsSource( $resultSource );
+		$this->setResultsSource($resultSource);
 
-		$this->setEntityIdParser( WikibaseRepo::getDefaultInstance()->getEntityIdParser() );
+		$this->setEntityIdParser(WikibaseRepo::getDefaultInstance()->getEntityIdParser());
 	}
 
-	public function setResultsSource( CachingResultsSource $resultsSource ) {
+	public function setResultsSource(CachingResultsSource $resultsSource) {
 		$this->resultsSource = $resultsSource;
 	}
 
-	public function setEntityIdParser( EntityIdParser $parser ) {
+	public function setEntityIdParser(EntityIdParser $parser) {
 		$this->entityIdParser = $parser;
 	}
 
@@ -71,19 +71,19 @@ 
 	 */
 	public function run() {
 		try {
-			$entityId = $this->entityIdParser->parse( $this->entityId );
-		} catch ( EntityIdParsingException $e ) {
+			$entityId = $this->entityIdParser->parse($this->entityId);
+		} catch (EntityIdParsingException $e) {
 			return false;
 		}
 
-		$this->checkConstraints( $entityId );
+		$this->checkConstraints($entityId);
 
 		return true;
 	}
 
-	private function checkConstraints( EntityId $entityId ) {
+	private function checkConstraints(EntityId $entityId) {
 		$this->resultsSource->getResults(
-			[ $entityId ],
+			[$entityId],
 			[],
 			null,
 			[]

src/Api/ExpiryLock.php

Spacing +17 added lines, -17 removed lines

@@ -26,7 +26,7 @@ 
 	/**
 	 * @param BagOStuff $cache
 	 */
-	public function __construct( BagOStuff $cache ) {
+	public function __construct(BagOStuff $cache) {
 		$this->cache = $cache;
 	}
 
@@ -37,17 +37,17 @@ 
 	 *
 	 * @throws \Wikimedia\Assert\ParameterTypeException
 	 */
-	private function makeKey( $id ) {
-		if ( empty( trim( $id ) ) ) {
-			throw new ParameterTypeException( '$id', 'non-empty string' );
+	private function makeKey($id) {
+		if (empty(trim($id))) {
+			throw new ParameterTypeException('$id', 'non-empty string');
 		}
 
-		Assert::parameterType( 'string', $id, '$id' );
+		Assert::parameterType('string', $id, '$id');
 
 		return $this->cache->makeKey(
 			'WikibaseQualityConstraints',
 			'ExpiryLock',
-			(string)$id
+			(string) $id
 		);
 	}
 
@@ -59,11 +59,11 @@ 
 	 *
 	 * @throws \Wikimedia\Assert\ParameterTypeException
 	 */
-	public function lock( $id, ConvertibleTimestamp $expiryTimestamp ) {
+	public function lock($id, ConvertibleTimestamp $expiryTimestamp) {
 
-		$cacheId = $this->makeKey( $id );
+		$cacheId = $this->makeKey($id);
 
-		if ( !$this->isLockedInternal( $cacheId ) ) {
+		if (!$this->isLockedInternal($cacheId)) {
 			return $this->cache->set(
 				$cacheId,
 				$expiryTimestamp->getTimestamp(),
@@ -81,20 +81,20 @@ 
 	 *
 	 * @throws \Wikimedia\Assert\ParameterTypeException
 	 */
-	private function isLockedInternal( $cacheId ) {
-		$expiryTime = $this->cache->get( $cacheId );
-		if ( !$expiryTime ) {
+	private function isLockedInternal($cacheId) {
+		$expiryTime = $this->cache->get($cacheId);
+		if (!$expiryTime) {
 			return false;
 		}
 
 		try {
-			$lockExpiryTimeStamp = new ConvertibleTimestamp( $expiryTime );
-		} catch ( TimestampException $exception ) {
+			$lockExpiryTimeStamp = new ConvertibleTimestamp($expiryTime);
+		} catch (TimestampException $exception) {
 			return false;
 		}
 
 		$now = new ConvertibleTimestamp();
-		if ( $now->timestamp < $lockExpiryTimeStamp->timestamp ) {
+		if ($now->timestamp < $lockExpiryTimeStamp->timestamp) {
 			return true;
 		} else {
 			return false;
@@ -108,8 +108,8 @@ 
 	 *
 	 * @throws \Wikimedia\Assert\ParameterTypeException
 	 */
-	public function isLocked( $id ) {
-		return $this->isLockedInternal( $this->makeKey( $id ) );
+	public function isLocked($id) {
+		return $this->isLockedInternal($this->makeKey($id));
 	}
 
 }

src/ConstraintsServices.php

Spacing +25 added lines, -25 removed lines

@@ -38,90 +38,90 @@
 	const RESULTS_SOURCE = 'WBQC_ResultsSource';
 	const EXPIRY_LOCK = 'WBQC_ExpiryLock';
 
-	private static function getService( MediaWikiServices $services = null, $name ) {
-		if ( $services === null ) {
+	private static function getService(MediaWikiServices $services = null, $name) {
+		if ($services === null) {
 			$services = MediaWikiServices::getInstance();
 		}
-		return $services->getService( $name );
+		return $services->getService($name);
 	}
 
-	public static function getLoggingHelper( MediaWikiServices $services = null ): LoggingHelper {
-		return self::getService( $services, self::LOGGING_HELPER );
+	public static function getLoggingHelper(MediaWikiServices $services = null): LoggingHelper {
+		return self::getService($services, self::LOGGING_HELPER);
 	}
 
 	public static function getConstraintRepository(
 		MediaWikiServices $services = null
 	): ConstraintRepository {
-		return self::getService( $services, self::CONSTRAINT_REPOSITORY );
+		return self::getService($services, self::CONSTRAINT_REPOSITORY);
 	}
 
-	public static function getConstraintLookup( MediaWikiServices $services = null ): ConstraintLookup {
-		return self::getService( $services, self::CONSTRAINT_LOOKUP );
+	public static function getConstraintLookup(MediaWikiServices $services = null): ConstraintLookup {
+		return self::getService($services, self::CONSTRAINT_LOOKUP);
 	}
 
 	public static function getCheckResultSerializer(
 		MediaWikiServices $services = null
 	): CheckResultSerializer {
-		return self::getService( $services, self::CHECK_RESULT_SERIALIZER );
+		return self::getService($services, self::CHECK_RESULT_SERIALIZER);
 	}
 
 	public static function getCheckResultDeserializer(
 		MediaWikiServices $services = null
 	): CheckResultDeserializer {
-		return self::getService( $services, self::CHECK_RESULT_DESERIALIZER );
+		return self::getService($services, self::CHECK_RESULT_DESERIALIZER);
 	}
 
 	public static function getViolationMessageSerializer(
 		MediaWikiServices $services = null
 	): ViolationMessageSerializer {
-		return self::getService( $services, self::VIOLATION_MESSAGE_SERIALIZER );
+		return self::getService($services, self::VIOLATION_MESSAGE_SERIALIZER);
 	}
 
 	public static function getViolationMessageDeserializer(
 		MediaWikiServices $services = null
 	): ViolationMessageDeserializer {
-		return self::getService( $services, self::VIOLATION_MESSAGE_DESERIALIZER );
+		return self::getService($services, self::VIOLATION_MESSAGE_DESERIALIZER);
 	}
 
 	public static function getConstraintParameterParser(
 		MediaWikiServices $services = null
 	): ConstraintParameterParser {
-		return self::getService( $services, self::CONSTRAINT_PARAMETER_PARSER );
+		return self::getService($services, self::CONSTRAINT_PARAMETER_PARSER);
 	}
 
 	public static function getConnectionCheckerHelper(
 		MediaWikiServices $services = null
 	): ConnectionCheckerHelper {
-		return self::getService( $services, self::CONNECTION_CHECKER_HELPER );
+		return self::getService($services, self::CONNECTION_CHECKER_HELPER);
 	}
 
-	public static function getRangeCheckerHelper( MediaWikiServices $services = null ): RangeCheckerHelper {
-		return self::getService( $services, self::RANGE_CHECKER_HELPER );
+	public static function getRangeCheckerHelper(MediaWikiServices $services = null): RangeCheckerHelper {
+		return self::getService($services, self::RANGE_CHECKER_HELPER);
 	}
 
-	public static function getSparqlHelper( MediaWikiServices $services = null ): SparqlHelper {
-		return self::getService( $services, self::SPARQL_HELPER );
+	public static function getSparqlHelper(MediaWikiServices $services = null): SparqlHelper {
+		return self::getService($services, self::SPARQL_HELPER);
 	}
 
-	public static function getTypeCheckerHelper( MediaWikiServices $services = null ): TypeCheckerHelper {
-		return self::getService( $services, self::TYPE_CHECKER_HELPER );
+	public static function getTypeCheckerHelper(MediaWikiServices $services = null): TypeCheckerHelper {
+		return self::getService($services, self::TYPE_CHECKER_HELPER);
 	}
 
 	public static function getDelegatingConstraintChecker(
 		MediaWikiServices $services = null
 	): DelegatingConstraintChecker {
-		return self::getService( $services, self::DELEGATING_CONSTRAINT_CHECKER );
+		return self::getService($services, self::DELEGATING_CONSTRAINT_CHECKER);
 	}
 
-	public static function getResultsSource( MediaWikiServices $services = null ): ResultsSource {
-		return self::getService( $services, self::RESULTS_SOURCE );
+	public static function getResultsSource(MediaWikiServices $services = null): ResultsSource {
+		return self::getService($services, self::RESULTS_SOURCE);
 	}
 
 	/**
 	 * @return ExpiryLock
 	 */
-	public static function getExpiryLock( MediaWikiServices $services = null ) {
-		return self::getService( $services, self::EXPIRY_LOCK );
+	public static function getExpiryLock(MediaWikiServices $services = null) {
+		return self::getService($services, self::EXPIRY_LOCK);
 	}
 
 }

src/ConstraintCheck/DelegatingConstraintChecker.php

Spacing +140 added lines, -140 removed lines

@@ -144,20 +144,20 @@ 
 		callable $defaultResultsPerEntity = null
 	) {
 		$checkResults = [];
-		$entity = $this->entityLookup->getEntity( $entityId );
+		$entity = $this->entityLookup->getEntity($entityId);
 
-		if ( $entity instanceof StatementListProvider ) {
-			$startTime = microtime( true );
+		if ($entity instanceof StatementListProvider) {
+			$startTime = microtime(true);
 
 			$checkResults = $this->checkEveryStatement(
-				$this->entityLookup->getEntity( $entityId ),
+				$this->entityLookup->getEntity($entityId),
 				$constraintIds,
 				$defaultResultsPerContext
 			);
 
-			$endTime = microtime( true );
+			$endTime = microtime(true);
 
-			if ( $constraintIds === null ) { // only log full constraint checks
+			if ($constraintIds === null) { // only log full constraint checks
 				$this->loggingHelper->logConstraintCheckOnEntity(
 					$entityId,
 					$checkResults,
@@ -167,11 +167,11 @@ 
 			}
 		}
 
-		if ( $defaultResultsPerEntity !== null ) {
-			$checkResults = array_merge( $defaultResultsPerEntity( $entityId ), $checkResults );
+		if ($defaultResultsPerEntity !== null) {
+			$checkResults = array_merge($defaultResultsPerEntity($entityId), $checkResults);
 		}
 
-		return $this->sortResult( $checkResults );
+		return $this->sortResult($checkResults);
 	}
 
 	/**
@@ -193,19 +193,19 @@ 
 		callable $defaultResults = null
 	) {
 
-		$parsedGuid = $this->statementGuidParser->parse( $guid );
+		$parsedGuid = $this->statementGuidParser->parse($guid);
 		$entityId = $parsedGuid->getEntityId();
-		$entity = $this->entityLookup->getEntity( $entityId );
-		if ( $entity instanceof StatementListProvider ) {
-			$statement = $entity->getStatements()->getFirstStatementWithGuid( $guid );
-			if ( $statement ) {
+		$entity = $this->entityLookup->getEntity($entityId);
+		if ($entity instanceof StatementListProvider) {
+			$statement = $entity->getStatements()->getFirstStatementWithGuid($guid);
+			if ($statement) {
 				$result = $this->checkStatement(
 					$entity,
 					$statement,
 					$constraintIds,
 					$defaultResults
 				);
-				$output = $this->sortResult( $result );
+				$output = $this->sortResult($result);
 				return $output;
 			}
 		}
@@ -213,8 +213,8 @@ 
 		return [];
 	}
 
-	private function getAllowedContextTypes( Constraint $constraint ) {
-		if ( !array_key_exists( $constraint->getConstraintTypeItemId(), $this->checkerMap ) ) {
+	private function getAllowedContextTypes(Constraint $constraint) {
+		if (!array_key_exists($constraint->getConstraintTypeItemId(), $this->checkerMap)) {
 			return [
 				Context::TYPE_STATEMENT,
 				Context::TYPE_QUALIFIER,
@@ -222,12 +222,12 @@ 
 			];
 		}
 
-		return array_keys( array_filter(
+		return array_keys(array_filter(
 			$this->checkerMap[$constraint->getConstraintTypeItemId()]->getSupportedContextTypes(),
-			function ( $resultStatus ) {
+			function($resultStatus) {
 				return $resultStatus !== CheckResult::STATUS_NOT_IN_SCOPE;
 			}
-		) );
+		));
 	}
 
 	/**
@@ -238,32 +238,32 @@ 
 	 *
 	 * @return ConstraintParameterException[]
 	 */
-	private function checkCommonConstraintParameters( Constraint $constraint ) {
+	private function checkCommonConstraintParameters(Constraint $constraint) {
 		$constraintParameters = $constraint->getConstraintParameters();
 		try {
-			$this->constraintParameterParser->checkError( $constraintParameters );
-		} catch ( ConstraintParameterException $e ) {
-			return [ $e ];
+			$this->constraintParameterParser->checkError($constraintParameters);
+		} catch (ConstraintParameterException $e) {
+			return [$e];
 		}
 
 		$problems = [];
 		try {
-			$this->constraintParameterParser->parseExceptionParameter( $constraintParameters );
-		} catch ( ConstraintParameterException $e ) {
+			$this->constraintParameterParser->parseExceptionParameter($constraintParameters);
+		} catch (ConstraintParameterException $e) {
 			$problems[] = $e;
 		}
 		try {
-			$this->constraintParameterParser->parseConstraintStatusParameter( $constraintParameters );
-		} catch ( ConstraintParameterException $e ) {
+			$this->constraintParameterParser->parseConstraintStatusParameter($constraintParameters);
+		} catch (ConstraintParameterException $e) {
 			$problems[] = $e;
 		}
 		try {
 			$this->constraintParameterParser->parseConstraintScopeParameter(
 				$constraintParameters,
 				$constraint->getConstraintTypeItemId(),
-				$this->getAllowedContextTypes( $constraint )
+				$this->getAllowedContextTypes($constraint)
 			);
-		} catch ( ConstraintParameterException $e ) {
+		} catch (ConstraintParameterException $e) {
 			$problems[] = $e;
 		}
 		return $problems;
@@ -276,16 +276,16 @@ 
 	 * @return ConstraintParameterException[][] first level indexed by constraint ID,
 	 * second level like checkConstraintParametersOnConstraintId (but without possibility of null)
 	 */
-	public function checkConstraintParametersOnPropertyId( PropertyId $propertyId ) {
-		$constraints = $this->constraintLookup->queryConstraintsForProperty( $propertyId );
+	public function checkConstraintParametersOnPropertyId(PropertyId $propertyId) {
+		$constraints = $this->constraintLookup->queryConstraintsForProperty($propertyId);
 		$result = [];
 
-		foreach ( $constraints as $constraint ) {
-			$problems = $this->checkCommonConstraintParameters( $constraint );
+		foreach ($constraints as $constraint) {
+			$problems = $this->checkCommonConstraintParameters($constraint);
 
-			if ( array_key_exists( $constraint->getConstraintTypeItemId(), $this->checkerMap ) ) {
+			if (array_key_exists($constraint->getConstraintTypeItemId(), $this->checkerMap)) {
 				$checker = $this->checkerMap[$constraint->getConstraintTypeItemId()];
-				$problems = array_merge( $problems, $checker->checkConstraintParameters( $constraint ) );
+				$problems = array_merge($problems, $checker->checkConstraintParameters($constraint));
 			}
 
 			$result[$constraint->getConstraintId()] = $problems;
@@ -302,17 +302,17 @@ 
 	 * @return ConstraintParameterException[]|null list of constraint parameter exceptions
 	 * (empty means all parameters okay), or null if constraint is not found
 	 */
-	public function checkConstraintParametersOnConstraintId( $constraintId ) {
-		$propertyId = $this->statementGuidParser->parse( $constraintId )->getEntityId();
-		$constraints = $this->constraintLookup->queryConstraintsForProperty( $propertyId );
+	public function checkConstraintParametersOnConstraintId($constraintId) {
+		$propertyId = $this->statementGuidParser->parse($constraintId)->getEntityId();
+		$constraints = $this->constraintLookup->queryConstraintsForProperty($propertyId);
 
-		foreach ( $constraints as $constraint ) {
-			if ( $constraint->getConstraintId() === $constraintId ) {
-				$problems = $this->checkCommonConstraintParameters( $constraint );
+		foreach ($constraints as $constraint) {
+			if ($constraint->getConstraintId() === $constraintId) {
+				$problems = $this->checkCommonConstraintParameters($constraint);
 
-				if ( array_key_exists( $constraint->getConstraintTypeItemId(), $this->checkerMap ) ) {
+				if (array_key_exists($constraint->getConstraintTypeItemId(), $this->checkerMap)) {
 					$checker = $this->checkerMap[$constraint->getConstraintTypeItemId()];
-					$problems = array_merge( $problems, $checker->checkConstraintParameters( $constraint ) );
+					$problems = array_merge($problems, $checker->checkConstraintParameters($constraint));
 				}
 
 				return $problems;
@@ -337,14 +337,14 @@ 
 		$result = [];
 
 		/** @var Statement $statement */
-		foreach ( $entity->getStatements() as $statement ) {
-			$result = array_merge( $result,
+		foreach ($entity->getStatements() as $statement) {
+			$result = array_merge($result,
 				$this->checkStatement(
 					$entity,
 					$statement,
 					$constraintIds,
 					$defaultResultsPerContext
-				) );
+				));
 		}
 
 		return $result;
@@ -366,32 +366,32 @@ 
 	) {
 		$result = [];
 
-		$result = array_merge( $result,
+		$result = array_merge($result,
 			$this->checkConstraintsForMainSnak(
 				$entity,
 				$statement,
 				$constraintIds,
 				$defaultResultsPerContext
-			) );
+			));
 
-		if ( $this->checkQualifiers ) {
-			$result = array_merge( $result,
+		if ($this->checkQualifiers) {
+			$result = array_merge($result,
 				$this->checkConstraintsForQualifiers(
 					$entity,
 					$statement,
 					$constraintIds,
 					$defaultResultsPerContext
-				) );
+				));
 		}
 
-		if ( $this->checkReferences ) {
-			$result = array_merge( $result,
+		if ($this->checkReferences) {
+			$result = array_merge($result,
 				$this->checkConstraintsForReferences(
 					$entity,
 					$statement,
 					$constraintIds,
 					$defaultResultsPerContext
-				) );
+				));
 		}
 
 		return $result;
@@ -406,12 +406,12 @@ 
 	 * @param string[]|null $constraintIds
 	 * @return Constraint[]
 	 */
-	private function getConstraintsToUse( PropertyId $propertyId, array $constraintIds = null ) {
-		$constraints = $this->constraintLookup->queryConstraintsForProperty( $propertyId );
-		if ( $constraintIds !== null ) {
+	private function getConstraintsToUse(PropertyId $propertyId, array $constraintIds = null) {
+		$constraints = $this->constraintLookup->queryConstraintsForProperty($propertyId);
+		if ($constraintIds !== null) {
 			$constraintsToUse = [];
-			foreach ( $constraints as $constraint ) {
-				if ( in_array( $constraint->getConstraintId(), $constraintIds ) ) {
+			foreach ($constraints as $constraint) {
+				if (in_array($constraint->getConstraintId(), $constraintIds)) {
 					$constraintsToUse[] = $constraint;
 				}
 			}
@@ -435,29 +435,29 @@ 
 		array $constraintIds = null,
 		callable $defaultResults = null
 	) {
-		$context = new MainSnakContext( $entity, $statement );
+		$context = new MainSnakContext($entity, $statement);
 		$constraints = $this->getConstraintsToUse(
 			$statement->getPropertyId(),
 			$constraintIds
 		);
-		$result = $defaultResults !== null ? $defaultResults( $context ) : [];
+		$result = $defaultResults !== null ? $defaultResults($context) : [];
 
-		foreach ( $constraints as $constraint ) {
+		foreach ($constraints as $constraint) {
 			$parameters = $constraint->getConstraintParameters();
 			try {
-				$exceptions = $this->constraintParameterParser->parseExceptionParameter( $parameters );
-			} catch ( ConstraintParameterException $e ) {
-				$result[] = new CheckResult( $context, $constraint, [], CheckResult::STATUS_BAD_PARAMETERS, $e->getViolationMessage() );
+				$exceptions = $this->constraintParameterParser->parseExceptionParameter($parameters);
+			} catch (ConstraintParameterException $e) {
+				$result[] = new CheckResult($context, $constraint, [], CheckResult::STATUS_BAD_PARAMETERS, $e->getViolationMessage());
 				continue;
 			}
 
-			if ( in_array( $entity->getId(), $exceptions ) ) {
-				$message = new ViolationMessage( 'wbqc-violation-message-exception' );
-				$result[] = new CheckResult( $context, $constraint, [], CheckResult::STATUS_EXCEPTION, $message );
+			if (in_array($entity->getId(), $exceptions)) {
+				$message = new ViolationMessage('wbqc-violation-message-exception');
+				$result[] = new CheckResult($context, $constraint, [], CheckResult::STATUS_EXCEPTION, $message);
 				continue;
 			}
 
-			$result[] = $this->getCheckResultFor( $context, $constraint );
+			$result[] = $this->getCheckResultFor($context, $constraint);
 		}
 
 		return $result;
@@ -479,24 +479,24 @@ 
 	) {
 		$result = [];
 
-		if ( in_array(
+		if (in_array(
 			$statement->getPropertyId()->getSerialization(),
 			$this->propertiesWithViolatingQualifiers
-		) ) {
+		)) {
 			return $result;
 		}
 
-		foreach ( $statement->getQualifiers() as $qualifier ) {
-			$qualifierContext = new QualifierContext( $entity, $statement, $qualifier );
-			if ( $defaultResultsPerContext !== null ) {
-				$result = array_merge( $result, $defaultResultsPerContext( $qualifierContext ) );
+		foreach ($statement->getQualifiers() as $qualifier) {
+			$qualifierContext = new QualifierContext($entity, $statement, $qualifier);
+			if ($defaultResultsPerContext !== null) {
+				$result = array_merge($result, $defaultResultsPerContext($qualifierContext));
 			}
 			$qualifierConstraints = $this->getConstraintsToUse(
 				$qualifierContext->getSnak()->getPropertyId(),
 				$constraintIds
 			);
-			foreach ( $qualifierConstraints as $qualifierConstraint ) {
-				$result[] = $this->getCheckResultFor( $qualifierContext, $qualifierConstraint );
+			foreach ($qualifierConstraints as $qualifierConstraint) {
+				$result[] = $this->getCheckResultFor($qualifierContext, $qualifierConstraint);
 			}
 		}
 
@@ -520,19 +520,19 @@ 
 		$result = [];
 
 		/** @var Reference $reference */
-		foreach ( $statement->getReferences() as $reference ) {
-			foreach ( $reference->getSnaks() as $snak ) {
+		foreach ($statement->getReferences() as $reference) {
+			foreach ($reference->getSnaks() as $snak) {
 				$referenceContext = new ReferenceContext(
 					$entity, $statement, $reference, $snak
 				);
-				if ( $defaultResultsPerContext !== null ) {
-					$result = array_merge( $result, $defaultResultsPerContext( $referenceContext ) );
+				if ($defaultResultsPerContext !== null) {
+					$result = array_merge($result, $defaultResultsPerContext($referenceContext));
 				}
 				$referenceConstraints = $this->getConstraintsToUse(
 					$referenceContext->getSnak()->getPropertyId(),
 					$constraintIds
 				);
-				foreach ( $referenceConstraints as $referenceConstraint ) {
+				foreach ($referenceConstraints as $referenceConstraint) {
 					$result[] = $this->getCheckResultFor(
 						$referenceContext,
 						$referenceConstraint
@@ -551,65 +551,65 @@ 
 	 * @throws InvalidArgumentException
 	 * @return CheckResult
 	 */
-	private function getCheckResultFor( Context $context, Constraint $constraint ) {
-		if ( array_key_exists( $constraint->getConstraintTypeItemId(), $this->checkerMap ) ) {
+	private function getCheckResultFor(Context $context, Constraint $constraint) {
+		if (array_key_exists($constraint->getConstraintTypeItemId(), $this->checkerMap)) {
 			$checker = $this->checkerMap[$constraint->getConstraintTypeItemId()];
-			$result = $this->handleScope( $checker, $context, $constraint );
+			$result = $this->handleScope($checker, $context, $constraint);
 
-			if ( $result !== null ) {
-				$this->addMetadata( $context, $result );
+			if ($result !== null) {
+				$this->addMetadata($context, $result);
 				return $result;
 			}
 
-			$startTime = microtime( true );
+			$startTime = microtime(true);
 			try {
-				$result = $checker->checkConstraint( $context, $constraint );
-			} catch ( ConstraintParameterException $e ) {
-				$result = new CheckResult( $context, $constraint, [], CheckResult::STATUS_BAD_PARAMETERS, $e->getViolationMessage() );
-			} catch ( SparqlHelperException $e ) {
-				$message = new ViolationMessage( 'wbqc-violation-message-sparql-error' );
-				$result = new CheckResult( $context, $constraint, [], CheckResult::STATUS_TODO, $message );
+				$result = $checker->checkConstraint($context, $constraint);
+			} catch (ConstraintParameterException $e) {
+				$result = new CheckResult($context, $constraint, [], CheckResult::STATUS_BAD_PARAMETERS, $e->getViolationMessage());
+			} catch (SparqlHelperException $e) {
+				$message = new ViolationMessage('wbqc-violation-message-sparql-error');
+				$result = new CheckResult($context, $constraint, [], CheckResult::STATUS_TODO, $message);
 			}
-			$endTime = microtime( true );
+			$endTime = microtime(true);
 
-			$this->addMetadata( $context, $result );
+			$this->addMetadata($context, $result);
 
 			try {
 				$constraintStatus = $this->constraintParameterParser
-					->parseConstraintStatusParameter( $constraint->getConstraintParameters() );
-			} catch ( ConstraintParameterException $e ) {
-				$result = new CheckResult( $context, $constraint, [], CheckResult::STATUS_BAD_PARAMETERS, $e->getViolationMessage() );
+					->parseConstraintStatusParameter($constraint->getConstraintParameters());
+			} catch (ConstraintParameterException $e) {
+				$result = new CheckResult($context, $constraint, [], CheckResult::STATUS_BAD_PARAMETERS, $e->getViolationMessage());
 				$constraintStatus = null;
 			}
-			if ( $constraintStatus === null ) {
+			if ($constraintStatus === null) {
 				// downgrade violation to warning
-				if ( $result->getStatus() === CheckResult::STATUS_VIOLATION ) {
-					$result->setStatus( CheckResult::STATUS_WARNING );
+				if ($result->getStatus() === CheckResult::STATUS_VIOLATION) {
+					$result->setStatus(CheckResult::STATUS_WARNING);
 				}
 			} else {
-				if ( $constraintStatus !== 'mandatory' ) {
+				if ($constraintStatus !== 'mandatory') {
 					// @codeCoverageIgnoreStart
 					throw new LogicException(
-						"Unknown constraint status '$constraintStatus', " .
+						"Unknown constraint status '$constraintStatus', ".
 						"only known status is 'mandatory'"
 					);
 					// @codeCoverageIgnoreEnd
 				}
-				$result->addParameter( 'constraint_status', $constraintStatus );
+				$result->addParameter('constraint_status', $constraintStatus);
 			}
 
 			$this->loggingHelper->logConstraintCheck(
 				$context,
 				$constraint,
 				$result,
-				get_class( $checker ),
+				get_class($checker),
 				$endTime - $startTime,
 				__METHOD__
 			);
 
 			return $result;
 		} else {
-			return new CheckResult( $context, $constraint, [], CheckResult::STATUS_TODO, null );
+			return new CheckResult($context, $constraint, [], CheckResult::STATUS_TODO, null);
 		}
 	}
 
@@ -623,29 +623,29 @@ 
 				$constraint->getConstraintParameters(),
 				$constraint->getConstraintTypeItemId()
 			);
-		} catch ( ConstraintParameterException $e ) {
-			return new CheckResult( $context, $constraint, [], CheckResult::STATUS_BAD_PARAMETERS, $e->getViolationMessage() );
+		} catch (ConstraintParameterException $e) {
+			return new CheckResult($context, $constraint, [], CheckResult::STATUS_BAD_PARAMETERS, $e->getViolationMessage());
 		}
-		if ( $checkedContextTypes === null ) {
+		if ($checkedContextTypes === null) {
 			$checkedContextTypes = $checker->getDefaultContextTypes();
 		}
-		if ( !in_array( $context->getType(), $checkedContextTypes ) ) {
-			return new CheckResult( $context, $constraint, [], CheckResult::STATUS_NOT_IN_SCOPE, null );
+		if (!in_array($context->getType(), $checkedContextTypes)) {
+			return new CheckResult($context, $constraint, [], CheckResult::STATUS_NOT_IN_SCOPE, null);
 		}
-		if ( $checker->getSupportedContextTypes()[$context->getType()] === CheckResult::STATUS_TODO ) {
-			return new CheckResult( $context, $constraint, [], CheckResult::STATUS_TODO, null );
+		if ($checker->getSupportedContextTypes()[$context->getType()] === CheckResult::STATUS_TODO) {
+			return new CheckResult($context, $constraint, [], CheckResult::STATUS_TODO, null);
 		}
 		return null;
 	}
 
-	private function addMetadata( Context $context, CheckResult $result ) {
-		$result->withMetadata( Metadata::merge( [
+	private function addMetadata(Context $context, CheckResult $result) {
+		$result->withMetadata(Metadata::merge([
 			$result->getMetadata(),
-			Metadata::ofDependencyMetadata( DependencyMetadata::merge( [
-				DependencyMetadata::ofEntityId( $context->getEntity()->getId() ),
-				DependencyMetadata::ofEntityId( $result->getConstraint()->getPropertyId() ),
-			] ) ),
-		] ) );
+			Metadata::ofDependencyMetadata(DependencyMetadata::merge([
+				DependencyMetadata::ofEntityId($context->getEntity()->getId()),
+				DependencyMetadata::ofEntityId($result->getConstraint()->getPropertyId()),
+			])),
+		]));
 	}
 
 	/**
@@ -653,12 +653,12 @@ 
 	 *
 	 * @return CheckResult[]
 	 */
-	private function sortResult( array $result ) {
-		if ( count( $result ) < 2 ) {
+	private function sortResult(array $result) {
+		if (count($result) < 2) {
 			return $result;
 		}
 
-		$sortFunction = function ( CheckResult $a, CheckResult $b ) {
+		$sortFunction = function(CheckResult $a, CheckResult $b) {
 			$orderNum = 0;
 			$order = [
 				CheckResult::STATUS_BAD_PARAMETERS => $orderNum++,
@@ -674,55 +674,55 @@ 
 			$statusA = $a->getStatus();
 			$statusB = $b->getStatus();
 
-			$orderA = array_key_exists( $statusA, $order ) ? $order[ $statusA ] : $order[ 'other' ];
-			$orderB = array_key_exists( $statusB, $order ) ? $order[ $statusB ] : $order[ 'other' ];
+			$orderA = array_key_exists($statusA, $order) ? $order[$statusA] : $order['other'];
+			$orderB = array_key_exists($statusB, $order) ? $order[$statusB] : $order['other'];
 
-			if ( $orderA === $orderB ) {
+			if ($orderA === $orderB) {
 				$cursorA = $a->getContextCursor();
 				$cursorB = $b->getContextCursor();
 
-				if ( $cursorA instanceof EntityContextCursor ) {
+				if ($cursorA instanceof EntityContextCursor) {
 					return $cursorB instanceof EntityContextCursor ? 0 : -1;
 				}
-				if ( $cursorB instanceof EntityContextCursor ) {
+				if ($cursorB instanceof EntityContextCursor) {
 					return $cursorA instanceof EntityContextCursor ? 0 : 1;
 				}
 
 				$pidA = $cursorA->getSnakPropertyId();
 				$pidB = $cursorB->getSnakPropertyId();
 
-				if ( $pidA === $pidB ) {
+				if ($pidA === $pidB) {
 					$hashA = $cursorA->getSnakHash();
 					$hashB = $cursorB->getSnakHash();
 
-					if ( $hashA === $hashB ) {
-						if ( $a instanceof NullResult ) {
+					if ($hashA === $hashB) {
+						if ($a instanceof NullResult) {
 							return $b instanceof NullResult ? 0 : -1;
 						}
-						if ( $b instanceof NullResult ) {
+						if ($b instanceof NullResult) {
 							return $a instanceof NullResult ? 0 : 1;
 						}
 
 						$typeA = $a->getConstraint()->getConstraintTypeItemId();
 						$typeB = $b->getConstraint()->getConstraintTypeItemId();
 
-						if ( $typeA == $typeB ) {
+						if ($typeA == $typeB) {
 							return 0;
 						} else {
-							return ( $typeA > $typeB ) ? 1 : -1;
+							return ($typeA > $typeB) ? 1 : -1;
 						}
 					} else {
-						return ( $hashA > $hashB ) ? 1 : -1;
+						return ($hashA > $hashB) ? 1 : -1;
 					}
 				} else {
-					return ( $pidA > $pidB ) ? 1 : -1;
+					return ($pidA > $pidB) ? 1 : -1;
 				}
 			} else {
-				return ( $orderA > $orderB ) ? 1 : -1;
+				return ($orderA > $orderB) ? 1 : -1;
 			}
 		};
 
-		uasort( $result, $sortFunction );
+		uasort($result, $sortFunction);
 
 		return $result;
 	}

src/ConstraintCheck/Helper/TypeCheckerHelper.php

Spacing +45 added lines, -45 removed lines

@@ -80,23 +80,23 @@ 
 	 * @return bool
 	 * @throws OverflowException if $entitiesChecked exceeds the configured limit
 	 */
-	private function isSubclassOf( EntityId $comparativeClass, array $classesToCheck, &$entitiesChecked = 0 ) {
-		$maxEntities = $this->config->get( 'WBQualityConstraintsTypeCheckMaxEntities' );
+	private function isSubclassOf(EntityId $comparativeClass, array $classesToCheck, &$entitiesChecked = 0) {
+		$maxEntities = $this->config->get('WBQualityConstraintsTypeCheckMaxEntities');
 		if ( ++$entitiesChecked > $maxEntities ) {
-			throw new OverflowException( 'Too many entities to check' );
+			throw new OverflowException('Too many entities to check');
 		}
 
-		$item = $this->entityLookup->getEntity( $comparativeClass );
-		if ( !( $item instanceof StatementListProvider ) ) {
+		$item = $this->entityLookup->getEntity($comparativeClass);
+		if (!($item instanceof StatementListProvider)) {
 			return false; // lookup failed, probably because item doesn't exist
 		}
 
-		$subclassId = $this->config->get( 'WBQualityConstraintsSubclassOfId' );
+		$subclassId = $this->config->get('WBQualityConstraintsSubclassOfId');
 		/** @var Statement $statement */
-		foreach ( $item->getStatements()->getByPropertyId( new PropertyId( $subclassId ) ) as $statement ) {
+		foreach ($item->getStatements()->getByPropertyId(new PropertyId($subclassId)) as $statement) {
 			$mainSnak = $statement->getMainSnak();
 
-			if ( !( $this->hasCorrectType( $mainSnak ) ) ) {
+			if (!($this->hasCorrectType($mainSnak))) {
 				continue;
 			}
 			/** @var PropertyValueSnak $mainSnak */
@@ -105,11 +105,11 @@ 
 			$dataValue = $mainSnak->getDataValue();
 			$comparativeClass = $dataValue->getEntityId();
 
-			if ( in_array( $comparativeClass->getSerialization(), $classesToCheck ) ) {
+			if (in_array($comparativeClass->getSerialization(), $classesToCheck)) {
 				return true;
 			}
 
-			if ( $this->isSubclassOf( $comparativeClass, $classesToCheck, $entitiesChecked ) ) {
+			if ($this->isSubclassOf($comparativeClass, $classesToCheck, $entitiesChecked)) {
 				return true;
 			}
 		}
@@ -130,44 +130,44 @@ 
 	 * @return CachedBool
 	 * @throws SparqlHelperException if SPARQL is used and the query times out or some other error occurs
 	 */
-	public function isSubclassOfWithSparqlFallback( EntityId $comparativeClass, array $classesToCheck ) {
+	public function isSubclassOfWithSparqlFallback(EntityId $comparativeClass, array $classesToCheck) {
 		try {
-			$start1 = microtime( true );
-			$isSubclass = $this->isSubclassOf( $comparativeClass, $classesToCheck );
-			$end1 = microtime( true );
+			$start1 = microtime(true);
+			$isSubclass = $this->isSubclassOf($comparativeClass, $classesToCheck);
+			$end1 = microtime(true);
 			$this->dataFactory->timing(
 				'wikibase.quality.constraints.type.php.success.timing',
-				( $end1 - $start1 ) * 1000
+				($end1 - $start1) * 1000
 			);
 
-			return new CachedBool( $isSubclass, Metadata::blank() );
-		} catch ( OverflowException $e ) {
-			$end1 = microtime( true );
+			return new CachedBool($isSubclass, Metadata::blank());
+		} catch (OverflowException $e) {
+			$end1 = microtime(true);
 			$this->dataFactory->timing(
 				'wikibase.quality.constraints.type.php.overflow.timing',
-				( $end1 - $start1 ) * 1000
+				($end1 - $start1) * 1000
 			);
 
-			if ( !( $this->sparqlHelper instanceof DummySparqlHelper ) ) {
+			if (!($this->sparqlHelper instanceof DummySparqlHelper)) {
 				$this->dataFactory->increment(
 					'wikibase.quality.constraints.sparql.typeFallback'
 				);
 
-				$start2 = microtime( true );
+				$start2 = microtime(true);
 				$hasType = $this->sparqlHelper->hasType(
 					$comparativeClass->getSerialization(),
 					$classesToCheck,
 					/* withInstance = */ false
 				);
-				$end2 = microtime( true );
+				$end2 = microtime(true);
 				$this->dataFactory->timing(
 					'wikibase.quality.constraints.type.sparql.success.timing',
-					( $end2 - $start2 ) * 1000
+					($end2 - $start2) * 1000
 				);
 
 				return $hasType;
 			} else {
-				return new CachedBool( false, Metadata::blank() );
+				return new CachedBool(false, Metadata::blank());
 			}
 		}
 	}
@@ -185,13 +185,13 @@ 
 	 * @return CachedBool
 	 * @throws SparqlHelperException if SPARQL is used and the query times out or some other error occurs
 	 */
-	public function hasClassInRelation( StatementList $statements, array $relationIds, array $classesToCheck ) {
+	public function hasClassInRelation(StatementList $statements, array $relationIds, array $classesToCheck) {
 		$metadatas = [];
 
-		foreach ( $this->getStatementsByPropertyIds( $statements, $relationIds ) as $statement ) {
+		foreach ($this->getStatementsByPropertyIds($statements, $relationIds) as $statement) {
 			$mainSnak = $statement->getMainSnak();
 
-			if ( !$this->hasCorrectType( $mainSnak ) ) {
+			if (!$this->hasCorrectType($mainSnak)) {
 				continue;
 			}
 			/** @var PropertyValueSnak $mainSnak */
@@ -200,28 +200,28 @@ 
 			$dataValue = $mainSnak->getDataValue();
 			$comparativeClass = $dataValue->getEntityId();
 
-			if ( in_array( $comparativeClass->getSerialization(), $classesToCheck ) ) {
+			if (in_array($comparativeClass->getSerialization(), $classesToCheck)) {
 				// discard $metadatas, we know this is fresh
-				return new CachedBool( true, Metadata::blank() );
+				return new CachedBool(true, Metadata::blank());
 			}
 
-			$result = $this->isSubclassOfWithSparqlFallback( $comparativeClass, $classesToCheck );
+			$result = $this->isSubclassOfWithSparqlFallback($comparativeClass, $classesToCheck);
 			$metadatas[] = $result->getMetadata();
-			if ( $result->getBool() ) {
+			if ($result->getBool()) {
 				return new CachedBool(
 					true,
-					Metadata::merge( $metadatas )
+					Metadata::merge($metadatas)
 				);
 			}
 		}
 
 		return new CachedBool(
 			false,
-			Metadata::merge( $metadatas )
+			Metadata::merge($metadatas)
 		);
 	}
 
-	private function hasCorrectType( Snak $mainSnak ) {
+	private function hasCorrectType(Snak $mainSnak) {
 		return $mainSnak instanceof PropertyValueSnak
 			&& $mainSnak->getDataValue()->getType() === 'wikibase-entityid';
 	}
@@ -238,12 +238,12 @@ 
 	) {
 		$statementArrays = [];
 
-		foreach ( $propertyIdSerializations as $propertyIdSerialization ) {
-			$propertyId = new PropertyId( $propertyIdSerialization );
-			$statementArrays[] = $statements->getByPropertyId( $propertyId )->toArray();
+		foreach ($propertyIdSerializations as $propertyIdSerialization) {
+			$propertyId = new PropertyId($propertyIdSerialization);
+			$statementArrays[] = $statements->getByPropertyId($propertyId)->toArray();
 		}
 
-		return call_user_func_array( 'array_merge', $statementArrays );
+		return call_user_func_array('array_merge', $statementArrays);
 	}
 
 	/**
@@ -255,10 +255,10 @@ 
 	 *
 	 * @return ViolationMessage
 	 */
-	public function getViolationMessage( PropertyId $propertyId, EntityId $entityId, array $classes, $checker, $relation ) {
+	public function getViolationMessage(PropertyId $propertyId, EntityId $entityId, array $classes, $checker, $relation) {
 		$classes = array_map(
-			function( $itemIdSerialization ) {
-				return new ItemId( $itemIdSerialization );
+			function($itemIdSerialization) {
+				return new ItemId($itemIdSerialization);
 			},
 			$classes
 		);
@@ -270,10 +270,10 @@ 
 		// wbqc-violation-message-valueType-instance
 		// wbqc-violation-message-valueType-subclass
 		// wbqc-violation-message-valueType-instanceOrSubclass
-		return ( new ViolationMessage( 'wbqc-violation-message-' . $checker . '-' . $relation ) )
-			->withEntityId( $propertyId, Role::CONSTRAINT_PROPERTY )
-			->withEntityId( $entityId, Role::SUBJECT )
-			->withEntityIdList( $classes, Role::OBJECT );
+		return (new ViolationMessage('wbqc-violation-message-'.$checker.'-'.$relation))
+			->withEntityId($propertyId, Role::CONSTRAINT_PROPERTY)
+			->withEntityId($entityId, Role::SUBJECT)
+			->withEntityIdList($classes, Role::OBJECT);
 	}
 
 }

src/ConstraintCheck/Helper/SparqlHelper.php

Spacing +163 added lines, -165 removed lines

@@ -161,18 +161,18 @@ 
 		$this->loggingHelper = $loggingHelper;
 		$this->defaultUserAgent = $defaultUserAgent;
 		$this->requestFactory = $requestFactory;
-		$this->entityPrefix = $rdfVocabulary->getNamespaceURI( RdfVocabulary::NS_ENTITY );
+		$this->entityPrefix = $rdfVocabulary->getNamespaceURI(RdfVocabulary::NS_ENTITY);
 		$this->prefixes = <<<EOT
-PREFIX wd: <{$rdfVocabulary->getNamespaceURI( RdfVocabulary::NS_ENTITY )}>
-PREFIX wds: <{$rdfVocabulary->getNamespaceURI( RdfVocabulary::NS_STATEMENT )}>
-PREFIX wdt: <{$rdfVocabulary->getNamespaceURI( RdfVocabulary::NSP_DIRECT_CLAIM )}>
-PREFIX wdv: <{$rdfVocabulary->getNamespaceURI( RdfVocabulary::NS_VALUE )}>
-PREFIX p: <{$rdfVocabulary->getNamespaceURI( RdfVocabulary::NSP_CLAIM )}>
-PREFIX ps: <{$rdfVocabulary->getNamespaceURI( RdfVocabulary::NSP_CLAIM_STATEMENT )}>
-PREFIX pq: <{$rdfVocabulary->getNamespaceURI( RdfVocabulary::NSP_QUALIFIER )}>
-PREFIX pqv: <{$rdfVocabulary->getNamespaceURI( RdfVocabulary::NSP_QUALIFIER_VALUE )}>
-PREFIX pr: <{$rdfVocabulary->getNamespaceURI( RdfVocabulary::NSP_REFERENCE )}>
-PREFIX prv: <{$rdfVocabulary->getNamespaceURI( RdfVocabulary::NSP_REFERENCE_VALUE )}>
+PREFIX wd: <{$rdfVocabulary->getNamespaceURI(RdfVocabulary::NS_ENTITY)}>
+PREFIX wds: <{$rdfVocabulary->getNamespaceURI(RdfVocabulary::NS_STATEMENT)}>
+PREFIX wdt: <{$rdfVocabulary->getNamespaceURI(RdfVocabulary::NSP_DIRECT_CLAIM)}>
+PREFIX wdv: <{$rdfVocabulary->getNamespaceURI(RdfVocabulary::NS_VALUE)}>
+PREFIX p: <{$rdfVocabulary->getNamespaceURI(RdfVocabulary::NSP_CLAIM)}>
+PREFIX ps: <{$rdfVocabulary->getNamespaceURI(RdfVocabulary::NSP_CLAIM_STATEMENT)}>
+PREFIX pq: <{$rdfVocabulary->getNamespaceURI(RdfVocabulary::NSP_QUALIFIER)}>
+PREFIX pqv: <{$rdfVocabulary->getNamespaceURI(RdfVocabulary::NSP_QUALIFIER_VALUE)}>
+PREFIX pr: <{$rdfVocabulary->getNamespaceURI(RdfVocabulary::NSP_REFERENCE)}>
+PREFIX prv: <{$rdfVocabulary->getNamespaceURI(RdfVocabulary::NSP_REFERENCE_VALUE)}>
 PREFIX wikibase: <http://wikiba.se/ontology#>
 PREFIX wikibase-beta: <http://wikiba.se/ontology-beta#>
 EOT;
@@ -187,21 +187,21 @@ 
 	 * @return CachedBool
 	 * @throws SparqlHelperException if the query times out or some other error occurs
 	 */
-	public function hasType( $id, array $classes, $withInstance ) {
-		$instanceOfId = $this->config->get( 'WBQualityConstraintsInstanceOfId' );
-		$subclassOfId = $this->config->get( 'WBQualityConstraintsSubclassOfId' );
+	public function hasType($id, array $classes, $withInstance) {
+		$instanceOfId = $this->config->get('WBQualityConstraintsInstanceOfId');
+		$subclassOfId = $this->config->get('WBQualityConstraintsSubclassOfId');
 
-		$path = ( $withInstance ? "wdt:$instanceOfId/" : "" ) . "wdt:$subclassOfId*";
+		$path = ($withInstance ? "wdt:$instanceOfId/" : "")."wdt:$subclassOfId*";
 
 		$metadatas = [];
 
-		foreach ( array_chunk( $classes, 20 ) as $classesChunk ) {
-			$classesValues = implode( ' ', array_map(
-				function( $class ) {
-					return 'wd:' . $class;
+		foreach (array_chunk($classes, 20) as $classesChunk) {
+			$classesValues = implode(' ', array_map(
+				function($class) {
+					return 'wd:'.$class;
 				},
 				$classesChunk
-			) );
+			));
 
 			$query = <<<EOF
 ASK {
@@ -212,19 +212,19 @@ 
 EOF;
 			// TODO hint:gearing is a workaround for T168973 and can hopefully be removed eventually
 
-			$result = $this->runQuery( $query );
+			$result = $this->runQuery($query);
 			$metadatas[] = $result->getMetadata();
-			if ( $result->getArray()['boolean'] ) {
+			if ($result->getArray()['boolean']) {
 				return new CachedBool(
 					true,
-					Metadata::merge( $metadatas )
+					Metadata::merge($metadatas)
 				);
 			}
 		}
 
 		return new CachedBool(
 			false,
-			Metadata::merge( $metadatas )
+			Metadata::merge($metadatas)
 		);
 	}
 
@@ -240,10 +240,10 @@ 
 		$ignoreDeprecatedStatements
 	) {
 		$pid = $statement->getPropertyId()->serialize();
-		$guid = str_replace( '$', '-', $statement->getGuid() );
+		$guid = str_replace('$', '-', $statement->getGuid());
 
 		$deprecatedFilter = '';
-		if ( $ignoreDeprecatedStatements ) {
+		if ($ignoreDeprecatedStatements) {
 			$deprecatedFilter .= 'MINUS { ?otherStatement wikibase:rank wikibase:DeprecatedRank. }';
 			$deprecatedFilter .= 'MINUS { ?otherStatement wikibase-beta:rank wikibase-beta:DeprecatedRank. }';
 		}
@@ -263,9 +263,9 @@ 
 LIMIT 10
 EOF;
 
-		$result = $this->runQuery( $query );
+		$result = $this->runQuery($query);
 
-		return $this->getOtherEntities( $result );
+		return $this->getOtherEntities($result);
 	}
 
 	/**
@@ -290,16 +290,15 @@ 
 		$dataType = $this->propertyDataTypeLookup->getDataTypeIdForProperty(
 			$snak->getPropertyId()
 		);
-		list( $value, $isFullValue ) = $this->getRdfLiteral( $dataType, $dataValue );
-		if ( $isFullValue ) {
+		list($value, $isFullValue) = $this->getRdfLiteral($dataType, $dataValue);
+		if ($isFullValue) {
 			$prefix .= 'v';
 		}
 		$path = $type === Context::TYPE_QUALIFIER ?
-			"$prefix:$pid" :
-			"prov:wasDerivedFrom/$prefix:$pid";
+			"$prefix:$pid" : "prov:wasDerivedFrom/$prefix:$pid";
 
 		$deprecatedFilter = '';
-		if ( $ignoreDeprecatedStatements ) {
+		if ($ignoreDeprecatedStatements) {
 			$deprecatedFilter = <<< EOF
   MINUS { ?otherStatement wikibase:rank wikibase:DeprecatedRank. }
   MINUS { ?otherStatement wikibase-beta:rank wikibase-beta:DeprecatedRank. }
@@ -320,9 +319,9 @@ 
 LIMIT 10
 EOF;
 
-		$result = $this->runQuery( $query );
+		$result = $this->runQuery($query);
 
-		return $this->getOtherEntities( $result );
+		return $this->getOtherEntities($result);
 	}
 
 	/**
@@ -332,8 +331,8 @@ 
 	 *
 	 * @return string
 	 */
-	private function stringLiteral( $text ) {
-		return '"' . strtr( $text, [ '"' => '\\"', '\\' => '\\\\' ] ) . '"';
+	private function stringLiteral($text) {
+		return '"'.strtr($text, ['"' => '\\"', '\\' => '\\\\']).'"';
 	}
 
 	/**
@@ -343,17 +342,17 @@ 
 	 *
 	 * @return CachedEntityIds
 	 */
-	private function getOtherEntities( CachedQueryResults $results ) {
-		return new CachedEntityIds( array_map(
-			function ( $resultBindings ) {
+	private function getOtherEntities(CachedQueryResults $results) {
+		return new CachedEntityIds(array_map(
+			function($resultBindings) {
 				$entityIRI = $resultBindings['otherEntity']['value'];
-				$entityPrefixLength = strlen( $this->entityPrefix );
-				if ( substr( $entityIRI, 0, $entityPrefixLength ) === $this->entityPrefix ) {
+				$entityPrefixLength = strlen($this->entityPrefix);
+				if (substr($entityIRI, 0, $entityPrefixLength) === $this->entityPrefix) {
 					try {
 						return $this->entityIdParser->parse(
-							substr( $entityIRI, $entityPrefixLength )
+							substr($entityIRI, $entityPrefixLength)
 						);
-					} catch ( EntityIdParsingException $e ) {
+					} catch (EntityIdParsingException $e) {
 						// fall through
 					}
 				}
@@ -361,7 +360,7 @@ 
 				return null;
 			},
 			$results->getArray()['results']['bindings']
-		), $results->getMetadata() );
+		), $results->getMetadata());
 	}
 
 	// @codingStandardsIgnoreStart cyclomatic complexity of this function is too high
@@ -374,47 +373,47 @@ 
 	 * @return array the literal or IRI as a string in SPARQL syntax,
 	 * and a boolean indicating whether it refers to a full value node or not
 	 */
-	private function getRdfLiteral( $dataType, DataValue $dataValue ) {
-		switch ( $dataType ) {
+	private function getRdfLiteral($dataType, DataValue $dataValue) {
+		switch ($dataType) {
 			case 'string':
 			case 'external-id':
-				return [ $this->stringLiteral( $dataValue->getValue() ), false ];
+				return [$this->stringLiteral($dataValue->getValue()), false];
 			case 'commonsMedia':
-				$url = $this->rdfVocabulary->getMediaFileURI( $dataValue->getValue() );
-				return [ '<' . $url . '>', false ];
+				$url = $this->rdfVocabulary->getMediaFileURI($dataValue->getValue());
+				return ['<'.$url.'>', false];
 			case 'geo-shape':
-				$url = $this->rdfVocabulary->getGeoShapeURI( $dataValue->getValue() );
-				return [ '<' . $url . '>', false ];
+				$url = $this->rdfVocabulary->getGeoShapeURI($dataValue->getValue());
+				return ['<'.$url.'>', false];
 			case 'tabular-data':
-				$url = $this->rdfVocabulary->getTabularDataURI( $dataValue->getValue() );
-				return [ '<' . $url . '>', false ];
+				$url = $this->rdfVocabulary->getTabularDataURI($dataValue->getValue());
+				return ['<'.$url.'>', false];
 			case 'url':
 				$url = $dataValue->getValue();
-				if ( !preg_match( '/^[^<>"{}\\\\|^`\\x00-\\x20]*$/D', $url ) ) {
+				if (!preg_match('/^[^<>"{}\\\\|^`\\x00-\\x20]*$/D', $url)) {
 					// not a valid URL for SPARQL (see SPARQL spec, production 139 IRIREF)
 					// such an URL should never reach us, so just throw
-					throw new InvalidArgumentException( 'invalid URL: ' . $url );
+					throw new InvalidArgumentException('invalid URL: '.$url);
 				}
-				return [ '<' . $url . '>', false ];
+				return ['<'.$url.'>', false];
 			case 'wikibase-item':
 			case 'wikibase-property':
 				/** @var EntityIdValue $dataValue */
-				return [ 'wd:' . $dataValue->getEntityId()->getSerialization(), false ];
+				return ['wd:'.$dataValue->getEntityId()->getSerialization(), false];
 			case 'monolingualtext':
 				/** @var MonolingualTextValue $dataValue */
 				$lang = $dataValue->getLanguageCode();
-				if ( !preg_match( '/^[a-zA-Z]+(-[a-zA-Z0-9]+)*$/D', $lang ) ) {
+				if (!preg_match('/^[a-zA-Z]+(-[a-zA-Z0-9]+)*$/D', $lang)) {
 					// not a valid language tag for SPARQL (see SPARQL spec, production 145 LANGTAG)
 					// such a language tag should never reach us, so just throw
-					throw new InvalidArgumentException( 'invalid language tag: ' . $lang );
+					throw new InvalidArgumentException('invalid language tag: '.$lang);
 				}
-				return [ $this->stringLiteral( $dataValue->getText() ) . '@' . $lang, false ];
+				return [$this->stringLiteral($dataValue->getText()).'@'.$lang, false];
 			case 'globe-coordinate':
 			case 'quantity':
 			case 'time':
-				return [ 'wdv:' . $dataValue->getHash(), true ];
+				return ['wdv:'.$dataValue->getHash(), true];
 			default:
-				throw new InvalidArgumentException( 'unknown data type: ' . $dataType );
+				throw new InvalidArgumentException('unknown data type: '.$dataType);
 		}
 	}
 	// @codingStandardsIgnoreEnd
@@ -427,44 +426,44 @@ 
 	 * @throws SparqlHelperException if the query times out or some other error occurs
 	 * @throws ConstraintParameterException if the $regex is invalid
 	 */
-	public function matchesRegularExpression( $text, $regex ) {
+	public function matchesRegularExpression($text, $regex) {
 		// caching wrapper around matchesRegularExpressionWithSparql
 
-		$textHash = hash( 'sha256', $text );
+		$textHash = hash('sha256', $text);
 		$cacheKey = $this->cache->makeKey(
 			'WikibaseQualityConstraints', // extension
 			'regex', // action
 			'WDQS-Java', // regex flavor
-			hash( 'sha256', $regex )
+			hash('sha256', $regex)
 		);
-		$cacheMapSize = $this->config->get( 'WBQualityConstraintsFormatCacheMapSize' );
+		$cacheMapSize = $this->config->get('WBQualityConstraintsFormatCacheMapSize');
 
 		$cacheMapArray = $this->cache->getWithSetCallback(
 			$cacheKey,
 			WANObjectCache::TTL_DAY,
-			function( $cacheMapArray ) use ( $text, $regex, $textHash, $cacheMapSize ) {
+			function($cacheMapArray) use ($text, $regex, $textHash, $cacheMapSize) {
 				// Initialize the cache map if not set
-				if ( $cacheMapArray === false ) {
+				if ($cacheMapArray === false) {
 					$key = 'wikibase.quality.constraints.regex.cache.refresh.init';
-					$this->dataFactory->increment( $key );
+					$this->dataFactory->increment($key);
 					return [];
 				}
 
 				$key = 'wikibase.quality.constraints.regex.cache.refresh';
-				$this->dataFactory->increment( $key );
-				$cacheMap = MapCacheLRU::newFromArray( $cacheMapArray, $cacheMapSize );
-				if ( $cacheMap->has( $textHash ) ) {
+				$this->dataFactory->increment($key);
+				$cacheMap = MapCacheLRU::newFromArray($cacheMapArray, $cacheMapSize);
+				if ($cacheMap->has($textHash)) {
 					$key = 'wikibase.quality.constraints.regex.cache.refresh.hit';
-					$this->dataFactory->increment( $key );
-					$cacheMap->get( $textHash ); // ping cache
+					$this->dataFactory->increment($key);
+					$cacheMap->get($textHash); // ping cache
 				} else {
 					$key = 'wikibase.quality.constraints.regex.cache.refresh.miss';
-					$this->dataFactory->increment( $key );
+					$this->dataFactory->increment($key);
 					try {
-						$matches = $this->matchesRegularExpressionWithSparql( $text, $regex );
-					} catch ( ConstraintParameterException $e ) {
-						$matches = $this->serializeConstraintParameterException( $e );
-					} catch ( SparqlHelperException $e ) {
+						$matches = $this->matchesRegularExpressionWithSparql($text, $regex);
+					} catch (ConstraintParameterException $e) {
+						$matches = $this->serializeConstraintParameterException($e);
+					} catch (SparqlHelperException $e) {
 						// don’t cache this
 						return $cacheMap->toArray();
 					}
@@ -488,42 +487,42 @@ 
 			]
 		);
 
-		if ( isset( $cacheMapArray[$textHash] ) ) {
+		if (isset($cacheMapArray[$textHash])) {
 			$key = 'wikibase.quality.constraints.regex.cache.hit';
-			$this->dataFactory->increment( $key );
+			$this->dataFactory->increment($key);
 			$matches = $cacheMapArray[$textHash];
-			if ( is_bool( $matches ) ) {
+			if (is_bool($matches)) {
 				return $matches;
-			} elseif ( is_array( $matches ) &&
-				$matches['type'] == ConstraintParameterException::class ) {
-				throw $this->deserializeConstraintParameterException( $matches );
+			} elseif (is_array($matches) &&
+				$matches['type'] == ConstraintParameterException::class) {
+				throw $this->deserializeConstraintParameterException($matches);
 			} else {
 				throw new MWException(
-					'Value of unknown type in object cache (' .
-					'cache key: ' . $cacheKey . ', ' .
-					'cache map key: ' . $textHash . ', ' .
-					'value type: ' . gettype( $matches ) . ')'
+					'Value of unknown type in object cache ('.
+					'cache key: '.$cacheKey.', '.
+					'cache map key: '.$textHash.', '.
+					'value type: '.gettype($matches).')'
 				);
 			}
 		} else {
 			$key = 'wikibase.quality.constraints.regex.cache.miss';
-			$this->dataFactory->increment( $key );
-			return $this->matchesRegularExpressionWithSparql( $text, $regex );
+			$this->dataFactory->increment($key);
+			return $this->matchesRegularExpressionWithSparql($text, $regex);
 		}
 	}
 
-	private function serializeConstraintParameterException( ConstraintParameterException $cpe ) {
+	private function serializeConstraintParameterException(ConstraintParameterException $cpe) {
 		return [
 			'type' => ConstraintParameterException::class,
-			'violationMessage' => $this->violationMessageSerializer->serialize( $cpe->getViolationMessage() ),
+			'violationMessage' => $this->violationMessageSerializer->serialize($cpe->getViolationMessage()),
 		];
 	}
 
-	private function deserializeConstraintParameterException( array $serialization ) {
+	private function deserializeConstraintParameterException(array $serialization) {
 		$message = $this->violationMessageDeserializer->deserialize(
 			$serialization['violationMessage']
 		);
-		return new ConstraintParameterException( $message );
+		return new ConstraintParameterException($message);
 	}
 
 	/**
@@ -537,25 +536,25 @@ 
 	 * @throws SparqlHelperException if the query times out or some other error occurs
 	 * @throws ConstraintParameterException if the $regex is invalid
 	 */
-	public function matchesRegularExpressionWithSparql( $text, $regex ) {
-		$textStringLiteral = $this->stringLiteral( $text );
-		$regexStringLiteral = $this->stringLiteral( '^(?:' . $regex . ')$' );
+	public function matchesRegularExpressionWithSparql($text, $regex) {
+		$textStringLiteral = $this->stringLiteral($text);
+		$regexStringLiteral = $this->stringLiteral('^(?:'.$regex.')$');
 
 		$query = <<<EOF
 SELECT (REGEX($textStringLiteral, $regexStringLiteral) AS ?matches) {}
 EOF;
 
-		$result = $this->runQuery( $query, false );
+		$result = $this->runQuery($query, false);
 
 		$vars = $result->getArray()['results']['bindings'][0];
-		if ( array_key_exists( 'matches', $vars ) ) {
+		if (array_key_exists('matches', $vars)) {
 			// true or false ⇒ regex okay, text matches or not
 			return $vars['matches']['value'] === 'true';
 		} else {
 			// empty result: regex broken
 			throw new ConstraintParameterException(
-				( new ViolationMessage( 'wbqc-violation-message-parameter-regex' ) )
-					->withInlineCode( $regex, Role::CONSTRAINT_PARAMETER_VALUE )
+				(new ViolationMessage('wbqc-violation-message-parameter-regex'))
+					->withInlineCode($regex, Role::CONSTRAINT_PARAMETER_VALUE)
 			);
 		}
 	}
@@ -567,14 +566,14 @@ 
 	 *
 	 * @return boolean
 	 */
-	public function isTimeout( $responseContent ) {
-		$timeoutRegex = implode( '|', array_map(
-			function ( $fqn ) {
-				return preg_quote( $fqn, '/' );
+	public function isTimeout($responseContent) {
+		$timeoutRegex = implode('|', array_map(
+			function($fqn) {
+				return preg_quote($fqn, '/');
 			},
-			$this->config->get( 'WBQualityConstraintsSparqlTimeoutExceptionClasses' )
-		) );
-		return (bool)preg_match( '/' . $timeoutRegex . '/', $responseContent );
+			$this->config->get('WBQualityConstraintsSparqlTimeoutExceptionClasses')
+		));
+		return (bool) preg_match('/'.$timeoutRegex.'/', $responseContent);
 	}
 
 	/**
@@ -586,17 +585,17 @@ 
 	 * @return int|boolean the max-age (in seconds)
 	 * or a plain boolean if no max-age can be determined
 	 */
-	public function getCacheMaxAge( $responseHeaders ) {
+	public function getCacheMaxAge($responseHeaders) {
 		if (
-			array_key_exists( 'x-cache-status', $responseHeaders ) &&
-			preg_match( '/^hit(?:-.*)?$/', $responseHeaders['x-cache-status'][0] )
+			array_key_exists('x-cache-status', $responseHeaders) &&
+			preg_match('/^hit(?:-.*)?$/', $responseHeaders['x-cache-status'][0])
 		) {
 			$maxage = [];
 			if (
-				array_key_exists( 'cache-control', $responseHeaders ) &&
-				preg_match( '/\bmax-age=(\d+)\b/', $responseHeaders['cache-control'][0], $maxage )
+				array_key_exists('cache-control', $responseHeaders) &&
+				preg_match('/\bmax-age=(\d+)\b/', $responseHeaders['cache-control'][0], $maxage)
 			) {
-				return intval( $maxage[1] );
+				return intval($maxage[1]);
 			} else {
 				return true;
 			}
@@ -618,33 +617,33 @@ 
 	 * or SparlHelper::INVALID_RETRY_AFTER if there is something wrong with the format
 	 *
 	 */
-	public function getThrottling( array $responseHeaders ) {
-		if ( !array_key_exists( 'Retry-After', $responseHeaders ) ) {
+	public function getThrottling(array $responseHeaders) {
+		if (!array_key_exists('Retry-After', $responseHeaders)) {
 			return self::NO_RETRY_AFTER;
 		}
 
-		$trimmedRetryAfterValue = trim( $responseHeaders[ 'Retry-After' ] );
-		if ( empty( $trimmedRetryAfterValue ) ) {
+		$trimmedRetryAfterValue = trim($responseHeaders['Retry-After']);
+		if (empty($trimmedRetryAfterValue)) {
 			return self::EMPTY_RETRY_AFTER;
 		}
 
-		if ( is_numeric( $trimmedRetryAfterValue ) ) {
-			$delaySeconds = (int)$trimmedRetryAfterValue;
-			if ( $delaySeconds >= 0 ) {
-				return $this->getTimestampInFuture( new DateInterval( 'PT' . $delaySeconds . 'S' ) );
+		if (is_numeric($trimmedRetryAfterValue)) {
+			$delaySeconds = (int) $trimmedRetryAfterValue;
+			if ($delaySeconds >= 0) {
+				return $this->getTimestampInFuture(new DateInterval('PT'.$delaySeconds.'S'));
 			}
 		} else {
-			$return = strtotime( $responseHeaders[ 'Retry-After' ] );
-			if ( !empty( $return ) ) {
-				return new ConvertibleTimestamp( $return );
+			$return = strtotime($responseHeaders['Retry-After']);
+			if (!empty($return)) {
+				return new ConvertibleTimestamp($return);
 			}
 		}
 		return self::INVALID_RETRY_AFTER;
 	}
 
-	private function getTimestampInFuture( DateInterval $delta ) {
+	private function getTimestampInFuture(DateInterval $delta) {
 		$now = new ConvertibleTimestamp();
-		return new ConvertibleTimestamp( $now->timestamp->add( $delta ) );
+		return new ConvertibleTimestamp($now->timestamp->add($delta));
 	}
 
 	/**
@@ -658,93 +657,92 @@ 
 	 *
 	 * @throws SparqlHelperException if the query times out or some other error occurs
 	 */
-	public function runQuery( $query, $needsPrefixes = true ) {
+	public function runQuery($query, $needsPrefixes = true) {
 
-		if ( $this->throttlingLock->isLocked( self::EXPIRY_LOCK_ID ) ) {
-			$this->dataFactory->increment( 'wikibase.quality.constraints.sparql.throttling' );
+		if ($this->throttlingLock->isLocked(self::EXPIRY_LOCK_ID)) {
+			$this->dataFactory->increment('wikibase.quality.constraints.sparql.throttling');
 			throw new TooManySparqlRequestsException();
 		}
 
-		$endpoint = $this->config->get( 'WBQualityConstraintsSparqlEndpoint' );
-		$maxQueryTimeMillis = $this->config->get( 'WBQualityConstraintsSparqlMaxMillis' );
-		$fallbackBlockDuration = (int)$this->config->get( 'WBQualityConstraintsSparqlThrottlingFallbackDuration' );
+		$endpoint = $this->config->get('WBQualityConstraintsSparqlEndpoint');
+		$maxQueryTimeMillis = $this->config->get('WBQualityConstraintsSparqlMaxMillis');
+		$fallbackBlockDuration = (int) $this->config->get('WBQualityConstraintsSparqlThrottlingFallbackDuration');
 
-		if ( $fallbackBlockDuration < 0 ) {
-			throw new InvalidArgumentException( 'Fallback duration must be positive int but is: '.
-				$fallbackBlockDuration );
+		if ($fallbackBlockDuration < 0) {
+			throw new InvalidArgumentException('Fallback duration must be positive int but is: '.
+				$fallbackBlockDuration);
 		}
 
-		if ( $needsPrefixes ) {
-			$query = $this->prefixes . $query;
+		if ($needsPrefixes) {
+			$query = $this->prefixes.$query;
 		}
-		$query = "#wbqc\n" . $query;
+		$query = "#wbqc\n".$query;
 
-		$url = $endpoint . '?' . http_build_query(
+		$url = $endpoint.'?'.http_build_query(
 			[
 				'query' => $query,
 				'format' => 'json',
 				'maxQueryTimeMillis' => $maxQueryTimeMillis,
 			],
-			null, ini_get( 'arg_separator.output' ),
+			null, ini_get('arg_separator.output'),
 			// encode spaces with %20, not +
 			PHP_QUERY_RFC3986
 		);
 
 		$options = [
 			'method' => 'GET',
-			'timeout' => (int)round( ( $maxQueryTimeMillis + 1000 ) / 1000 ),
+			'timeout' => (int) round(($maxQueryTimeMillis + 1000) / 1000),
 			'connectTimeout' => 'default',
 			'userAgent' => $this->defaultUserAgent,
 		];
-		$request = $this->requestFactory->create( $url, $options );
-		$startTime = microtime( true );
+		$request = $this->requestFactory->create($url, $options);
+		$startTime = microtime(true);
 		$status = $request->execute();
-		$endTime = microtime( true );
+		$endTime = microtime(true);
 		$this->dataFactory->timing(
 			'wikibase.quality.constraints.sparql.timing',
-			( $endTime - $startTime ) * 1000
+			($endTime - $startTime) * 1000
 		);
 
-		if ( $request->getStatus() === self::HTTP_TOO_MANY_REQUESTS ) {
-			$this->dataFactory->increment( 'wikibase.quality.constraints.sparql.throttling' );
-			$throttlingUntil = $this->getThrottling( $request->getResponseHeaders() );
-			if ( !( $throttlingUntil instanceof ConvertibleTimestamp ) ) {
-				$this->loggingHelper->logSparqlHelperTooManyRequestsRetryAfterInvalid( $request );
+		if ($request->getStatus() === self::HTTP_TOO_MANY_REQUESTS) {
+			$this->dataFactory->increment('wikibase.quality.constraints.sparql.throttling');
+			$throttlingUntil = $this->getThrottling($request->getResponseHeaders());
+			if (!($throttlingUntil instanceof ConvertibleTimestamp)) {
+				$this->loggingHelper->logSparqlHelperTooManyRequestsRetryAfterInvalid($request);
 				$this->throttlingLock->lock(
 					self::EXPIRY_LOCK_ID,
-					$this->getTimestampInFuture( new DateInterval( 'PT' . $fallbackBlockDuration . 'S' ) )
+					$this->getTimestampInFuture(new DateInterval('PT'.$fallbackBlockDuration.'S'))
 				);
 			} else {
-				$this->loggingHelper->logSparqlHelperTooManyRequestsRetryAfterPresent( $throttlingUntil, $request );
-				$this->throttlingLock->lock( self::EXPIRY_LOCK_ID, $throttlingUntil );
+				$this->loggingHelper->logSparqlHelperTooManyRequestsRetryAfterPresent($throttlingUntil, $request);
+				$this->throttlingLock->lock(self::EXPIRY_LOCK_ID, $throttlingUntil);
 			}
 			throw new TooManySparqlRequestsException();
 		}
 
-		$maxAge = $this->getCacheMaxAge( $request->getResponseHeaders() );
-		if ( $maxAge ) {
-			$this->dataFactory->increment( 'wikibase.quality.constraints.sparql.cached' );
+		$maxAge = $this->getCacheMaxAge($request->getResponseHeaders());
+		if ($maxAge) {
+			$this->dataFactory->increment('wikibase.quality.constraints.sparql.cached');
 		}
 
-		if ( $status->isOK() ) {
+		if ($status->isOK()) {
 			$json = $request->getContent();
-			$arr = json_decode( $json, true );
+			$arr = json_decode($json, true);
 			return new CachedQueryResults(
 				$arr,
 				Metadata::ofCachingMetadata(
 					$maxAge ?
-						CachingMetadata::ofMaximumAgeInSeconds( $maxAge ) :
-						CachingMetadata::fresh()
+						CachingMetadata::ofMaximumAgeInSeconds($maxAge) : CachingMetadata::fresh()
 				)
 			);
 		} else {
-			$this->dataFactory->increment( 'wikibase.quality.constraints.sparql.error' );
+			$this->dataFactory->increment('wikibase.quality.constraints.sparql.error');
 
 			$this->dataFactory->increment(
 				"wikibase.quality.constraints.sparql.error.http.{$request->getStatus()}"
 			);
 
-			if ( $this->isTimeout( $request->getContent() ) ) {
+			if ($this->isTimeout($request->getContent())) {
 				$this->dataFactory->increment(
 					'wikibase.quality.constraints.sparql.error.timeout'
 				);

src/ConstraintCheck/Helper/TooManySparqlRequestsException.php

Spacing +1 added lines, -1 removed lines

@@ -8,7 +8,7 @@
 class TooManySparqlRequestsException extends SparqlHelperException {
 
 	public function __construct() {
-		parent::__construct( 'The SPARQL query endpoint reports too many requests.' );
+		parent::__construct('The SPARQL query endpoint reports too many requests.');
 	}
 
 }