Inspection of "Merge "Use new Wikibase service instead of recreat..." - wikimedia/mediawiki-extensions-WikibaseQualityConstraints - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Push — master ( 4e90ea...01de2a )

unknown

created 2018-11-14 21:58 UTC

Status

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

@@ -27,28 +27,28 @@  discard block
 block discarded – undo
 use WikibaseQuality\ConstraintReport\ConstraintCheck\Result\CheckResultSerializer;
 
 return [
-	ConstraintsServices::EXPIRY_LOCK => function( MediaWikiServices $services ) {
-		return new ExpiryLock( ObjectCache::getInstance( CACHE_ANYTHING ) );
+	ConstraintsServices::EXPIRY_LOCK => function(MediaWikiServices $services) {
+		return new ExpiryLock(ObjectCache::getInstance(CACHE_ANYTHING));
 	},
 
-	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
@@ -59,7 +59,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();
@@ -76,11 +76,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();
@@ -92,7 +92,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();
@@ -105,11 +105,11 @@  discard block
 block discarded – undo
 		);
 	},
 
-	ConstraintsServices::CONNECTION_CHECKER_HELPER => function( MediaWikiServices $services ) {
+	ConstraintsServices::CONNECTION_CHECKER_HELPER => function(MediaWikiServices $services) {
 		return new ConnectionCheckerHelper();
 	},
 
-	ConstraintsServices::RANGE_CHECKER_HELPER => function( MediaWikiServices $services ) {
+	ConstraintsServices::RANGE_CHECKER_HELPER => function(MediaWikiServices $services) {
 		// TODO in the future, get UnitConverter from $services?
 		$repo = WikibaseRepo::getDefaultInstance();
 		$unitConverter = $repo->getUnitConverter();
@@ -120,9 +120,9 @@  discard block
 block discarded – undo
 		);
 	},
 
-	ConstraintsServices::SPARQL_HELPER => function( MediaWikiServices $services ) {
-		$endpoint = $services->getMainConfig()->get( 'WBQualityConstraintsSparqlEndpoint' );
-		if ( $endpoint === '' ) {
+	ConstraintsServices::SPARQL_HELPER => function(MediaWikiServices $services) {
+		$endpoint = $services->getMainConfig()->get('WBQualityConstraintsSparqlEndpoint');
+		if ($endpoint === '') {
 			return new DummySparqlHelper();
 		}
 
@@ -138,117 +138,117 @@  discard block
 block discarded – undo
 			$entityIdParser,
 			$propertyDataTypeLookup,
 			$services->getMainWANObjectCache(),
-			ConstraintsServices::getViolationMessageSerializer( $services ),
-			ConstraintsServices::getViolationMessageDeserializer( $services ),
+			ConstraintsServices::getViolationMessageSerializer($services),
+			ConstraintsServices::getViolationMessageDeserializer($services),
 			$services->getStatsdDataFactory(),
-			ConstraintsServices::getExpiryLock( $services ),
+			ConstraintsServices::getExpiryLock($services),
 			ConstraintsServices::getLoggingHelper(),
-			wfWikiID() . ' WikibaseQualityConstraints ' . Http::userAgent(),
+			wfWikiID().' WikibaseQualityConstraints '.Http::userAgent(),
 			$services->getHttpRequestFactory()
 		);
 	},
 
-	ConstraintsServices::TYPE_CHECKER_HELPER => function( MediaWikiServices $services ) {
+	ConstraintsServices::TYPE_CHECKER_HELPER => function(MediaWikiServices $services) {
 		return new TypeCheckerHelper(
-			WikibaseServices::getEntityLookup( $services ),
+			WikibaseServices::getEntityLookup($services),
 			$services->getMainConfig(),
-			ConstraintsServices::getSparqlHelper( $services ),
+			ConstraintsServices::getSparqlHelper($services),
 			$services->getStatsdDataFactory()
 		);
 	},
 
-	ConstraintsServices::DELEGATING_CONSTRAINT_CHECKER => function( MediaWikiServices $services ) {
+	ConstraintsServices::DELEGATING_CONSTRAINT_CHECKER => function(MediaWikiServices $services) {
 		// TODO in the future, get StatementGuidParser from $services?
 		$repo = WikibaseRepo::getDefaultInstance();
 		$statementGuidParser = $repo->getStatementGuidParser();
 
 		$config = $services->getMainConfig();
 		$checkerMap = [
-			$config->get( 'WBQualityConstraintsConflictsWithConstraintId' )
-				=> ConstraintCheckerServices::getConflictsWithChecker( $services ),
-			$config->get( 'WBQualityConstraintsItemRequiresClaimConstraintId' )
-				=> ConstraintCheckerServices::getItemChecker( $services ),
-			$config->get( 'WBQualityConstraintsValueRequiresClaimConstraintId' )
-				=> ConstraintCheckerServices::getTargetRequiredClaimChecker( $services ),
-			$config->get( 'WBQualityConstraintsSymmetricConstraintId' )
-				=> ConstraintCheckerServices::getSymmetricChecker( $services ),
-			$config->get( 'WBQualityConstraintsInverseConstraintId' )
-				=> ConstraintCheckerServices::getInverseChecker( $services ),
-			$config->get( 'WBQualityConstraintsUsedAsQualifierConstraintId' )
-				=> ConstraintCheckerServices::getQualifierChecker( $services ),
-			$config->get( 'WBQualityConstraintsAllowedQualifiersConstraintId' )
-				=> ConstraintCheckerServices::getQualifiersChecker( $services ),
-			$config->get( 'WBQualityConstraintsMandatoryQualifierConstraintId' )
-				=> ConstraintCheckerServices::getMandatoryQualifiersChecker( $services ),
-			$config->get( 'WBQualityConstraintsRangeConstraintId' )
-				=> ConstraintCheckerServices::getRangeChecker( $services ),
-			$config->get( 'WBQualityConstraintsDifferenceWithinRangeConstraintId' )
-				=> ConstraintCheckerServices::getDiffWithinRangeChecker( $services ),
-			$config->get( 'WBQualityConstraintsTypeConstraintId' )
-				=> ConstraintCheckerServices::getTypeChecker( $services ),
-			$config->get( 'WBQualityConstraintsValueTypeConstraintId' )
-				=> ConstraintCheckerServices::getValueTypeChecker( $services ),
-			$config->get( 'WBQualityConstraintsSingleValueConstraintId' )
-				=> ConstraintCheckerServices::getSingleValueChecker( $services ),
-			$config->get( 'WBQualityConstraintsMultiValueConstraintId' )
-				=> ConstraintCheckerServices::getMultiValueChecker( $services ),
-			$config->get( 'WBQualityConstraintsDistinctValuesConstraintId' )
-				=> ConstraintCheckerServices::getUniqueValueChecker( $services ),
-			$config->get( 'WBQualityConstraintsFormatConstraintId' )
-				=> ConstraintCheckerServices::getFormatChecker( $services ),
-			$config->get( 'WBQualityConstraintsCommonsLinkConstraintId' )
-				=> ConstraintCheckerServices::getCommonsLinkChecker( $services ),
-			$config->get( 'WBQualityConstraintsOneOfConstraintId' )
-				=> ConstraintCheckerServices::getOneOfChecker( $services ),
-			$config->get( 'WBQualityConstraintsUsedForValuesOnlyConstraintId' )
-				=> ConstraintCheckerServices::getValueOnlyChecker( $services ),
-			$config->get( 'WBQualityConstraintsUsedAsReferenceConstraintId' )
-				=> ConstraintCheckerServices::getReferenceChecker( $services ),
-			$config->get( 'WBQualityConstraintsNoBoundsConstraintId' )
-				=> ConstraintCheckerServices::getNoBoundsChecker( $services ),
-			$config->get( 'WBQualityConstraintsAllowedUnitsConstraintId' )
-				=> ConstraintCheckerServices::getAllowedUnitsChecker( $services ),
-			$config->get( 'WBQualityConstraintsSingleBestValueConstraintId' )
-				=> ConstraintCheckerServices::getSingleBestValueChecker( $services ),
-			$config->get( 'WBQualityConstraintsAllowedEntityTypesConstraintId' )
-				=> ConstraintCheckerServices::getEntityTypeChecker( $services ),
-			$config->get( 'WBQualityConstraintsNoneOfConstraintId' )
-				=> ConstraintCheckerServices::getNoneOfChecker( $services ),
-			$config->get( 'WBQualityConstraintsIntegerConstraintId' )
-				=> ConstraintCheckerServices::getIntegerChecker( $services ),
-			$config->get( 'WBQualityConstraintsCitationNeededConstraintId' )
-				=> ConstraintCheckerServices::getCitationNeededChecker( $services ),
-			$config->get( 'WBQualityConstraintsPropertyScopeConstraintId' )
-				=> ConstraintCheckerServices::getPropertyScopeChecker( $services ),
-			$config->get( 'WBQualityConstraintsContemporaryConstraintId' )
-				=> ConstraintCheckerServices::getContemporaryChecker( $services ),
+			$config->get('WBQualityConstraintsConflictsWithConstraintId')
+				=> ConstraintCheckerServices::getConflictsWithChecker($services),
+			$config->get('WBQualityConstraintsItemRequiresClaimConstraintId')
+				=> ConstraintCheckerServices::getItemChecker($services),
+			$config->get('WBQualityConstraintsValueRequiresClaimConstraintId')
+				=> ConstraintCheckerServices::getTargetRequiredClaimChecker($services),
+			$config->get('WBQualityConstraintsSymmetricConstraintId')
+				=> ConstraintCheckerServices::getSymmetricChecker($services),
+			$config->get('WBQualityConstraintsInverseConstraintId')
+				=> ConstraintCheckerServices::getInverseChecker($services),
+			$config->get('WBQualityConstraintsUsedAsQualifierConstraintId')
+				=> ConstraintCheckerServices::getQualifierChecker($services),
+			$config->get('WBQualityConstraintsAllowedQualifiersConstraintId')
+				=> ConstraintCheckerServices::getQualifiersChecker($services),
+			$config->get('WBQualityConstraintsMandatoryQualifierConstraintId')
+				=> ConstraintCheckerServices::getMandatoryQualifiersChecker($services),
+			$config->get('WBQualityConstraintsRangeConstraintId')
+				=> ConstraintCheckerServices::getRangeChecker($services),
+			$config->get('WBQualityConstraintsDifferenceWithinRangeConstraintId')
+				=> ConstraintCheckerServices::getDiffWithinRangeChecker($services),
+			$config->get('WBQualityConstraintsTypeConstraintId')
+				=> ConstraintCheckerServices::getTypeChecker($services),
+			$config->get('WBQualityConstraintsValueTypeConstraintId')
+				=> ConstraintCheckerServices::getValueTypeChecker($services),
+			$config->get('WBQualityConstraintsSingleValueConstraintId')
+				=> ConstraintCheckerServices::getSingleValueChecker($services),
+			$config->get('WBQualityConstraintsMultiValueConstraintId')
+				=> ConstraintCheckerServices::getMultiValueChecker($services),
+			$config->get('WBQualityConstraintsDistinctValuesConstraintId')
+				=> ConstraintCheckerServices::getUniqueValueChecker($services),
+			$config->get('WBQualityConstraintsFormatConstraintId')
+				=> ConstraintCheckerServices::getFormatChecker($services),
+			$config->get('WBQualityConstraintsCommonsLinkConstraintId')
+				=> ConstraintCheckerServices::getCommonsLinkChecker($services),
+			$config->get('WBQualityConstraintsOneOfConstraintId')
+				=> ConstraintCheckerServices::getOneOfChecker($services),
+			$config->get('WBQualityConstraintsUsedForValuesOnlyConstraintId')
+				=> ConstraintCheckerServices::getValueOnlyChecker($services),
+			$config->get('WBQualityConstraintsUsedAsReferenceConstraintId')
+				=> ConstraintCheckerServices::getReferenceChecker($services),
+			$config->get('WBQualityConstraintsNoBoundsConstraintId')
+				=> ConstraintCheckerServices::getNoBoundsChecker($services),
+			$config->get('WBQualityConstraintsAllowedUnitsConstraintId')
+				=> ConstraintCheckerServices::getAllowedUnitsChecker($services),
+			$config->get('WBQualityConstraintsSingleBestValueConstraintId')
+				=> ConstraintCheckerServices::getSingleBestValueChecker($services),
+			$config->get('WBQualityConstraintsAllowedEntityTypesConstraintId')
+				=> ConstraintCheckerServices::getEntityTypeChecker($services),
+			$config->get('WBQualityConstraintsNoneOfConstraintId')
+				=> ConstraintCheckerServices::getNoneOfChecker($services),
+			$config->get('WBQualityConstraintsIntegerConstraintId')
+				=> ConstraintCheckerServices::getIntegerChecker($services),
+			$config->get('WBQualityConstraintsCitationNeededConstraintId')
+				=> ConstraintCheckerServices::getCitationNeededChecker($services),
+			$config->get('WBQualityConstraintsPropertyScopeConstraintId')
+				=> ConstraintCheckerServices::getPropertyScopeChecker($services),
+			$config->get('WBQualityConstraintsContemporaryConstraintId')
+				=> ConstraintCheckerServices::getContemporaryChecker($services),
 		];
 
 		return new DelegatingConstraintChecker(
-			WikibaseServices::getEntityLookup( $services ),
+			WikibaseServices::getEntityLookup($services),
 			$checkerMap,
-			ConstraintsServices::getConstraintLookup( $services ),
-			ConstraintsServices::getConstraintParameterParser( $services ),
+			ConstraintsServices::getConstraintLookup($services),
+			ConstraintsServices::getConstraintParameterParser($services),
 			$statementGuidParser,
-			ConstraintsServices::getLoggingHelper( $services ),
-			$config->get( 'WBQualityConstraintsCheckQualifiers' ),
-			$config->get( 'WBQualityConstraintsCheckReferences' ),
-			$config->get( 'WBQualityConstraintsPropertiesWithViolatingQualifiers' )
+			ConstraintsServices::getLoggingHelper($services),
+			$config->get('WBQualityConstraintsCheckQualifiers'),
+			$config->get('WBQualityConstraintsCheckReferences'),
+			$config->get('WBQualityConstraintsPropertiesWithViolatingQualifiers')
 		);
 	},
 
-	ConstraintsServices::RESULTS_SOURCE => function( MediaWikiServices $services ) {
+	ConstraintsServices::RESULTS_SOURCE => function(MediaWikiServices $services) {
 		$config = $services->getMainConfig();
 		$resultsSource = new CheckingResultsSource(
-			ConstraintsServices::getDelegatingConstraintChecker( $services )
+			ConstraintsServices::getDelegatingConstraintChecker($services)
 		);
 
-		if ( $config->get( 'WBQualityConstraintsCacheCheckConstraintsResults' ) ) {
+		if ($config->get('WBQualityConstraintsCacheCheckConstraintsResults')) {
 			$possiblyStaleConstraintTypes = [
-				$config->get( 'WBQualityConstraintsCommonsLinkConstraintId' ),
-				$config->get( 'WBQualityConstraintsTypeConstraintId' ),
-				$config->get( 'WBQualityConstraintsValueTypeConstraintId' ),
-				$config->get( 'WBQualityConstraintsDistinctValuesConstraintId' ),
+				$config->get('WBQualityConstraintsCommonsLinkConstraintId'),
+				$config->get('WBQualityConstraintsTypeConstraintId'),
+				$config->get('WBQualityConstraintsValueTypeConstraintId'),
+				$config->get('WBQualityConstraintsDistinctValuesConstraintId'),
 			];
 			// TODO in the future, get EntityIdParser and WikiPageEntityMetaDataAccessor from $services?
 			$repo = WikibaseRepo::getDefaultInstance();
@@ -258,14 +258,14 @@  discard block
 block discarded – undo
 			$resultsSource = new CachingResultsSource(
 				$resultsSource,
 				ResultsCache::getDefaultInstance(),
-				ConstraintsServices::getCheckResultSerializer( $services ),
-				ConstraintsServices::getCheckResultDeserializer( $services ),
+				ConstraintsServices::getCheckResultSerializer($services),
+				ConstraintsServices::getCheckResultDeserializer($services),
 				$wikiPageEntityMetaDataAccessor,
 				$entityIdParser,
-				$config->get( 'WBQualityConstraintsCacheCheckConstraintsTTLSeconds' ),
+				$config->get('WBQualityConstraintsCacheCheckConstraintsTTLSeconds'),
 				$possiblyStaleConstraintTypes,
-				$config->get( 'WBQualityConstraintsCacheCheckConstraintsMaximumRevisionIds' ),
-				ConstraintsServices::getLoggingHelper( $services )
+				$config->get('WBQualityConstraintsCacheCheckConstraintsMaximumRevisionIds'),
+				ConstraintsServices::getLoggingHelper($services)
 			);
 		}
 

Please login to merge, or discard this patch.

		@@ -27,28 +27,28 @@ discard block
		block discarded – undo
27	27	use WikibaseQuality\ConstraintReport\ConstraintCheck\Result\CheckResultSerializer;
28	28
29	29	return [
30		- ConstraintsServices::EXPIRY_LOCK => function( MediaWikiServices $services ) {
31		- return new ExpiryLock( ObjectCache::getInstance( CACHE_ANYTHING ) );
	30	+ ConstraintsServices::EXPIRY_LOCK => function(MediaWikiServices $services) {
	31	+ return new ExpiryLock(ObjectCache::getInstance(CACHE_ANYTHING));
32	32	},
33	33
34		- ConstraintsServices::LOGGING_HELPER => function( MediaWikiServices $services ) {
	34	+ ConstraintsServices::LOGGING_HELPER => function(MediaWikiServices $services) {
35	35	return new LoggingHelper(
36	36	$services->getStatsdDataFactory(),
37		- LoggerFactory::getInstance( 'WikibaseQualityConstraints' ),
	37	+ LoggerFactory::getInstance('WikibaseQualityConstraints'),
38	38	$services->getMainConfig()
39	39	);
40	40	},
41	41
42		- ConstraintsServices::CONSTRAINT_REPOSITORY => function( MediaWikiServices $services ) {
	42	+ ConstraintsServices::CONSTRAINT_REPOSITORY => function(MediaWikiServices $services) {
43	43	return new ConstraintRepository();
44	44	},
45	45
46		- ConstraintsServices::CONSTRAINT_LOOKUP => function( MediaWikiServices $services ) {
47		- $constraintRepository = ConstraintsServices::getConstraintRepository( $services );
48		- return new CachingConstraintLookup( $constraintRepository );
	46	+ ConstraintsServices::CONSTRAINT_LOOKUP => function(MediaWikiServices $services) {
	47	+ $constraintRepository = ConstraintsServices::getConstraintRepository($services);
	48	+ return new CachingConstraintLookup($constraintRepository);
49	49	},
50	50
51		- ConstraintsServices::CHECK_RESULT_SERIALIZER => function( MediaWikiServices $services ) {
	51	+ ConstraintsServices::CHECK_RESULT_SERIALIZER => function(MediaWikiServices $services) {
52	52	return new CheckResultSerializer(
53	53	new ConstraintSerializer(
54	54	false // constraint parameters are not exposed
		@@ -59,7 +59,7 @@ discard block
		block discarded – undo
59	59	);
60	60	},
61	61
62		- ConstraintsServices::CHECK_RESULT_DESERIALIZER => function( MediaWikiServices $services ) {
	62	+ ConstraintsServices::CHECK_RESULT_DESERIALIZER => function(MediaWikiServices $services) {
63	63	// TODO in the future, get EntityIdParser and DataValueFactory from $services?
64	64	$repo = WikibaseRepo::getDefaultInstance();
65	65	$entityIdParser = $repo->getEntityIdParser();
		@@ -76,11 +76,11 @@ discard block
		block discarded – undo
76	76	);
77	77	},
78	78
79		- ConstraintsServices::VIOLATION_MESSAGE_SERIALIZER => function( MediaWikiServices $services ) {
	79	+ ConstraintsServices::VIOLATION_MESSAGE_SERIALIZER => function(MediaWikiServices $services) {
80	80	return new ViolationMessageSerializer();
81	81	},
82	82
83		- ConstraintsServices::VIOLATION_MESSAGE_DESERIALIZER => function( MediaWikiServices $services ) {
	83	+ ConstraintsServices::VIOLATION_MESSAGE_DESERIALIZER => function(MediaWikiServices $services) {
84	84	// TODO in the future, get EntityIdParser and DataValueFactory from $services?
85	85	$repo = WikibaseRepo::getDefaultInstance();
86	86	$entityIdParser = $repo->getEntityIdParser();
		@@ -92,7 +92,7 @@ discard block
		block discarded – undo
92	92	);
93	93	},
94	94
95		- ConstraintsServices::CONSTRAINT_PARAMETER_PARSER => function( MediaWikiServices $services ) {
	95	+ ConstraintsServices::CONSTRAINT_PARAMETER_PARSER => function(MediaWikiServices $services) {
96	96	// TODO in the future, get DeserializerFactory and concept base URIs from $services?
97	97	$repo = WikibaseRepo::getDefaultInstance();
98	98	$deserializerFactory = $repo->getBaseDataModelDeserializerFactory();
		@@ -105,11 +105,11 @@ discard block
		block discarded – undo
105	105	);
106	106	},
107	107
108		- ConstraintsServices::CONNECTION_CHECKER_HELPER => function( MediaWikiServices $services ) {
	108	+ ConstraintsServices::CONNECTION_CHECKER_HELPER => function(MediaWikiServices $services) {
109	109	return new ConnectionCheckerHelper();
110	110	},
111	111
112		- ConstraintsServices::RANGE_CHECKER_HELPER => function( MediaWikiServices $services ) {
	112	+ ConstraintsServices::RANGE_CHECKER_HELPER => function(MediaWikiServices $services) {
113	113	// TODO in the future, get UnitConverter from $services?
114	114	$repo = WikibaseRepo::getDefaultInstance();
115	115	$unitConverter = $repo->getUnitConverter();
		@@ -120,9 +120,9 @@ discard block
		block discarded – undo
120	120	);
121	121	},
122	122
123		- ConstraintsServices::SPARQL_HELPER => function( MediaWikiServices $services ) {
124		- $endpoint = $services->getMainConfig()->get( 'WBQualityConstraintsSparqlEndpoint' );
125		- if ( $endpoint === '' ) {
	123	+ ConstraintsServices::SPARQL_HELPER => function(MediaWikiServices $services) {
	124	+ $endpoint = $services->getMainConfig()->get('WBQualityConstraintsSparqlEndpoint');
	125	+ if ($endpoint === '') {
126	126	return new DummySparqlHelper();
127	127	}
128	128
		@@ -138,117 +138,117 @@ discard block
		block discarded – undo
138	138	$entityIdParser,
139	139	$propertyDataTypeLookup,
140	140	$services->getMainWANObjectCache(),
141		- ConstraintsServices::getViolationMessageSerializer( $services ),
142		- ConstraintsServices::getViolationMessageDeserializer( $services ),
	141	+ ConstraintsServices::getViolationMessageSerializer($services),
	142	+ ConstraintsServices::getViolationMessageDeserializer($services),
143	143	$services->getStatsdDataFactory(),
144		- ConstraintsServices::getExpiryLock( $services ),
	144	+ ConstraintsServices::getExpiryLock($services),
145	145	ConstraintsServices::getLoggingHelper(),
146		- wfWikiID() . ' WikibaseQualityConstraints ' . Http::userAgent(),
	146	+ wfWikiID().' WikibaseQualityConstraints '.Http::userAgent(),
147	147	$services->getHttpRequestFactory()
148	148	);
149	149	},
150	150
151		- ConstraintsServices::TYPE_CHECKER_HELPER => function( MediaWikiServices $services ) {
	151	+ ConstraintsServices::TYPE_CHECKER_HELPER => function(MediaWikiServices $services) {
152	152	return new TypeCheckerHelper(
153		- WikibaseServices::getEntityLookup( $services ),
	153	+ WikibaseServices::getEntityLookup($services),
154	154	$services->getMainConfig(),
155		- ConstraintsServices::getSparqlHelper( $services ),
	155	+ ConstraintsServices::getSparqlHelper($services),
156	156	$services->getStatsdDataFactory()
157	157	);
158	158	},
159	159
160		- ConstraintsServices::DELEGATING_CONSTRAINT_CHECKER => function( MediaWikiServices $services ) {
	160	+ ConstraintsServices::DELEGATING_CONSTRAINT_CHECKER => function(MediaWikiServices $services) {
161	161	// TODO in the future, get StatementGuidParser from $services?
162	162	$repo = WikibaseRepo::getDefaultInstance();
163	163	$statementGuidParser = $repo->getStatementGuidParser();
164	164
165	165	$config = $services->getMainConfig();
166	166	$checkerMap = [
167		- $config->get( 'WBQualityConstraintsConflictsWithConstraintId' )
168		- => ConstraintCheckerServices::getConflictsWithChecker( $services ),
169		- $config->get( 'WBQualityConstraintsItemRequiresClaimConstraintId' )
170		- => ConstraintCheckerServices::getItemChecker( $services ),
171		- $config->get( 'WBQualityConstraintsValueRequiresClaimConstraintId' )
172		- => ConstraintCheckerServices::getTargetRequiredClaimChecker( $services ),
173		- $config->get( 'WBQualityConstraintsSymmetricConstraintId' )
174		- => ConstraintCheckerServices::getSymmetricChecker( $services ),
175		- $config->get( 'WBQualityConstraintsInverseConstraintId' )
176		- => ConstraintCheckerServices::getInverseChecker( $services ),
177		- $config->get( 'WBQualityConstraintsUsedAsQualifierConstraintId' )
178		- => ConstraintCheckerServices::getQualifierChecker( $services ),
179		- $config->get( 'WBQualityConstraintsAllowedQualifiersConstraintId' )
180		- => ConstraintCheckerServices::getQualifiersChecker( $services ),
181		- $config->get( 'WBQualityConstraintsMandatoryQualifierConstraintId' )
182		- => ConstraintCheckerServices::getMandatoryQualifiersChecker( $services ),
183		- $config->get( 'WBQualityConstraintsRangeConstraintId' )
184		- => ConstraintCheckerServices::getRangeChecker( $services ),
185		- $config->get( 'WBQualityConstraintsDifferenceWithinRangeConstraintId' )
186		- => ConstraintCheckerServices::getDiffWithinRangeChecker( $services ),
187		- $config->get( 'WBQualityConstraintsTypeConstraintId' )
188		- => ConstraintCheckerServices::getTypeChecker( $services ),
189		- $config->get( 'WBQualityConstraintsValueTypeConstraintId' )
190		- => ConstraintCheckerServices::getValueTypeChecker( $services ),
191		- $config->get( 'WBQualityConstraintsSingleValueConstraintId' )
192		- => ConstraintCheckerServices::getSingleValueChecker( $services ),
193		- $config->get( 'WBQualityConstraintsMultiValueConstraintId' )
194		- => ConstraintCheckerServices::getMultiValueChecker( $services ),
195		- $config->get( 'WBQualityConstraintsDistinctValuesConstraintId' )
196		- => ConstraintCheckerServices::getUniqueValueChecker( $services ),
197		- $config->get( 'WBQualityConstraintsFormatConstraintId' )
198		- => ConstraintCheckerServices::getFormatChecker( $services ),
199		- $config->get( 'WBQualityConstraintsCommonsLinkConstraintId' )
200		- => ConstraintCheckerServices::getCommonsLinkChecker( $services ),
201		- $config->get( 'WBQualityConstraintsOneOfConstraintId' )
202		- => ConstraintCheckerServices::getOneOfChecker( $services ),
203		- $config->get( 'WBQualityConstraintsUsedForValuesOnlyConstraintId' )
204		- => ConstraintCheckerServices::getValueOnlyChecker( $services ),
205		- $config->get( 'WBQualityConstraintsUsedAsReferenceConstraintId' )
206		- => ConstraintCheckerServices::getReferenceChecker( $services ),
207		- $config->get( 'WBQualityConstraintsNoBoundsConstraintId' )
208		- => ConstraintCheckerServices::getNoBoundsChecker( $services ),
209		- $config->get( 'WBQualityConstraintsAllowedUnitsConstraintId' )
210		- => ConstraintCheckerServices::getAllowedUnitsChecker( $services ),
211		- $config->get( 'WBQualityConstraintsSingleBestValueConstraintId' )
212		- => ConstraintCheckerServices::getSingleBestValueChecker( $services ),
213		- $config->get( 'WBQualityConstraintsAllowedEntityTypesConstraintId' )
214		- => ConstraintCheckerServices::getEntityTypeChecker( $services ),
215		- $config->get( 'WBQualityConstraintsNoneOfConstraintId' )
216		- => ConstraintCheckerServices::getNoneOfChecker( $services ),
217		- $config->get( 'WBQualityConstraintsIntegerConstraintId' )
218		- => ConstraintCheckerServices::getIntegerChecker( $services ),
219		- $config->get( 'WBQualityConstraintsCitationNeededConstraintId' )
220		- => ConstraintCheckerServices::getCitationNeededChecker( $services ),
221		- $config->get( 'WBQualityConstraintsPropertyScopeConstraintId' )
222		- => ConstraintCheckerServices::getPropertyScopeChecker( $services ),
223		- $config->get( 'WBQualityConstraintsContemporaryConstraintId' )
224		- => ConstraintCheckerServices::getContemporaryChecker( $services ),
	167	+ $config->get('WBQualityConstraintsConflictsWithConstraintId')
	168	+ => ConstraintCheckerServices::getConflictsWithChecker($services),
	169	+ $config->get('WBQualityConstraintsItemRequiresClaimConstraintId')
	170	+ => ConstraintCheckerServices::getItemChecker($services),
	171	+ $config->get('WBQualityConstraintsValueRequiresClaimConstraintId')
	172	+ => ConstraintCheckerServices::getTargetRequiredClaimChecker($services),
	173	+ $config->get('WBQualityConstraintsSymmetricConstraintId')
	174	+ => ConstraintCheckerServices::getSymmetricChecker($services),
	175	+ $config->get('WBQualityConstraintsInverseConstraintId')
	176	+ => ConstraintCheckerServices::getInverseChecker($services),
	177	+ $config->get('WBQualityConstraintsUsedAsQualifierConstraintId')
	178	+ => ConstraintCheckerServices::getQualifierChecker($services),
	179	+ $config->get('WBQualityConstraintsAllowedQualifiersConstraintId')
	180	+ => ConstraintCheckerServices::getQualifiersChecker($services),
	181	+ $config->get('WBQualityConstraintsMandatoryQualifierConstraintId')
	182	+ => ConstraintCheckerServices::getMandatoryQualifiersChecker($services),
	183	+ $config->get('WBQualityConstraintsRangeConstraintId')
	184	+ => ConstraintCheckerServices::getRangeChecker($services),
	185	+ $config->get('WBQualityConstraintsDifferenceWithinRangeConstraintId')
	186	+ => ConstraintCheckerServices::getDiffWithinRangeChecker($services),
	187	+ $config->get('WBQualityConstraintsTypeConstraintId')
	188	+ => ConstraintCheckerServices::getTypeChecker($services),
	189	+ $config->get('WBQualityConstraintsValueTypeConstraintId')
	190	+ => ConstraintCheckerServices::getValueTypeChecker($services),
	191	+ $config->get('WBQualityConstraintsSingleValueConstraintId')
	192	+ => ConstraintCheckerServices::getSingleValueChecker($services),
	193	+ $config->get('WBQualityConstraintsMultiValueConstraintId')
	194	+ => ConstraintCheckerServices::getMultiValueChecker($services),
	195	+ $config->get('WBQualityConstraintsDistinctValuesConstraintId')
	196	+ => ConstraintCheckerServices::getUniqueValueChecker($services),
	197	+ $config->get('WBQualityConstraintsFormatConstraintId')
	198	+ => ConstraintCheckerServices::getFormatChecker($services),
	199	+ $config->get('WBQualityConstraintsCommonsLinkConstraintId')
	200	+ => ConstraintCheckerServices::getCommonsLinkChecker($services),
	201	+ $config->get('WBQualityConstraintsOneOfConstraintId')
	202	+ => ConstraintCheckerServices::getOneOfChecker($services),
	203	+ $config->get('WBQualityConstraintsUsedForValuesOnlyConstraintId')
	204	+ => ConstraintCheckerServices::getValueOnlyChecker($services),
	205	+ $config->get('WBQualityConstraintsUsedAsReferenceConstraintId')
	206	+ => ConstraintCheckerServices::getReferenceChecker($services),
	207	+ $config->get('WBQualityConstraintsNoBoundsConstraintId')
	208	+ => ConstraintCheckerServices::getNoBoundsChecker($services),
	209	+ $config->get('WBQualityConstraintsAllowedUnitsConstraintId')
	210	+ => ConstraintCheckerServices::getAllowedUnitsChecker($services),
	211	+ $config->get('WBQualityConstraintsSingleBestValueConstraintId')
	212	+ => ConstraintCheckerServices::getSingleBestValueChecker($services),
	213	+ $config->get('WBQualityConstraintsAllowedEntityTypesConstraintId')
	214	+ => ConstraintCheckerServices::getEntityTypeChecker($services),
	215	+ $config->get('WBQualityConstraintsNoneOfConstraintId')
	216	+ => ConstraintCheckerServices::getNoneOfChecker($services),
	217	+ $config->get('WBQualityConstraintsIntegerConstraintId')
	218	+ => ConstraintCheckerServices::getIntegerChecker($services),
	219	+ $config->get('WBQualityConstraintsCitationNeededConstraintId')
	220	+ => ConstraintCheckerServices::getCitationNeededChecker($services),
	221	+ $config->get('WBQualityConstraintsPropertyScopeConstraintId')
	222	+ => ConstraintCheckerServices::getPropertyScopeChecker($services),
	223	+ $config->get('WBQualityConstraintsContemporaryConstraintId')
	224	+ => ConstraintCheckerServices::getContemporaryChecker($services),
225	225	];
226	226
227	227	return new DelegatingConstraintChecker(
228		- WikibaseServices::getEntityLookup( $services ),
	228	+ WikibaseServices::getEntityLookup($services),
229	229	$checkerMap,
230		- ConstraintsServices::getConstraintLookup( $services ),
231		- ConstraintsServices::getConstraintParameterParser( $services ),
	230	+ ConstraintsServices::getConstraintLookup($services),
	231	+ ConstraintsServices::getConstraintParameterParser($services),
232	232	$statementGuidParser,
233		- ConstraintsServices::getLoggingHelper( $services ),
234		- $config->get( 'WBQualityConstraintsCheckQualifiers' ),
235		- $config->get( 'WBQualityConstraintsCheckReferences' ),
236		- $config->get( 'WBQualityConstraintsPropertiesWithViolatingQualifiers' )
	233	+ ConstraintsServices::getLoggingHelper($services),
	234	+ $config->get('WBQualityConstraintsCheckQualifiers'),
	235	+ $config->get('WBQualityConstraintsCheckReferences'),
	236	+ $config->get('WBQualityConstraintsPropertiesWithViolatingQualifiers')
237	237	);
238	238	},
239	239
240		- ConstraintsServices::RESULTS_SOURCE => function( MediaWikiServices $services ) {
	240	+ ConstraintsServices::RESULTS_SOURCE => function(MediaWikiServices $services) {
241	241	$config = $services->getMainConfig();
242	242	$resultsSource = new CheckingResultsSource(
243		- ConstraintsServices::getDelegatingConstraintChecker( $services )
	243	+ ConstraintsServices::getDelegatingConstraintChecker($services)
244	244	);
245	245
246		- if ( $config->get( 'WBQualityConstraintsCacheCheckConstraintsResults' ) ) {
	246	+ if ($config->get('WBQualityConstraintsCacheCheckConstraintsResults')) {
247	247	$possiblyStaleConstraintTypes = [
248		- $config->get( 'WBQualityConstraintsCommonsLinkConstraintId' ),
249		- $config->get( 'WBQualityConstraintsTypeConstraintId' ),
250		- $config->get( 'WBQualityConstraintsValueTypeConstraintId' ),
251		- $config->get( 'WBQualityConstraintsDistinctValuesConstraintId' ),
	248	+ $config->get('WBQualityConstraintsCommonsLinkConstraintId'),
	249	+ $config->get('WBQualityConstraintsTypeConstraintId'),
	250	+ $config->get('WBQualityConstraintsValueTypeConstraintId'),
	251	+ $config->get('WBQualityConstraintsDistinctValuesConstraintId'),
252	252	];
253	253	// TODO in the future, get EntityIdParser and WikiPageEntityMetaDataAccessor from $services?
254	254	$repo = WikibaseRepo::getDefaultInstance();
		@@ -258,14 +258,14 @@ discard block
		block discarded – undo
258	258	$resultsSource = new CachingResultsSource(
259	259	$resultsSource,
260	260	ResultsCache::getDefaultInstance(),
261		- ConstraintsServices::getCheckResultSerializer( $services ),
262		- ConstraintsServices::getCheckResultDeserializer( $services ),
	261	+ ConstraintsServices::getCheckResultSerializer($services),
	262	+ ConstraintsServices::getCheckResultDeserializer($services),
263	263	$wikiPageEntityMetaDataAccessor,
264	264	$entityIdParser,
265		- $config->get( 'WBQualityConstraintsCacheCheckConstraintsTTLSeconds' ),
	265	+ $config->get('WBQualityConstraintsCacheCheckConstraintsTTLSeconds'),
266	266	$possiblyStaleConstraintTypes,
267		- $config->get( 'WBQualityConstraintsCacheCheckConstraintsMaximumRevisionIds' ),
268		- ConstraintsServices::getLoggingHelper( $services )
	267	+ $config->get('WBQualityConstraintsCacheCheckConstraintsMaximumRevisionIds'),
	268	+ ConstraintsServices::getLoggingHelper($services)
269	269	);
270	270	}
271	271

wikimedia / mediawiki-extensions-WikibaseQualityConstraints

Push — master ( 4e90ea...01de2a )

Status

Category

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