Inspection of "Merge "Move ConstraintParameterParser to services"" - wikimedia/mediawiki-extensions-WikibaseQualityConstraints - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Push — master ( bc3b91...c84824 )

unknown

created 2018-06-18 10:52 UTC

Status

Spacing +11 added lines, -11 removed lines patch added patch discarded remove patch

@@ -15,24 +15,24 @@  discard block
 block discarded – undo
 use WikibaseQuality\ConstraintReport\ConstraintCheck\Result\CheckResultSerializer;
 
 return [
-	ConstraintsServices::LOGGING_HELPER => function( MediaWikiServices $services ) {
+	ConstraintsServices::LOGGING_HELPER => function(MediaWikiServices $services) {
 		return new LoggingHelper(
 			$services->getStatsdDataFactory(),
-			LoggerFactory::getInstance( 'WikibaseQualityConstraints' ),
+			LoggerFactory::getInstance('WikibaseQualityConstraints'),
 			$services->getMainConfig()
 		);
 	},
 
-	ConstraintsServices::CONSTRAINT_REPOSITORY => function( MediaWikiServices $services ) {
+	ConstraintsServices::CONSTRAINT_REPOSITORY => function(MediaWikiServices $services) {
 		return new ConstraintRepository();
 	},
 
-	ConstraintsServices::CONSTRAINT_LOOKUP => function( MediaWikiServices $services ) {
-		$constraintRepository = ConstraintsServices::getConstraintRepository( $services );
-		return new CachingConstraintLookup( $constraintRepository );
+	ConstraintsServices::CONSTRAINT_LOOKUP => function(MediaWikiServices $services) {
+		$constraintRepository = ConstraintsServices::getConstraintRepository($services);
+		return new CachingConstraintLookup($constraintRepository);
 	},
 
-	ConstraintsServices::CHECK_RESULT_SERIALIZER => function( MediaWikiServices $services ) {
+	ConstraintsServices::CHECK_RESULT_SERIALIZER => function(MediaWikiServices $services) {
 		return new CheckResultSerializer(
 			new ConstraintSerializer(
 				false // constraint parameters are not exposed
@@ -43,7 +43,7 @@  discard block
 block discarded – undo
 		);
 	},
 
-	ConstraintsServices::CHECK_RESULT_DESERIALIZER => function( MediaWikiServices $services ) {
+	ConstraintsServices::CHECK_RESULT_DESERIALIZER => function(MediaWikiServices $services) {
 		// TODO in the future, get EntityIdParser and DataValueFactory from $services?
 		$repo = WikibaseRepo::getDefaultInstance();
 		$entityIdParser = $repo->getEntityIdParser();
@@ -60,11 +60,11 @@  discard block
 block discarded – undo
 		);
 	},
 
-	ConstraintsServices::VIOLATION_MESSAGE_SERIALIZER => function( MediaWikiServices $services ) {
+	ConstraintsServices::VIOLATION_MESSAGE_SERIALIZER => function(MediaWikiServices $services) {
 		return new ViolationMessageSerializer();
 	},
 
-	ConstraintsServices::VIOLATION_MESSAGE_DESERIALIZER => function( MediaWikiServices $services ) {
+	ConstraintsServices::VIOLATION_MESSAGE_DESERIALIZER => function(MediaWikiServices $services) {
 		// TODO in the future, get EntityIdParser and DataValueFactory from $services?
 		$repo = WikibaseRepo::getDefaultInstance();
 		$entityIdParser = $repo->getEntityIdParser();
@@ -76,7 +76,7 @@  discard block
 block discarded – undo
 		);
 	},
 
-	ConstraintsServices::CONSTRAINT_PARAMETER_PARSER => function( MediaWikiServices $services ) {
+	ConstraintsServices::CONSTRAINT_PARAMETER_PARSER => function(MediaWikiServices $services) {
 		// TODO in the future, get DeserializerFactory and concept base URIs from $services?
 		$repo = WikibaseRepo::getDefaultInstance();
 		$deserializerFactory = $repo->getBaseDataModelDeserializerFactory();

Please login to merge, or discard this patch.

src/ConstraintReportFactory.php 1 patch

Spacing +47 added lines, -47 removed lines patch added patch discarded remove patch

@@ -151,7 +151,7 @@  discard block
 block discarded – undo
 	public static function getDefaultInstance() {
 		static $instance = null;
 
-		if ( $instance === null ) {
+		if ($instance === null) {
 			$wikibaseRepo = WikibaseRepo::getDefaultInstance();
 			$config = MediaWikiServices::getInstance()->getMainConfig();
 			$titleParser = MediaWikiServices::getInstance()->getTitleParser();
@@ -203,7 +203,7 @@  discard block
 block discarded – undo
 	 * @return DelegatingConstraintChecker
 	 */
 	public function getConstraintChecker() {
-		if ( $this->delegatingConstraintChecker === null ) {
+		if ($this->delegatingConstraintChecker === null) {
 			$this->delegatingConstraintChecker = new DelegatingConstraintChecker(
 				$this->lookup,
 				$this->getConstraintCheckerMap(),
@@ -211,9 +211,9 @@  discard block
 block discarded – undo
 				ConstraintsServices::getConstraintParameterParser(),
 				$this->statementGuidParser,
 				ConstraintsServices::getLoggingHelper(),
-				$this->config->get( 'WBQualityConstraintsCheckQualifiers' ),
-				$this->config->get( 'WBQualityConstraintsCheckReferences' ),
-				$this->config->get( 'WBQualityConstraintsPropertiesWithViolatingQualifiers' )
+				$this->config->get('WBQualityConstraintsCheckQualifiers'),
+				$this->config->get('WBQualityConstraintsCheckReferences'),
+				$this->config->get('WBQualityConstraintsPropertiesWithViolatingQualifiers')
 			);
 		}
 
@@ -224,10 +224,10 @@  discard block
 block discarded – undo
 	 * @return ConstraintChecker[]
 	 */
 	private function getConstraintCheckerMap() {
-		if ( $this->constraintCheckerMap === null ) {
+		if ($this->constraintCheckerMap === null) {
 			$connectionCheckerHelper = new ConnectionCheckerHelper();
-			$rangeCheckerHelper = new RangeCheckerHelper( $this->config, $this->unitConverter );
-			if ( $this->config->get( 'WBQualityConstraintsSparqlEndpoint' ) !== '' ) {
+			$rangeCheckerHelper = new RangeCheckerHelper($this->config, $this->unitConverter);
+			if ($this->config->get('WBQualityConstraintsSparqlEndpoint') !== '') {
 				$sparqlHelper = new SparqlHelper(
 					$this->config,
 					$this->rdfVocabulary,
@@ -249,118 +249,118 @@  discard block
 block discarded – undo
 			);
 
 			$this->constraintCheckerMap = [
-				$this->config->get( 'WBQualityConstraintsConflictsWithConstraintId' )
+				$this->config->get('WBQualityConstraintsConflictsWithConstraintId')
 					=> new ConflictsWithChecker(
 						$this->lookup,
 						ConstraintsServices::getConstraintParameterParser(),
 						$connectionCheckerHelper
 					),
-				$this->config->get( 'WBQualityConstraintsItemRequiresClaimConstraintId' )
+				$this->config->get('WBQualityConstraintsItemRequiresClaimConstraintId')
 					=> new ItemChecker(
 						$this->lookup,
 						ConstraintsServices::getConstraintParameterParser(),
 						$connectionCheckerHelper
 					),
-				$this->config->get( 'WBQualityConstraintsValueRequiresClaimConstraintId' )
+				$this->config->get('WBQualityConstraintsValueRequiresClaimConstraintId')
 					=> new TargetRequiredClaimChecker(
 						$this->lookup,
 						ConstraintsServices::getConstraintParameterParser(),
 						$connectionCheckerHelper
 					),
-				$this->config->get( 'WBQualityConstraintsSymmetricConstraintId' )
+				$this->config->get('WBQualityConstraintsSymmetricConstraintId')
 					=> new SymmetricChecker(
 						$this->lookup,
 						$connectionCheckerHelper
 					),
-				$this->config->get( 'WBQualityConstraintsInverseConstraintId' )
+				$this->config->get('WBQualityConstraintsInverseConstraintId')
 					=> new InverseChecker(
 						$this->lookup,
 						ConstraintsServices::getConstraintParameterParser(),
 						$connectionCheckerHelper
 					),
-				$this->config->get( 'WBQualityConstraintsUsedAsQualifierConstraintId' )
+				$this->config->get('WBQualityConstraintsUsedAsQualifierConstraintId')
 					=> new QualifierChecker(),
-				$this->config->get( 'WBQualityConstraintsAllowedQualifiersConstraintId' )
+				$this->config->get('WBQualityConstraintsAllowedQualifiersConstraintId')
 					=> new QualifiersChecker(
 						ConstraintsServices::getConstraintParameterParser()
 					),
-				$this->config->get( 'WBQualityConstraintsMandatoryQualifierConstraintId' )
+				$this->config->get('WBQualityConstraintsMandatoryQualifierConstraintId')
 					=> new MandatoryQualifiersChecker(
 						ConstraintsServices::getConstraintParameterParser()
 					),
-				$this->config->get( 'WBQualityConstraintsRangeConstraintId' )
+				$this->config->get('WBQualityConstraintsRangeConstraintId')
 					=> new RangeChecker(
 						$this->propertyDataTypeLookup,
 						ConstraintsServices::getConstraintParameterParser(),
 						$rangeCheckerHelper
 					),
-				$this->config->get( 'WBQualityConstraintsDifferenceWithinRangeConstraintId' )
+				$this->config->get('WBQualityConstraintsDifferenceWithinRangeConstraintId')
 					=> new DiffWithinRangeChecker(
 						ConstraintsServices::getConstraintParameterParser(),
 						$rangeCheckerHelper,
 						$this->config
 					),
-				$this->config->get( 'WBQualityConstraintsTypeConstraintId' )
+				$this->config->get('WBQualityConstraintsTypeConstraintId')
 					=> new TypeChecker(
 						$this->lookup,
 						ConstraintsServices::getConstraintParameterParser(),
 						$typeCheckerHelper,
 						$this->config
 					),
-				$this->config->get( 'WBQualityConstraintsValueTypeConstraintId' )
+				$this->config->get('WBQualityConstraintsValueTypeConstraintId')
 					=> new ValueTypeChecker(
 						$this->lookup,
 						ConstraintsServices::getConstraintParameterParser(),
 						$typeCheckerHelper,
 						$this->config
 					),
-				$this->config->get( 'WBQualityConstraintsSingleValueConstraintId' )
-					=> new SingleValueChecker( ConstraintsServices::getConstraintParameterParser() ),
-				$this->config->get( 'WBQualityConstraintsMultiValueConstraintId' )
-					=> new MultiValueChecker( ConstraintsServices::getConstraintParameterParser() ),
-				$this->config->get( 'WBQualityConstraintsDistinctValuesConstraintId' )
+				$this->config->get('WBQualityConstraintsSingleValueConstraintId')
+					=> new SingleValueChecker(ConstraintsServices::getConstraintParameterParser()),
+				$this->config->get('WBQualityConstraintsMultiValueConstraintId')
+					=> new MultiValueChecker(ConstraintsServices::getConstraintParameterParser()),
+				$this->config->get('WBQualityConstraintsDistinctValuesConstraintId')
 					=> new UniqueValueChecker(
 						$sparqlHelper
 					),
-				$this->config->get( 'WBQualityConstraintsFormatConstraintId' )
+				$this->config->get('WBQualityConstraintsFormatConstraintId')
 					=> new FormatChecker(
 						ConstraintsServices::getConstraintParameterParser(),
 						$this->config,
 						$sparqlHelper
 					),
-				$this->config->get( 'WBQualityConstraintsCommonsLinkConstraintId' )
+				$this->config->get('WBQualityConstraintsCommonsLinkConstraintId')
 					=> new CommonsLinkChecker(
 						ConstraintsServices::getConstraintParameterParser(),
 						$this->titleParser
 					),
-				$this->config->get( 'WBQualityConstraintsOneOfConstraintId' )
+				$this->config->get('WBQualityConstraintsOneOfConstraintId')
 					=> new OneOfChecker(
 						ConstraintsServices::getConstraintParameterParser()
 					),
-				$this->config->get( 'WBQualityConstraintsUsedForValuesOnlyConstraintId' )
+				$this->config->get('WBQualityConstraintsUsedForValuesOnlyConstraintId')
 					=> new ValueOnlyChecker(),
-				$this->config->get( 'WBQualityConstraintsUsedAsReferenceConstraintId' )
+				$this->config->get('WBQualityConstraintsUsedAsReferenceConstraintId')
 					=> new ReferenceChecker(),
-				$this->config->get( 'WBQualityConstraintsNoBoundsConstraintId' )
+				$this->config->get('WBQualityConstraintsNoBoundsConstraintId')
 					=> new NoBoundsChecker(),
-				$this->config->get( 'WBQualityConstraintsAllowedUnitsConstraintId' )
+				$this->config->get('WBQualityConstraintsAllowedUnitsConstraintId')
 					=> new AllowedUnitsChecker(
 						ConstraintsServices::getConstraintParameterParser(),
 						$this->unitConverter
 					),
-				$this->config->get( 'WBQualityConstraintsSingleBestValueConstraintId' )
-					=> new SingleBestValueChecker( ConstraintsServices::getConstraintParameterParser() ),
-				$this->config->get( 'WBQualityConstraintsAllowedEntityTypesConstraintId' )
+				$this->config->get('WBQualityConstraintsSingleBestValueConstraintId')
+					=> new SingleBestValueChecker(ConstraintsServices::getConstraintParameterParser()),
+				$this->config->get('WBQualityConstraintsAllowedEntityTypesConstraintId')
 					=> new EntityTypeChecker(
 						ConstraintsServices::getConstraintParameterParser()
 					),
-				$this->config->get( 'WBQualityConstraintsNoneOfConstraintId' )
+				$this->config->get('WBQualityConstraintsNoneOfConstraintId')
 					=> new NoneOfChecker(
 						ConstraintsServices::getConstraintParameterParser()
 					),
-				$this->config->get( 'WBQualityConstraintsIntegerConstraintId' )
+				$this->config->get('WBQualityConstraintsIntegerConstraintId')
 					=> new IntegerChecker(),
-				$this->config->get( 'WBQualityConstraintsCitationNeededConstraintId' )
+				$this->config->get('WBQualityConstraintsCitationNeededConstraintId')
 					=> new CitationNeededChecker(),
 			];
 		}
@@ -372,7 +372,7 @@  discard block
 block discarded – undo
 	 * @return WikiPageEntityMetaDataAccessor
 	 */
 	public function getWikiPageEntityMetaDataAccessor() {
-		if ( $this->wikiPageEntityMetaDataAccessor === null ) {
+		if ($this->wikiPageEntityMetaDataAccessor === null) {
 			$this->wikiPageEntityMetaDataAccessor = new WikiPageEntityMetaDataLookup(
 				$this->entityNamespaceLookup
 			);
@@ -385,12 +385,12 @@  discard block
 block discarded – undo
 	 * @return ResultsSource
 	 */
 	public function getResultsSource() {
-		if ( $this->resultsSource === null ) {
+		if ($this->resultsSource === null) {
 			$this->resultsSource = new CheckingResultsSource(
 				$this->getConstraintChecker()
 			);
 
-			if ( $this->config->get( 'WBQualityConstraintsCacheCheckConstraintsResults' ) ) {
+			if ($this->config->get('WBQualityConstraintsCacheCheckConstraintsResults')) {
 				$this->resultsSource = new CachingResultsSource(
 					$this->resultsSource,
 					ResultsCache::getDefaultInstance(),
@@ -398,9 +398,9 @@  discard block
 block discarded – undo
 					ConstraintsServices::getCheckResultDeserializer(),
 					$this->getWikiPageEntityMetaDataAccessor(),
 					$this->entityIdParser,
-					$this->config->get( 'WBQualityConstraintsCacheCheckConstraintsTTLSeconds' ),
+					$this->config->get('WBQualityConstraintsCacheCheckConstraintsTTLSeconds'),
 					$this->getPossiblyStaleConstraintTypes(),
-					$this->config->get( 'WBQualityConstraintsCacheCheckConstraintsMaximumRevisionIds' ),
+					$this->config->get('WBQualityConstraintsCacheCheckConstraintsMaximumRevisionIds'),
 					ConstraintsServices::getLoggingHelper()
 				);
 			}
@@ -414,10 +414,10 @@  discard block
 block discarded – undo
 	 */
 	public function getPossiblyStaleConstraintTypes() {
 		return [
-			$this->config->get( 'WBQualityConstraintsCommonsLinkConstraintId' ),
-			$this->config->get( 'WBQualityConstraintsTypeConstraintId' ),
-			$this->config->get( 'WBQualityConstraintsValueTypeConstraintId' ),
-			$this->config->get( 'WBQualityConstraintsDistinctValuesConstraintId' ),
+			$this->config->get('WBQualityConstraintsCommonsLinkConstraintId'),
+			$this->config->get('WBQualityConstraintsTypeConstraintId'),
+			$this->config->get('WBQualityConstraintsValueTypeConstraintId'),
+			$this->config->get('WBQualityConstraintsDistinctValuesConstraintId'),
 		];
 	}
 

Please login to merge, or discard this patch.

src/ConstraintsServices.php 1 patch

Spacing +19 added lines, -19 removed lines patch added patch discarded remove patch

@@ -24,75 +24,75 @@
 block discarded – undo
 	const VIOLATION_MESSAGE_DESERIALIZER = 'WBQC_ViolationMessageDeserializer';
 	const CONSTRAINT_PARAMETER_PARSER = 'WBQC_ConstraintParameterParser';
 
-	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);
 	}
 
 	/**
 	 * @param MediaWikiServices|null $services
 	 * @return LoggingHelper
 	 */
-	public static function getLoggingHelper( MediaWikiServices $services = null ) {
-		return self::getService( $services, self::LOGGING_HELPER );
+	public static function getLoggingHelper(MediaWikiServices $services = null) {
+		return self::getService($services, self::LOGGING_HELPER);
 	}
 
 	/**
 	 * @param MediaWikiServices|null $services
 	 * @return ConstraintRepository
 	 */
-	public static function getConstraintRepository( MediaWikiServices $services = null ) {
-		return self::getService( $services, self::CONSTRAINT_REPOSITORY );
+	public static function getConstraintRepository(MediaWikiServices $services = null) {
+		return self::getService($services, self::CONSTRAINT_REPOSITORY);
 	}
 
 	/**
 	 * @param MediaWikiServices|null $services
 	 * @return ConstraintLookup
 	 */
-	public static function getConstraintLookup( MediaWikiServices $services = null ) {
-		return self::getService( $services, self::CONSTRAINT_LOOKUP );
+	public static function getConstraintLookup(MediaWikiServices $services = null) {
+		return self::getService($services, self::CONSTRAINT_LOOKUP);
 	}
 
 	/**
 	 * @param MediaWikiServices|null $services
 	 * @return CheckResultSerializer
 	 */
-	public static function getCheckResultSerializer( MediaWikiServices $services = null ) {
-		return self::getService( $services, self::CHECK_RESULT_SERIALIZER );
+	public static function getCheckResultSerializer(MediaWikiServices $services = null) {
+		return self::getService($services, self::CHECK_RESULT_SERIALIZER);
 	}
 
 	/**
 	 * @param MediaWikiServices|null $services
 	 * @return CheckResultDeserializer
 	 */
-	public static function getCheckResultDeserializer( MediaWikiServices $services = null ) {
-		return self::getService( $services, self::CHECK_RESULT_DESERIALIZER );
+	public static function getCheckResultDeserializer(MediaWikiServices $services = null) {
+		return self::getService($services, self::CHECK_RESULT_DESERIALIZER);
 	}
 
 	/**
 	 * @param MediaWikiServices|null $services
 	 * @return ViolationMessageSerializer
 	 */
-	public static function getViolationMessageSerializer( MediaWikiServices $services = null ) {
-		return self::getService( $services, self::VIOLATION_MESSAGE_SERIALIZER );
+	public static function getViolationMessageSerializer(MediaWikiServices $services = null) {
+		return self::getService($services, self::VIOLATION_MESSAGE_SERIALIZER);
 	}
 
 	/**
 	 * @param MediaWikiServices|null $services
 	 * @return ViolationMessageDeserializer
 	 */
-	public static function getViolationMessageDeserializer( MediaWikiServices $services = null ) {
-		return self::getService( $services, self::VIOLATION_MESSAGE_DESERIALIZER );
+	public static function getViolationMessageDeserializer(MediaWikiServices $services = null) {
+		return self::getService($services, self::VIOLATION_MESSAGE_DESERIALIZER);
 	}
 
 	/**
 	 * @param MediaWikiServices|null $services
 	 * @return ConstraintParameterParser
 	 */
-	public static function getConstraintParameterParser( MediaWikiServices $services = null ) {
-		return self::getService( $services, self::CONSTRAINT_PARAMETER_PARSER );
+	public static function getConstraintParameterParser(MediaWikiServices $services = null) {
+		return self::getService($services, self::CONSTRAINT_PARAMETER_PARSER);
 	}
 
 }

Please login to merge, or discard this patch.

		@@ -15,24 +15,24 @@ discard block
		block discarded – undo
15	15	use WikibaseQuality\ConstraintReport\ConstraintCheck\Result\CheckResultSerializer;
16	16
17	17	return [
18		- ConstraintsServices::LOGGING_HELPER => function( MediaWikiServices $services ) {
	18	+ ConstraintsServices::LOGGING_HELPER => function(MediaWikiServices $services) {
19	19	return new LoggingHelper(
20	20	$services->getStatsdDataFactory(),
21		- LoggerFactory::getInstance( 'WikibaseQualityConstraints' ),
	21	+ LoggerFactory::getInstance('WikibaseQualityConstraints'),
22	22	$services->getMainConfig()
23	23	);
24	24	},
25	25
26		- ConstraintsServices::CONSTRAINT_REPOSITORY => function( MediaWikiServices $services ) {
	26	+ ConstraintsServices::CONSTRAINT_REPOSITORY => function(MediaWikiServices $services) {
27	27	return new ConstraintRepository();
28	28	},
29	29
30		- ConstraintsServices::CONSTRAINT_LOOKUP => function( MediaWikiServices $services ) {
31		- $constraintRepository = ConstraintsServices::getConstraintRepository( $services );
32		- return new CachingConstraintLookup( $constraintRepository );
	30	+ ConstraintsServices::CONSTRAINT_LOOKUP => function(MediaWikiServices $services) {
	31	+ $constraintRepository = ConstraintsServices::getConstraintRepository($services);
	32	+ return new CachingConstraintLookup($constraintRepository);
33	33	},
34	34
35		- ConstraintsServices::CHECK_RESULT_SERIALIZER => function( MediaWikiServices $services ) {
	35	+ ConstraintsServices::CHECK_RESULT_SERIALIZER => function(MediaWikiServices $services) {
36	36	return new CheckResultSerializer(
37	37	new ConstraintSerializer(
38	38	false // constraint parameters are not exposed
		@@ -43,7 +43,7 @@ discard block
		block discarded – undo
43	43	);
44	44	},
45	45
46		- ConstraintsServices::CHECK_RESULT_DESERIALIZER => function( MediaWikiServices $services ) {
	46	+ ConstraintsServices::CHECK_RESULT_DESERIALIZER => function(MediaWikiServices $services) {
47	47	// TODO in the future, get EntityIdParser and DataValueFactory from $services?
48	48	$repo = WikibaseRepo::getDefaultInstance();
49	49	$entityIdParser = $repo->getEntityIdParser();
		@@ -60,11 +60,11 @@ discard block
		block discarded – undo
60	60	);
61	61	},
62	62
63		- ConstraintsServices::VIOLATION_MESSAGE_SERIALIZER => function( MediaWikiServices $services ) {
	63	+ ConstraintsServices::VIOLATION_MESSAGE_SERIALIZER => function(MediaWikiServices $services) {
64	64	return new ViolationMessageSerializer();
65	65	},
66	66
67		- ConstraintsServices::VIOLATION_MESSAGE_DESERIALIZER => function( MediaWikiServices $services ) {
	67	+ ConstraintsServices::VIOLATION_MESSAGE_DESERIALIZER => function(MediaWikiServices $services) {
68	68	// TODO in the future, get EntityIdParser and DataValueFactory from $services?
69	69	$repo = WikibaseRepo::getDefaultInstance();
70	70	$entityIdParser = $repo->getEntityIdParser();
		@@ -76,7 +76,7 @@ discard block
		block discarded – undo
76	76	);
77	77	},
78	78
79		- ConstraintsServices::CONSTRAINT_PARAMETER_PARSER => function( MediaWikiServices $services ) {
	79	+ ConstraintsServices::CONSTRAINT_PARAMETER_PARSER => function(MediaWikiServices $services) {
80	80	// TODO in the future, get DeserializerFactory and concept base URIs from $services?
81	81	$repo = WikibaseRepo::getDefaultInstance();
82	82	$deserializerFactory = $repo->getBaseDataModelDeserializerFactory();

		@@ -151,7 +151,7 @@ discard block
		block discarded – undo
151	151	public static function getDefaultInstance() {
152	152	static $instance = null;
153	153
154		- if ( $instance === null ) {
	154	+ if ($instance === null) {
155	155	$wikibaseRepo = WikibaseRepo::getDefaultInstance();
156	156	$config = MediaWikiServices::getInstance()->getMainConfig();
157	157	$titleParser = MediaWikiServices::getInstance()->getTitleParser();
		@@ -203,7 +203,7 @@ discard block
		block discarded – undo
203	203	* @return DelegatingConstraintChecker
204	204	*/
205	205	public function getConstraintChecker() {
206		- if ( $this->delegatingConstraintChecker === null ) {
	206	+ if ($this->delegatingConstraintChecker === null) {
207	207	$this->delegatingConstraintChecker = new DelegatingConstraintChecker(
208	208	$this->lookup,
209	209	$this->getConstraintCheckerMap(),
		@@ -211,9 +211,9 @@ discard block
		block discarded – undo
211	211	ConstraintsServices::getConstraintParameterParser(),
212	212	$this->statementGuidParser,
213	213	ConstraintsServices::getLoggingHelper(),
214		- $this->config->get( 'WBQualityConstraintsCheckQualifiers' ),
215		- $this->config->get( 'WBQualityConstraintsCheckReferences' ),
216		- $this->config->get( 'WBQualityConstraintsPropertiesWithViolatingQualifiers' )
	214	+ $this->config->get('WBQualityConstraintsCheckQualifiers'),
	215	+ $this->config->get('WBQualityConstraintsCheckReferences'),
	216	+ $this->config->get('WBQualityConstraintsPropertiesWithViolatingQualifiers')
217	217	);
218	218	}
219	219
		@@ -224,10 +224,10 @@ discard block
		block discarded – undo
224	224	* @return ConstraintChecker[]
225	225	*/
226	226	private function getConstraintCheckerMap() {
227		- if ( $this->constraintCheckerMap === null ) {
	227	+ if ($this->constraintCheckerMap === null) {
228	228	$connectionCheckerHelper = new ConnectionCheckerHelper();
229		- $rangeCheckerHelper = new RangeCheckerHelper( $this->config, $this->unitConverter );
230		- if ( $this->config->get( 'WBQualityConstraintsSparqlEndpoint' ) !== '' ) {
	229	+ $rangeCheckerHelper = new RangeCheckerHelper($this->config, $this->unitConverter);
	230	+ if ($this->config->get('WBQualityConstraintsSparqlEndpoint') !== '') {
231	231	$sparqlHelper = new SparqlHelper(
232	232	$this->config,
233	233	$this->rdfVocabulary,
		@@ -249,118 +249,118 @@ discard block
		block discarded – undo
249	249	);
250	250
251	251	$this->constraintCheckerMap = [
252		- $this->config->get( 'WBQualityConstraintsConflictsWithConstraintId' )
	252	+ $this->config->get('WBQualityConstraintsConflictsWithConstraintId')
253	253	=> new ConflictsWithChecker(
254	254	$this->lookup,
255	255	ConstraintsServices::getConstraintParameterParser(),
256	256	$connectionCheckerHelper
257	257	),
258		- $this->config->get( 'WBQualityConstraintsItemRequiresClaimConstraintId' )
	258	+ $this->config->get('WBQualityConstraintsItemRequiresClaimConstraintId')
259	259	=> new ItemChecker(
260	260	$this->lookup,
261	261	ConstraintsServices::getConstraintParameterParser(),
262	262	$connectionCheckerHelper
263	263	),
264		- $this->config->get( 'WBQualityConstraintsValueRequiresClaimConstraintId' )
	264	+ $this->config->get('WBQualityConstraintsValueRequiresClaimConstraintId')
265	265	=> new TargetRequiredClaimChecker(
266	266	$this->lookup,
267	267	ConstraintsServices::getConstraintParameterParser(),
268	268	$connectionCheckerHelper
269	269	),
270		- $this->config->get( 'WBQualityConstraintsSymmetricConstraintId' )
	270	+ $this->config->get('WBQualityConstraintsSymmetricConstraintId')
271	271	=> new SymmetricChecker(
272	272	$this->lookup,
273	273	$connectionCheckerHelper
274	274	),
275		- $this->config->get( 'WBQualityConstraintsInverseConstraintId' )
	275	+ $this->config->get('WBQualityConstraintsInverseConstraintId')
276	276	=> new InverseChecker(
277	277	$this->lookup,
278	278	ConstraintsServices::getConstraintParameterParser(),
279	279	$connectionCheckerHelper
280	280	),
281		- $this->config->get( 'WBQualityConstraintsUsedAsQualifierConstraintId' )
	281	+ $this->config->get('WBQualityConstraintsUsedAsQualifierConstraintId')
282	282	=> new QualifierChecker(),
283		- $this->config->get( 'WBQualityConstraintsAllowedQualifiersConstraintId' )
	283	+ $this->config->get('WBQualityConstraintsAllowedQualifiersConstraintId')
284	284	=> new QualifiersChecker(
285	285	ConstraintsServices::getConstraintParameterParser()
286	286	),
287		- $this->config->get( 'WBQualityConstraintsMandatoryQualifierConstraintId' )
	287	+ $this->config->get('WBQualityConstraintsMandatoryQualifierConstraintId')
288	288	=> new MandatoryQualifiersChecker(
289	289	ConstraintsServices::getConstraintParameterParser()
290	290	),
291		- $this->config->get( 'WBQualityConstraintsRangeConstraintId' )
	291	+ $this->config->get('WBQualityConstraintsRangeConstraintId')
292	292	=> new RangeChecker(
293	293	$this->propertyDataTypeLookup,
294	294	ConstraintsServices::getConstraintParameterParser(),
295	295	$rangeCheckerHelper
296	296	),
297		- $this->config->get( 'WBQualityConstraintsDifferenceWithinRangeConstraintId' )
	297	+ $this->config->get('WBQualityConstraintsDifferenceWithinRangeConstraintId')
298	298	=> new DiffWithinRangeChecker(
299	299	ConstraintsServices::getConstraintParameterParser(),
300	300	$rangeCheckerHelper,
301	301	$this->config
302	302	),
303		- $this->config->get( 'WBQualityConstraintsTypeConstraintId' )
	303	+ $this->config->get('WBQualityConstraintsTypeConstraintId')
304	304	=> new TypeChecker(
305	305	$this->lookup,
306	306	ConstraintsServices::getConstraintParameterParser(),
307	307	$typeCheckerHelper,
308	308	$this->config
309	309	),
310		- $this->config->get( 'WBQualityConstraintsValueTypeConstraintId' )
	310	+ $this->config->get('WBQualityConstraintsValueTypeConstraintId')
311	311	=> new ValueTypeChecker(
312	312	$this->lookup,
313	313	ConstraintsServices::getConstraintParameterParser(),
314	314	$typeCheckerHelper,
315	315	$this->config
316	316	),
317		- $this->config->get( 'WBQualityConstraintsSingleValueConstraintId' )
318		- => new SingleValueChecker( ConstraintsServices::getConstraintParameterParser() ),
319		- $this->config->get( 'WBQualityConstraintsMultiValueConstraintId' )
320		- => new MultiValueChecker( ConstraintsServices::getConstraintParameterParser() ),
321		- $this->config->get( 'WBQualityConstraintsDistinctValuesConstraintId' )
	317	+ $this->config->get('WBQualityConstraintsSingleValueConstraintId')
	318	+ => new SingleValueChecker(ConstraintsServices::getConstraintParameterParser()),
	319	+ $this->config->get('WBQualityConstraintsMultiValueConstraintId')
	320	+ => new MultiValueChecker(ConstraintsServices::getConstraintParameterParser()),
	321	+ $this->config->get('WBQualityConstraintsDistinctValuesConstraintId')
322	322	=> new UniqueValueChecker(
323	323	$sparqlHelper
324	324	),
325		- $this->config->get( 'WBQualityConstraintsFormatConstraintId' )
	325	+ $this->config->get('WBQualityConstraintsFormatConstraintId')
326	326	=> new FormatChecker(
327	327	ConstraintsServices::getConstraintParameterParser(),
328	328	$this->config,
329	329	$sparqlHelper
330	330	),
331		- $this->config->get( 'WBQualityConstraintsCommonsLinkConstraintId' )
	331	+ $this->config->get('WBQualityConstraintsCommonsLinkConstraintId')
332	332	=> new CommonsLinkChecker(
333	333	ConstraintsServices::getConstraintParameterParser(),
334	334	$this->titleParser
335	335	),
336		- $this->config->get( 'WBQualityConstraintsOneOfConstraintId' )
	336	+ $this->config->get('WBQualityConstraintsOneOfConstraintId')
337	337	=> new OneOfChecker(
338	338	ConstraintsServices::getConstraintParameterParser()
339	339	),
340		- $this->config->get( 'WBQualityConstraintsUsedForValuesOnlyConstraintId' )
	340	+ $this->config->get('WBQualityConstraintsUsedForValuesOnlyConstraintId')
341	341	=> new ValueOnlyChecker(),
342		- $this->config->get( 'WBQualityConstraintsUsedAsReferenceConstraintId' )
	342	+ $this->config->get('WBQualityConstraintsUsedAsReferenceConstraintId')
343	343	=> new ReferenceChecker(),
344		- $this->config->get( 'WBQualityConstraintsNoBoundsConstraintId' )
	344	+ $this->config->get('WBQualityConstraintsNoBoundsConstraintId')
345	345	=> new NoBoundsChecker(),
346		- $this->config->get( 'WBQualityConstraintsAllowedUnitsConstraintId' )
	346	+ $this->config->get('WBQualityConstraintsAllowedUnitsConstraintId')
347	347	=> new AllowedUnitsChecker(
348	348	ConstraintsServices::getConstraintParameterParser(),
349	349	$this->unitConverter
350	350	),
351		- $this->config->get( 'WBQualityConstraintsSingleBestValueConstraintId' )
352		- => new SingleBestValueChecker( ConstraintsServices::getConstraintParameterParser() ),
353		- $this->config->get( 'WBQualityConstraintsAllowedEntityTypesConstraintId' )
	351	+ $this->config->get('WBQualityConstraintsSingleBestValueConstraintId')
	352	+ => new SingleBestValueChecker(ConstraintsServices::getConstraintParameterParser()),
	353	+ $this->config->get('WBQualityConstraintsAllowedEntityTypesConstraintId')
354	354	=> new EntityTypeChecker(
355	355	ConstraintsServices::getConstraintParameterParser()
356	356	),
357		- $this->config->get( 'WBQualityConstraintsNoneOfConstraintId' )
	357	+ $this->config->get('WBQualityConstraintsNoneOfConstraintId')
358	358	=> new NoneOfChecker(
359	359	ConstraintsServices::getConstraintParameterParser()
360	360	),
361		- $this->config->get( 'WBQualityConstraintsIntegerConstraintId' )
	361	+ $this->config->get('WBQualityConstraintsIntegerConstraintId')
362	362	=> new IntegerChecker(),
363		- $this->config->get( 'WBQualityConstraintsCitationNeededConstraintId' )
	363	+ $this->config->get('WBQualityConstraintsCitationNeededConstraintId')
364	364	=> new CitationNeededChecker(),
365	365	];
366	366	}
		@@ -372,7 +372,7 @@ discard block
		block discarded – undo
372	372	* @return WikiPageEntityMetaDataAccessor
373	373	*/
374	374	public function getWikiPageEntityMetaDataAccessor() {
375		- if ( $this->wikiPageEntityMetaDataAccessor === null ) {
	375	+ if ($this->wikiPageEntityMetaDataAccessor === null) {
376	376	$this->wikiPageEntityMetaDataAccessor = new WikiPageEntityMetaDataLookup(
377	377	$this->entityNamespaceLookup
378	378	);
		@@ -385,12 +385,12 @@ discard block
		block discarded – undo
385	385	* @return ResultsSource
386	386	*/
387	387	public function getResultsSource() {
388		- if ( $this->resultsSource === null ) {
	388	+ if ($this->resultsSource === null) {
389	389	$this->resultsSource = new CheckingResultsSource(
390	390	$this->getConstraintChecker()
391	391	);
392	392
393		- if ( $this->config->get( 'WBQualityConstraintsCacheCheckConstraintsResults' ) ) {
	393	+ if ($this->config->get('WBQualityConstraintsCacheCheckConstraintsResults')) {
394	394	$this->resultsSource = new CachingResultsSource(
395	395	$this->resultsSource,
396	396	ResultsCache::getDefaultInstance(),
		@@ -398,9 +398,9 @@ discard block
		block discarded – undo
398	398	ConstraintsServices::getCheckResultDeserializer(),
399	399	$this->getWikiPageEntityMetaDataAccessor(),
400	400	$this->entityIdParser,
401		- $this->config->get( 'WBQualityConstraintsCacheCheckConstraintsTTLSeconds' ),
	401	+ $this->config->get('WBQualityConstraintsCacheCheckConstraintsTTLSeconds'),
402	402	$this->getPossiblyStaleConstraintTypes(),
403		- $this->config->get( 'WBQualityConstraintsCacheCheckConstraintsMaximumRevisionIds' ),
	403	+ $this->config->get('WBQualityConstraintsCacheCheckConstraintsMaximumRevisionIds'),
404	404	ConstraintsServices::getLoggingHelper()
405	405	);
406	406	}
		@@ -414,10 +414,10 @@ discard block
		block discarded – undo
414	414	*/
415	415	public function getPossiblyStaleConstraintTypes() {
416	416	return [
417		- $this->config->get( 'WBQualityConstraintsCommonsLinkConstraintId' ),
418		- $this->config->get( 'WBQualityConstraintsTypeConstraintId' ),
419		- $this->config->get( 'WBQualityConstraintsValueTypeConstraintId' ),
420		- $this->config->get( 'WBQualityConstraintsDistinctValuesConstraintId' ),
	417	+ $this->config->get('WBQualityConstraintsCommonsLinkConstraintId'),
	418	+ $this->config->get('WBQualityConstraintsTypeConstraintId'),
	419	+ $this->config->get('WBQualityConstraintsValueTypeConstraintId'),
	420	+ $this->config->get('WBQualityConstraintsDistinctValuesConstraintId'),
421	421	];
422	422	}
423	423

		@@ -24,75 +24,75 @@
		block discarded – undo
24	24	const VIOLATION_MESSAGE_DESERIALIZER = 'WBQC_ViolationMessageDeserializer';
25	25	const CONSTRAINT_PARAMETER_PARSER = 'WBQC_ConstraintParameterParser';
26	26
27		- private static function getService( MediaWikiServices $services = null, $name ) {
28		- if ( $services === null ) {
	27	+ private static function getService(MediaWikiServices $services = null, $name) {
	28	+ if ($services === null) {
29	29	$services = MediaWikiServices::getInstance();
30	30	}
31		- return $services->getService( $name );
	31	+ return $services->getService($name);
32	32	}
33	33
34	34	/**
35	35	* @param MediaWikiServices\|null $services
36	36	* @return LoggingHelper
37	37	*/
38		- public static function getLoggingHelper( MediaWikiServices $services = null ) {
39		- return self::getService( $services, self::LOGGING_HELPER );
	38	+ public static function getLoggingHelper(MediaWikiServices $services = null) {
	39	+ return self::getService($services, self::LOGGING_HELPER);
40	40	}
41	41
42	42	/**
43	43	* @param MediaWikiServices\|null $services
44	44	* @return ConstraintRepository
45	45	*/
46		- public static function getConstraintRepository( MediaWikiServices $services = null ) {
47		- return self::getService( $services, self::CONSTRAINT_REPOSITORY );
	46	+ public static function getConstraintRepository(MediaWikiServices $services = null) {
	47	+ return self::getService($services, self::CONSTRAINT_REPOSITORY);
48	48	}
49	49
50	50	/**
51	51	* @param MediaWikiServices\|null $services
52	52	* @return ConstraintLookup
53	53	*/
54		- public static function getConstraintLookup( MediaWikiServices $services = null ) {
55		- return self::getService( $services, self::CONSTRAINT_LOOKUP );
	54	+ public static function getConstraintLookup(MediaWikiServices $services = null) {
	55	+ return self::getService($services, self::CONSTRAINT_LOOKUP);
56	56	}
57	57
58	58	/**
59	59	* @param MediaWikiServices\|null $services
60	60	* @return CheckResultSerializer
61	61	*/
62		- public static function getCheckResultSerializer( MediaWikiServices $services = null ) {
63		- return self::getService( $services, self::CHECK_RESULT_SERIALIZER );
	62	+ public static function getCheckResultSerializer(MediaWikiServices $services = null) {
	63	+ return self::getService($services, self::CHECK_RESULT_SERIALIZER);
64	64	}
65	65
66	66	/**
67	67	* @param MediaWikiServices\|null $services
68	68	* @return CheckResultDeserializer
69	69	*/
70		- public static function getCheckResultDeserializer( MediaWikiServices $services = null ) {
71		- return self::getService( $services, self::CHECK_RESULT_DESERIALIZER );
	70	+ public static function getCheckResultDeserializer(MediaWikiServices $services = null) {
	71	+ return self::getService($services, self::CHECK_RESULT_DESERIALIZER);
72	72	}
73	73
74	74	/**
75	75	* @param MediaWikiServices\|null $services
76	76	* @return ViolationMessageSerializer
77	77	*/
78		- public static function getViolationMessageSerializer( MediaWikiServices $services = null ) {
79		- return self::getService( $services, self::VIOLATION_MESSAGE_SERIALIZER );
	78	+ public static function getViolationMessageSerializer(MediaWikiServices $services = null) {
	79	+ return self::getService($services, self::VIOLATION_MESSAGE_SERIALIZER);
80	80	}
81	81
82	82	/**
83	83	* @param MediaWikiServices\|null $services
84	84	* @return ViolationMessageDeserializer
85	85	*/
86		- public static function getViolationMessageDeserializer( MediaWikiServices $services = null ) {
87		- return self::getService( $services, self::VIOLATION_MESSAGE_DESERIALIZER );
	86	+ public static function getViolationMessageDeserializer(MediaWikiServices $services = null) {
	87	+ return self::getService($services, self::VIOLATION_MESSAGE_DESERIALIZER);
88	88	}
89	89
90	90	/**
91	91	* @param MediaWikiServices\|null $services
92	92	* @return ConstraintParameterParser
93	93	*/
94		- public static function getConstraintParameterParser( MediaWikiServices $services = null ) {
95		- return self::getService( $services, self::CONSTRAINT_PARAMETER_PARSER );
	94	+ public static function getConstraintParameterParser(MediaWikiServices $services = null) {
	95	+ return self::getService($services, self::CONSTRAINT_PARAMETER_PARSER);
96	96	}
97	97
98	98	}

wikimedia / mediawiki-extensions-WikibaseQualityConstraints

Push — master ( bc3b91...c84824 )

Status

Category

Spacing +11 added lines, -11 removed lines patch added patch discarded remove patch

Spacing +47 added lines, -47 removed lines patch added patch discarded remove patch

Spacing +19 added lines, -19 removed lines patch added patch discarded remove patch