Completed
Push — master ( 51aa7f...a0da98 )
by
unknown
02:47 queued 12s
created
src/ServiceWiring.php 1 patch
Spacing   +130 added lines, -130 removed lines patch added patch discarded remove patch
@@ -28,46 +28,46 @@  discard block
 block discarded – undo
28 28
 use WikibaseQuality\ConstraintReport\ConstraintCheck\Result\CheckResultSerializer;
29 29
 
30 30
 return [
31
-	ConstraintsServices::EXPIRY_LOCK => function ( MediaWikiServices $services ) {
32
-		return new ExpiryLock( ObjectCache::getInstance( CACHE_ANYTHING ) );
31
+	ConstraintsServices::EXPIRY_LOCK => function(MediaWikiServices $services) {
32
+		return new ExpiryLock(ObjectCache::getInstance(CACHE_ANYTHING));
33 33
 	},
34 34
 
35
-	ConstraintsServices::LOGGING_HELPER => function ( MediaWikiServices $services ) {
35
+	ConstraintsServices::LOGGING_HELPER => function(MediaWikiServices $services) {
36 36
 		return new LoggingHelper(
37 37
 			$services->getStatsdDataFactory(),
38
-			LoggerFactory::getInstance( 'WikibaseQualityConstraints' ),
38
+			LoggerFactory::getInstance('WikibaseQualityConstraints'),
39 39
 			$services->getMainConfig()
40 40
 		);
41 41
 	},
42 42
 
43
-	ConstraintsServices::CONSTRAINT_STORE => function ( MediaWikiServices $services ) {
44
-		$sourceDefinitions = WikibaseRepo::getEntitySourceDefinitions( $services );
45
-		$propertySource = $sourceDefinitions->getSourceForEntityType( Property::ENTITY_TYPE );
43
+	ConstraintsServices::CONSTRAINT_STORE => function(MediaWikiServices $services) {
44
+		$sourceDefinitions = WikibaseRepo::getEntitySourceDefinitions($services);
45
+		$propertySource = $sourceDefinitions->getSourceForEntityType(Property::ENTITY_TYPE);
46 46
 		$dbName = $propertySource->getDatabaseName();
47
-		$localEntitySourceName = WikibaseRepo::getLocalEntitySource( $services )->getSourceName();
47
+		$localEntitySourceName = WikibaseRepo::getLocalEntitySource($services)->getSourceName();
48 48
 
49
-		if ( $propertySource->getSourceName() !== $localEntitySourceName ) {
50
-			throw new \RuntimeException( 'Can\'t get a ConstraintStore for a non local entity source.' );
49
+		if ($propertySource->getSourceName() !== $localEntitySourceName) {
50
+			throw new \RuntimeException('Can\'t get a ConstraintStore for a non local entity source.');
51 51
 		}
52 52
 
53 53
 		return new ConstraintRepositoryStore(
54
-			$services->getDBLoadBalancerFactory()->getMainLB( $dbName ),
54
+			$services->getDBLoadBalancerFactory()->getMainLB($dbName),
55 55
 			$dbName
56 56
 		);
57 57
 	},
58 58
 
59
-	ConstraintsServices::CONSTRAINT_LOOKUP => function ( MediaWikiServices $services ) {
60
-		$sourceDefinitions = WikibaseRepo::getEntitySourceDefinitions( $services );
61
-		$propertySource = $sourceDefinitions->getSourceForEntityType( Property::ENTITY_TYPE );
59
+	ConstraintsServices::CONSTRAINT_LOOKUP => function(MediaWikiServices $services) {
60
+		$sourceDefinitions = WikibaseRepo::getEntitySourceDefinitions($services);
61
+		$propertySource = $sourceDefinitions->getSourceForEntityType(Property::ENTITY_TYPE);
62 62
 		$dbName = $propertySource->getDatabaseName();
63 63
 		$rawLookup = new ConstraintRepositoryLookup(
64
-			$services->getDBLoadBalancerFactory()->getMainLB( $dbName ),
64
+			$services->getDBLoadBalancerFactory()->getMainLB($dbName),
65 65
 			$dbName
66 66
 		);
67
-		return new CachingConstraintLookup( $rawLookup );
67
+		return new CachingConstraintLookup($rawLookup);
68 68
 	},
69 69
 
70
-	ConstraintsServices::CHECK_RESULT_SERIALIZER => function ( MediaWikiServices $services ) {
70
+	ConstraintsServices::CHECK_RESULT_SERIALIZER => function(MediaWikiServices $services) {
71 71
 		return new CheckResultSerializer(
72 72
 			new ConstraintSerializer(
73 73
 				false // constraint parameters are not exposed
@@ -78,9 +78,9 @@  discard block
 block discarded – undo
78 78
 		);
79 79
 	},
80 80
 
81
-	ConstraintsServices::CHECK_RESULT_DESERIALIZER => function ( MediaWikiServices $services ) {
82
-		$entityIdParser = WikibaseRepo::getEntityIdParser( $services );
83
-		$dataValueFactory = WikibaseRepo::getDataValueFactory( $services );
81
+	ConstraintsServices::CHECK_RESULT_DESERIALIZER => function(MediaWikiServices $services) {
82
+		$entityIdParser = WikibaseRepo::getEntityIdParser($services);
83
+		$dataValueFactory = WikibaseRepo::getDataValueFactory($services);
84 84
 
85 85
 		return new CheckResultDeserializer(
86 86
 			new ConstraintDeserializer(),
@@ -93,13 +93,13 @@  discard block
 block discarded – undo
93 93
 		);
94 94
 	},
95 95
 
96
-	ConstraintsServices::VIOLATION_MESSAGE_SERIALIZER => function ( MediaWikiServices $services ) {
96
+	ConstraintsServices::VIOLATION_MESSAGE_SERIALIZER => function(MediaWikiServices $services) {
97 97
 		return new ViolationMessageSerializer();
98 98
 	},
99 99
 
100
-	ConstraintsServices::VIOLATION_MESSAGE_DESERIALIZER => function ( MediaWikiServices $services ) {
101
-		$entityIdParser = WikibaseRepo::getEntityIdParser( $services );
102
-		$dataValueFactory = WikibaseRepo::getDataValueFactory( $services );
100
+	ConstraintsServices::VIOLATION_MESSAGE_DESERIALIZER => function(MediaWikiServices $services) {
101
+		$entityIdParser = WikibaseRepo::getEntityIdParser($services);
102
+		$dataValueFactory = WikibaseRepo::getDataValueFactory($services);
103 103
 
104 104
 		return new ViolationMessageDeserializer(
105 105
 			$entityIdParser,
@@ -107,38 +107,38 @@  discard block
 block discarded – undo
107 107
 		);
108 108
 	},
109 109
 
110
-	ConstraintsServices::CONSTRAINT_PARAMETER_PARSER => function ( MediaWikiServices $services ) {
111
-		$deserializerFactory = WikibaseRepo::getBaseDataModelDeserializerFactory( $services );
112
-		$entitySourceDefinitions = WikibaseRepo::getEntitySourceDefinitions( $services );
110
+	ConstraintsServices::CONSTRAINT_PARAMETER_PARSER => function(MediaWikiServices $services) {
111
+		$deserializerFactory = WikibaseRepo::getBaseDataModelDeserializerFactory($services);
112
+		$entitySourceDefinitions = WikibaseRepo::getEntitySourceDefinitions($services);
113 113
 
114 114
 		return new ConstraintParameterParser(
115 115
 			$services->getMainConfig(),
116 116
 			$deserializerFactory,
117
-			$entitySourceDefinitions->getSourceForEntityType( 'item' )->getConceptBaseUri()
117
+			$entitySourceDefinitions->getSourceForEntityType('item')->getConceptBaseUri()
118 118
 		);
119 119
 	},
120 120
 
121
-	ConstraintsServices::CONNECTION_CHECKER_HELPER => function ( MediaWikiServices $services ) {
121
+	ConstraintsServices::CONNECTION_CHECKER_HELPER => function(MediaWikiServices $services) {
122 122
 		return new ConnectionCheckerHelper();
123 123
 	},
124 124
 
125
-	ConstraintsServices::RANGE_CHECKER_HELPER => function ( MediaWikiServices $services ) {
125
+	ConstraintsServices::RANGE_CHECKER_HELPER => function(MediaWikiServices $services) {
126 126
 		return new RangeCheckerHelper(
127 127
 			$services->getMainConfig(),
128
-			WikibaseRepo::getUnitConverter( $services )
128
+			WikibaseRepo::getUnitConverter($services)
129 129
 		);
130 130
 	},
131 131
 
132
-	ConstraintsServices::SPARQL_HELPER => function ( MediaWikiServices $services ) {
133
-		$endpoint = $services->getMainConfig()->get( 'WBQualityConstraintsSparqlEndpoint' );
134
-		if ( $endpoint === '' ) {
132
+	ConstraintsServices::SPARQL_HELPER => function(MediaWikiServices $services) {
133
+		$endpoint = $services->getMainConfig()->get('WBQualityConstraintsSparqlEndpoint');
134
+		if ($endpoint === '') {
135 135
 			return new DummySparqlHelper();
136 136
 		}
137 137
 
138 138
 		// TODO get PropertyDataTypeLookup from $services
139 139
 		$repo = WikibaseRepo::getDefaultInstance();
140
-		$rdfVocabulary = WikibaseRepo::getRdfVocabulary( $services );
141
-		$entityIdParser = WikibaseRepo::getEntityIdParser( $services );
140
+		$rdfVocabulary = WikibaseRepo::getRdfVocabulary($services);
141
+		$entityIdParser = WikibaseRepo::getEntityIdParser($services);
142 142
 		$propertyDataTypeLookup = $repo->getPropertyDataTypeLookup();
143 143
 
144 144
 		return new SparqlHelper(
@@ -147,122 +147,122 @@  discard block
 block discarded – undo
147 147
 			$entityIdParser,
148 148
 			$propertyDataTypeLookup,
149 149
 			$services->getMainWANObjectCache(),
150
-			ConstraintsServices::getViolationMessageSerializer( $services ),
151
-			ConstraintsServices::getViolationMessageDeserializer( $services ),
150
+			ConstraintsServices::getViolationMessageSerializer($services),
151
+			ConstraintsServices::getViolationMessageDeserializer($services),
152 152
 			$services->getStatsdDataFactory(),
153
-			ConstraintsServices::getExpiryLock( $services ),
153
+			ConstraintsServices::getExpiryLock($services),
154 154
 			ConstraintsServices::getLoggingHelper(),
155
-			wfWikiID() . ' WikibaseQualityConstraints ' . Http::userAgent(),
155
+			wfWikiID().' WikibaseQualityConstraints '.Http::userAgent(),
156 156
 			$services->getHttpRequestFactory()
157 157
 		);
158 158
 	},
159 159
 
160
-	ConstraintsServices::TYPE_CHECKER_HELPER => function ( MediaWikiServices $services ) {
160
+	ConstraintsServices::TYPE_CHECKER_HELPER => function(MediaWikiServices $services) {
161 161
 		return new TypeCheckerHelper(
162
-			WikibaseServices::getEntityLookup( $services ),
162
+			WikibaseServices::getEntityLookup($services),
163 163
 			$services->getMainConfig(),
164
-			ConstraintsServices::getSparqlHelper( $services ),
164
+			ConstraintsServices::getSparqlHelper($services),
165 165
 			$services->getStatsdDataFactory()
166 166
 		);
167 167
 	},
168 168
 
169
-	ConstraintsServices::DELEGATING_CONSTRAINT_CHECKER => function ( MediaWikiServices $services ) {
170
-		$statementGuidParser = WikibaseRepo::getStatementGuidParser( $services );
169
+	ConstraintsServices::DELEGATING_CONSTRAINT_CHECKER => function(MediaWikiServices $services) {
170
+		$statementGuidParser = WikibaseRepo::getStatementGuidParser($services);
171 171
 
172 172
 		$config = $services->getMainConfig();
173 173
 		$checkerMap = [
174
-			$config->get( 'WBQualityConstraintsConflictsWithConstraintId' )
175
-				=> ConstraintCheckerServices::getConflictsWithChecker( $services ),
176
-			$config->get( 'WBQualityConstraintsItemRequiresClaimConstraintId' )
177
-				=> ConstraintCheckerServices::getItemChecker( $services ),
178
-			$config->get( 'WBQualityConstraintsValueRequiresClaimConstraintId' )
179
-				=> ConstraintCheckerServices::getTargetRequiredClaimChecker( $services ),
180
-			$config->get( 'WBQualityConstraintsSymmetricConstraintId' )
181
-				=> ConstraintCheckerServices::getSymmetricChecker( $services ),
182
-			$config->get( 'WBQualityConstraintsInverseConstraintId' )
183
-				=> ConstraintCheckerServices::getInverseChecker( $services ),
184
-			$config->get( 'WBQualityConstraintsUsedAsQualifierConstraintId' )
185
-				=> ConstraintCheckerServices::getQualifierChecker( $services ),
186
-			$config->get( 'WBQualityConstraintsAllowedQualifiersConstraintId' )
187
-				=> ConstraintCheckerServices::getQualifiersChecker( $services ),
188
-			$config->get( 'WBQualityConstraintsMandatoryQualifierConstraintId' )
189
-				=> ConstraintCheckerServices::getMandatoryQualifiersChecker( $services ),
190
-			$config->get( 'WBQualityConstraintsRangeConstraintId' )
191
-				=> ConstraintCheckerServices::getRangeChecker( $services ),
192
-			$config->get( 'WBQualityConstraintsDifferenceWithinRangeConstraintId' )
193
-				=> ConstraintCheckerServices::getDiffWithinRangeChecker( $services ),
194
-			$config->get( 'WBQualityConstraintsTypeConstraintId' )
195
-				=> ConstraintCheckerServices::getTypeChecker( $services ),
196
-			$config->get( 'WBQualityConstraintsValueTypeConstraintId' )
197
-				=> ConstraintCheckerServices::getValueTypeChecker( $services ),
198
-			$config->get( 'WBQualityConstraintsSingleValueConstraintId' )
199
-				=> ConstraintCheckerServices::getSingleValueChecker( $services ),
200
-			$config->get( 'WBQualityConstraintsMultiValueConstraintId' )
201
-				=> ConstraintCheckerServices::getMultiValueChecker( $services ),
202
-			$config->get( 'WBQualityConstraintsDistinctValuesConstraintId' )
203
-				=> ConstraintCheckerServices::getUniqueValueChecker( $services ),
204
-			$config->get( 'WBQualityConstraintsFormatConstraintId' )
205
-				=> ConstraintCheckerServices::getFormatChecker( $services ),
206
-			$config->get( 'WBQualityConstraintsCommonsLinkConstraintId' )
207
-				=> ConstraintCheckerServices::getCommonsLinkChecker( $services ),
208
-			$config->get( 'WBQualityConstraintsOneOfConstraintId' )
209
-				=> ConstraintCheckerServices::getOneOfChecker( $services ),
210
-			$config->get( 'WBQualityConstraintsUsedForValuesOnlyConstraintId' )
211
-				=> ConstraintCheckerServices::getValueOnlyChecker( $services ),
212
-			$config->get( 'WBQualityConstraintsUsedAsReferenceConstraintId' )
213
-				=> ConstraintCheckerServices::getReferenceChecker( $services ),
214
-			$config->get( 'WBQualityConstraintsNoBoundsConstraintId' )
215
-				=> ConstraintCheckerServices::getNoBoundsChecker( $services ),
216
-			$config->get( 'WBQualityConstraintsAllowedUnitsConstraintId' )
217
-				=> ConstraintCheckerServices::getAllowedUnitsChecker( $services ),
218
-			$config->get( 'WBQualityConstraintsSingleBestValueConstraintId' )
219
-				=> ConstraintCheckerServices::getSingleBestValueChecker( $services ),
220
-			$config->get( 'WBQualityConstraintsAllowedEntityTypesConstraintId' )
221
-				=> ConstraintCheckerServices::getEntityTypeChecker( $services ),
222
-			$config->get( 'WBQualityConstraintsNoneOfConstraintId' )
223
-				=> ConstraintCheckerServices::getNoneOfChecker( $services ),
224
-			$config->get( 'WBQualityConstraintsIntegerConstraintId' )
225
-				=> ConstraintCheckerServices::getIntegerChecker( $services ),
226
-			$config->get( 'WBQualityConstraintsCitationNeededConstraintId' )
227
-				=> ConstraintCheckerServices::getCitationNeededChecker( $services ),
228
-			$config->get( 'WBQualityConstraintsPropertyScopeConstraintId' )
229
-				=> ConstraintCheckerServices::getPropertyScopeChecker( $services ),
230
-			$config->get( 'WBQualityConstraintsContemporaryConstraintId' )
231
-				=> ConstraintCheckerServices::getContemporaryChecker( $services ),
174
+			$config->get('WBQualityConstraintsConflictsWithConstraintId')
175
+				=> ConstraintCheckerServices::getConflictsWithChecker($services),
176
+			$config->get('WBQualityConstraintsItemRequiresClaimConstraintId')
177
+				=> ConstraintCheckerServices::getItemChecker($services),
178
+			$config->get('WBQualityConstraintsValueRequiresClaimConstraintId')
179
+				=> ConstraintCheckerServices::getTargetRequiredClaimChecker($services),
180
+			$config->get('WBQualityConstraintsSymmetricConstraintId')
181
+				=> ConstraintCheckerServices::getSymmetricChecker($services),
182
+			$config->get('WBQualityConstraintsInverseConstraintId')
183
+				=> ConstraintCheckerServices::getInverseChecker($services),
184
+			$config->get('WBQualityConstraintsUsedAsQualifierConstraintId')
185
+				=> ConstraintCheckerServices::getQualifierChecker($services),
186
+			$config->get('WBQualityConstraintsAllowedQualifiersConstraintId')
187
+				=> ConstraintCheckerServices::getQualifiersChecker($services),
188
+			$config->get('WBQualityConstraintsMandatoryQualifierConstraintId')
189
+				=> ConstraintCheckerServices::getMandatoryQualifiersChecker($services),
190
+			$config->get('WBQualityConstraintsRangeConstraintId')
191
+				=> ConstraintCheckerServices::getRangeChecker($services),
192
+			$config->get('WBQualityConstraintsDifferenceWithinRangeConstraintId')
193
+				=> ConstraintCheckerServices::getDiffWithinRangeChecker($services),
194
+			$config->get('WBQualityConstraintsTypeConstraintId')
195
+				=> ConstraintCheckerServices::getTypeChecker($services),
196
+			$config->get('WBQualityConstraintsValueTypeConstraintId')
197
+				=> ConstraintCheckerServices::getValueTypeChecker($services),
198
+			$config->get('WBQualityConstraintsSingleValueConstraintId')
199
+				=> ConstraintCheckerServices::getSingleValueChecker($services),
200
+			$config->get('WBQualityConstraintsMultiValueConstraintId')
201
+				=> ConstraintCheckerServices::getMultiValueChecker($services),
202
+			$config->get('WBQualityConstraintsDistinctValuesConstraintId')
203
+				=> ConstraintCheckerServices::getUniqueValueChecker($services),
204
+			$config->get('WBQualityConstraintsFormatConstraintId')
205
+				=> ConstraintCheckerServices::getFormatChecker($services),
206
+			$config->get('WBQualityConstraintsCommonsLinkConstraintId')
207
+				=> ConstraintCheckerServices::getCommonsLinkChecker($services),
208
+			$config->get('WBQualityConstraintsOneOfConstraintId')
209
+				=> ConstraintCheckerServices::getOneOfChecker($services),
210
+			$config->get('WBQualityConstraintsUsedForValuesOnlyConstraintId')
211
+				=> ConstraintCheckerServices::getValueOnlyChecker($services),
212
+			$config->get('WBQualityConstraintsUsedAsReferenceConstraintId')
213
+				=> ConstraintCheckerServices::getReferenceChecker($services),
214
+			$config->get('WBQualityConstraintsNoBoundsConstraintId')
215
+				=> ConstraintCheckerServices::getNoBoundsChecker($services),
216
+			$config->get('WBQualityConstraintsAllowedUnitsConstraintId')
217
+				=> ConstraintCheckerServices::getAllowedUnitsChecker($services),
218
+			$config->get('WBQualityConstraintsSingleBestValueConstraintId')
219
+				=> ConstraintCheckerServices::getSingleBestValueChecker($services),
220
+			$config->get('WBQualityConstraintsAllowedEntityTypesConstraintId')
221
+				=> ConstraintCheckerServices::getEntityTypeChecker($services),
222
+			$config->get('WBQualityConstraintsNoneOfConstraintId')
223
+				=> ConstraintCheckerServices::getNoneOfChecker($services),
224
+			$config->get('WBQualityConstraintsIntegerConstraintId')
225
+				=> ConstraintCheckerServices::getIntegerChecker($services),
226
+			$config->get('WBQualityConstraintsCitationNeededConstraintId')
227
+				=> ConstraintCheckerServices::getCitationNeededChecker($services),
228
+			$config->get('WBQualityConstraintsPropertyScopeConstraintId')
229
+				=> ConstraintCheckerServices::getPropertyScopeChecker($services),
230
+			$config->get('WBQualityConstraintsContemporaryConstraintId')
231
+				=> ConstraintCheckerServices::getContemporaryChecker($services),
232 232
 		];
233 233
 
234 234
 		return new DelegatingConstraintChecker(
235
-			WikibaseServices::getEntityLookup( $services ),
235
+			WikibaseServices::getEntityLookup($services),
236 236
 			$checkerMap,
237
-			ConstraintsServices::getConstraintLookup( $services ),
238
-			ConstraintsServices::getConstraintParameterParser( $services ),
237
+			ConstraintsServices::getConstraintLookup($services),
238
+			ConstraintsServices::getConstraintParameterParser($services),
239 239
 			$statementGuidParser,
240
-			ConstraintsServices::getLoggingHelper( $services ),
241
-			$config->get( 'WBQualityConstraintsCheckQualifiers' ),
242
-			$config->get( 'WBQualityConstraintsCheckReferences' ),
243
-			$config->get( 'WBQualityConstraintsPropertiesWithViolatingQualifiers' )
240
+			ConstraintsServices::getLoggingHelper($services),
241
+			$config->get('WBQualityConstraintsCheckQualifiers'),
242
+			$config->get('WBQualityConstraintsCheckReferences'),
243
+			$config->get('WBQualityConstraintsPropertiesWithViolatingQualifiers')
244 244
 		);
245 245
 	},
246 246
 
247
-	ConstraintsServices::RESULTS_SOURCE => function ( MediaWikiServices $services ) {
247
+	ConstraintsServices::RESULTS_SOURCE => function(MediaWikiServices $services) {
248 248
 		$config = $services->getMainConfig();
249 249
 		$resultsSource = new CheckingResultsSource(
250
-			ConstraintsServices::getDelegatingConstraintChecker( $services )
250
+			ConstraintsServices::getDelegatingConstraintChecker($services)
251 251
 		);
252 252
 
253 253
 		$cacheCheckConstraintsResults = false;
254 254
 
255
-		if ( $config->get( 'WBQualityConstraintsCacheCheckConstraintsResults' ) ) {
255
+		if ($config->get('WBQualityConstraintsCacheCheckConstraintsResults')) {
256 256
 			$cacheCheckConstraintsResults = true;
257 257
 			// check that we can use getLocalRepoWikiPageMetaDataAccessor()
258 258
 			// TODO we should always be able to cache constraint check results (T244726)
259
-			$entitySources = WikibaseRepo::getEntitySourceDefinitions( $services )->getSources();
260
-			$localEntitySourceName = WikibaseRepo::getLocalEntitySource( $services )->getSourceName();
259
+			$entitySources = WikibaseRepo::getEntitySourceDefinitions($services)->getSources();
260
+			$localEntitySourceName = WikibaseRepo::getLocalEntitySource($services)->getSourceName();
261 261
 
262
-			foreach ( $entitySources as $entitySource ) {
263
-				if ( $entitySource->getSourceName() !== $localEntitySourceName ) {
264
-					LoggerFactory::getInstance( 'WikibaseQualityConstraints' )->warning(
265
-						'Cannot cache constraint check results for non-local source: ' .
262
+			foreach ($entitySources as $entitySource) {
263
+				if ($entitySource->getSourceName() !== $localEntitySourceName) {
264
+					LoggerFactory::getInstance('WikibaseQualityConstraints')->warning(
265
+						'Cannot cache constraint check results for non-local source: '.
266 266
 						$entitySource->getSourceName()
267 267
 					);
268 268
 					$cacheCheckConstraintsResults = false;
@@ -271,28 +271,28 @@  discard block
 block discarded – undo
271 271
 			}
272 272
 		}
273 273
 
274
-		if ( $cacheCheckConstraintsResults ) {
274
+		if ($cacheCheckConstraintsResults) {
275 275
 			$possiblyStaleConstraintTypes = [
276
-				$config->get( 'WBQualityConstraintsCommonsLinkConstraintId' ),
277
-				$config->get( 'WBQualityConstraintsTypeConstraintId' ),
278
-				$config->get( 'WBQualityConstraintsValueTypeConstraintId' ),
279
-				$config->get( 'WBQualityConstraintsDistinctValuesConstraintId' ),
276
+				$config->get('WBQualityConstraintsCommonsLinkConstraintId'),
277
+				$config->get('WBQualityConstraintsTypeConstraintId'),
278
+				$config->get('WBQualityConstraintsValueTypeConstraintId'),
279
+				$config->get('WBQualityConstraintsDistinctValuesConstraintId'),
280 280
 			];
281
-			$entityIdParser = WikibaseRepo::getEntityIdParser( $services );
281
+			$entityIdParser = WikibaseRepo::getEntityIdParser($services);
282 282
 			$wikiPageEntityMetaDataAccessor = WikibaseRepo::getLocalRepoWikiPageMetaDataAccessor(
283 283
 				$services );
284 284
 
285 285
 			$resultsSource = new CachingResultsSource(
286 286
 				$resultsSource,
287 287
 				ResultsCache::getDefaultInstance(),
288
-				ConstraintsServices::getCheckResultSerializer( $services ),
289
-				ConstraintsServices::getCheckResultDeserializer( $services ),
288
+				ConstraintsServices::getCheckResultSerializer($services),
289
+				ConstraintsServices::getCheckResultDeserializer($services),
290 290
 				$wikiPageEntityMetaDataAccessor,
291 291
 				$entityIdParser,
292
-				$config->get( 'WBQualityConstraintsCacheCheckConstraintsTTLSeconds' ),
292
+				$config->get('WBQualityConstraintsCacheCheckConstraintsTTLSeconds'),
293 293
 				$possiblyStaleConstraintTypes,
294
-				$config->get( 'WBQualityConstraintsCacheCheckConstraintsMaximumRevisionIds' ),
295
-				ConstraintsServices::getLoggingHelper( $services )
294
+				$config->get('WBQualityConstraintsCacheCheckConstraintsMaximumRevisionIds'),
295
+				ConstraintsServices::getLoggingHelper($services)
296 296
 			);
297 297
 		}
298 298
 
Please login to merge, or discard this patch.
src/ConstraintCheck/Helper/SparqlHelper.php 1 patch
Spacing   +174 added lines, -177 removed lines patch added patch discarded remove patch
@@ -199,73 +199,73 @@  discard block
 block discarded – undo
199 199
 		$this->defaultUserAgent = $defaultUserAgent;
200 200
 		$this->requestFactory = $requestFactory;
201 201
 		$this->entityPrefixes = [];
202
-		foreach ( $rdfVocabulary->entityNamespaceNames as $namespaceName ) {
203
-			$this->entityPrefixes[] = $rdfVocabulary->getNamespaceURI( $namespaceName );
202
+		foreach ($rdfVocabulary->entityNamespaceNames as $namespaceName) {
203
+			$this->entityPrefixes[] = $rdfVocabulary->getNamespaceURI($namespaceName);
204 204
 		}
205 205
 
206
-		$this->endpoint = $config->get( 'WBQualityConstraintsSparqlEndpoint' );
207
-		$this->maxQueryTimeMillis = $config->get( 'WBQualityConstraintsSparqlMaxMillis' );
208
-		$this->instanceOfId = $config->get( 'WBQualityConstraintsInstanceOfId' );
209
-		$this->subclassOfId = $config->get( 'WBQualityConstraintsSubclassOfId' );
210
-		$this->cacheMapSize = $config->get( 'WBQualityConstraintsFormatCacheMapSize' );
206
+		$this->endpoint = $config->get('WBQualityConstraintsSparqlEndpoint');
207
+		$this->maxQueryTimeMillis = $config->get('WBQualityConstraintsSparqlMaxMillis');
208
+		$this->instanceOfId = $config->get('WBQualityConstraintsInstanceOfId');
209
+		$this->subclassOfId = $config->get('WBQualityConstraintsSubclassOfId');
210
+		$this->cacheMapSize = $config->get('WBQualityConstraintsFormatCacheMapSize');
211 211
 		$this->timeoutExceptionClasses = $config->get(
212 212
 			'WBQualityConstraintsSparqlTimeoutExceptionClasses'
213 213
 		);
214 214
 		$this->sparqlHasWikibaseSupport = $config->get(
215 215
 			'WBQualityConstraintsSparqlHasWikibaseSupport'
216 216
 		);
217
-		$this->sparqlThrottlingFallbackDuration = (int)$config->get(
217
+		$this->sparqlThrottlingFallbackDuration = (int) $config->get(
218 218
 			'WBQualityConstraintsSparqlThrottlingFallbackDuration'
219 219
 		);
220 220
 
221
-		$this->prefixes = $this->getQueryPrefixes( $rdfVocabulary );
221
+		$this->prefixes = $this->getQueryPrefixes($rdfVocabulary);
222 222
 	}
223 223
 
224
-	private function getQueryPrefixes( RdfVocabulary $rdfVocabulary ) {
224
+	private function getQueryPrefixes(RdfVocabulary $rdfVocabulary) {
225 225
 		// TODO: it would probably be smarter that RdfVocubulary exposed these prefixes somehow
226 226
 		$prefixes = '';
227
-		foreach ( $rdfVocabulary->entityNamespaceNames as $sourceName => $namespaceName ) {
227
+		foreach ($rdfVocabulary->entityNamespaceNames as $sourceName => $namespaceName) {
228 228
 			$prefixes .= <<<END
229
-PREFIX {$namespaceName}: <{$rdfVocabulary->getNamespaceURI( $namespaceName )}>\n
229
+PREFIX {$namespaceName}: <{$rdfVocabulary->getNamespaceURI($namespaceName)}>\n
230 230
 END;
231 231
 		}
232 232
 		$prefixes .= <<<END
233
-PREFIX wds: <{$rdfVocabulary->getNamespaceURI( RdfVocabulary::NS_STATEMENT )}>
234
-PREFIX wdv: <{$rdfVocabulary->getNamespaceURI( RdfVocabulary::NS_VALUE )}>\n
233
+PREFIX wds: <{$rdfVocabulary->getNamespaceURI(RdfVocabulary::NS_STATEMENT)}>
234
+PREFIX wdv: <{$rdfVocabulary->getNamespaceURI(RdfVocabulary::NS_VALUE)}>\n
235 235
 END;
236 236
 
237
-		foreach ( $rdfVocabulary->propertyNamespaceNames as $sourceName => $sourceNamespaces ) {
237
+		foreach ($rdfVocabulary->propertyNamespaceNames as $sourceName => $sourceNamespaces) {
238 238
 			$namespaceName = $sourceNamespaces[RdfVocabulary::NSP_DIRECT_CLAIM];
239 239
 			$prefixes .= <<<END
240
-PREFIX {$namespaceName}: <{$rdfVocabulary->getNamespaceURI( $namespaceName )}>\n
240
+PREFIX {$namespaceName}: <{$rdfVocabulary->getNamespaceURI($namespaceName)}>\n
241 241
 END;
242 242
 			$namespaceName = $sourceNamespaces[RdfVocabulary::NSP_CLAIM];
243 243
 			$prefixes .= <<<END
244
-PREFIX {$namespaceName}: <{$rdfVocabulary->getNamespaceURI( $namespaceName )}>\n
244
+PREFIX {$namespaceName}: <{$rdfVocabulary->getNamespaceURI($namespaceName)}>\n
245 245
 END;
246 246
 			$namespaceName = $sourceNamespaces[RdfVocabulary::NSP_CLAIM_STATEMENT];
247 247
 			$prefixes .= <<<END
248
-PREFIX {$namespaceName}: <{$rdfVocabulary->getNamespaceURI( $namespaceName )}>\n
248
+PREFIX {$namespaceName}: <{$rdfVocabulary->getNamespaceURI($namespaceName)}>\n
249 249
 END;
250 250
 			$namespaceName = $sourceNamespaces[RdfVocabulary::NSP_QUALIFIER];
251 251
 			$prefixes .= <<<END
252
-PREFIX {$namespaceName}: <{$rdfVocabulary->getNamespaceURI( $namespaceName )}>\n
252
+PREFIX {$namespaceName}: <{$rdfVocabulary->getNamespaceURI($namespaceName)}>\n
253 253
 END;
254 254
 			$namespaceName = $sourceNamespaces[RdfVocabulary::NSP_QUALIFIER_VALUE];
255 255
 			$prefixes .= <<<END
256
-PREFIX {$namespaceName}: <{$rdfVocabulary->getNamespaceURI( $namespaceName )}>\n
256
+PREFIX {$namespaceName}: <{$rdfVocabulary->getNamespaceURI($namespaceName)}>\n
257 257
 END;
258 258
 			$namespaceName = $sourceNamespaces[RdfVocabulary::NSP_REFERENCE];
259 259
 			$prefixes .= <<<END
260
-PREFIX {$namespaceName}: <{$rdfVocabulary->getNamespaceURI( $namespaceName )}>\n
260
+PREFIX {$namespaceName}: <{$rdfVocabulary->getNamespaceURI($namespaceName)}>\n
261 261
 END;
262 262
 			$namespaceName = $sourceNamespaces[RdfVocabulary::NSP_REFERENCE_VALUE];
263 263
 			$prefixes .= <<<END
264
-PREFIX {$namespaceName}: <{$rdfVocabulary->getNamespaceURI( $namespaceName )}>\n
264
+PREFIX {$namespaceName}: <{$rdfVocabulary->getNamespaceURI($namespaceName)}>\n
265 265
 END;
266 266
 		}
267 267
 		$prefixes .= <<<END
268
-PREFIX wikibase: <{$rdfVocabulary->getNamespaceURI( RdfVocabulary::NS_ONTOLOGY )}>\n
268
+PREFIX wikibase: <{$rdfVocabulary->getNamespaceURI(RdfVocabulary::NS_ONTOLOGY)}>\n
269 269
 END;
270 270
 		return $prefixes;
271 271
 	}
@@ -277,21 +277,20 @@  discard block
 block discarded – undo
277 277
 	 * @return CachedBool
278 278
 	 * @throws SparqlHelperException if the query times out or some other error occurs
279 279
 	 */
280
-	public function hasType( $id, array $classes ) {
280
+	public function hasType($id, array $classes) {
281 281
 		// TODO hint:gearing is a workaround for T168973 and can hopefully be removed eventually
282 282
 		$gearingHint = $this->sparqlHasWikibaseSupport ?
283
-			' hint:Prior hint:gearing "forward".' :
284
-			'';
283
+			' hint:Prior hint:gearing "forward".' : '';
285 284
 
286 285
 		$metadatas = [];
287 286
 
288
-		foreach ( array_chunk( $classes, 20 ) as $classesChunk ) {
289
-			$classesValues = implode( ' ', array_map(
290
-				function ( $class ) {
291
-					return 'wd:' . $class;
287
+		foreach (array_chunk($classes, 20) as $classesChunk) {
288
+			$classesValues = implode(' ', array_map(
289
+				function($class) {
290
+					return 'wd:'.$class;
292 291
 				},
293 292
 				$classesChunk
294
-			) );
293
+			));
295 294
 
296 295
 			$query = <<<EOF
297 296
 ASK {
@@ -301,19 +300,19 @@  discard block
 block discarded – undo
301 300
 }
302 301
 EOF;
303 302
 
304
-			$result = $this->runQuery( $query );
303
+			$result = $this->runQuery($query);
305 304
 			$metadatas[] = $result->getMetadata();
306
-			if ( $result->getArray()['boolean'] ) {
305
+			if ($result->getArray()['boolean']) {
307 306
 				return new CachedBool(
308 307
 					true,
309
-					Metadata::merge( $metadatas )
308
+					Metadata::merge($metadatas)
310 309
 				);
311 310
 			}
312 311
 		}
313 312
 
314 313
 		return new CachedBool(
315 314
 			false,
316
-			Metadata::merge( $metadatas )
315
+			Metadata::merge($metadatas)
317 316
 		);
318 317
 	}
319 318
 
@@ -329,10 +328,10 @@  discard block
 block discarded – undo
329 328
 		$ignoreDeprecatedStatements
330 329
 	) {
331 330
 		$pid = $statement->getPropertyId()->serialize();
332
-		$guid = str_replace( '$', '-', $statement->getGuid() );
331
+		$guid = str_replace('$', '-', $statement->getGuid());
333 332
 
334 333
 		$deprecatedFilter = '';
335
-		if ( $ignoreDeprecatedStatements ) {
334
+		if ($ignoreDeprecatedStatements) {
336 335
 			$deprecatedFilter = 'MINUS { ?otherStatement wikibase:rank wikibase:DeprecatedRank. }';
337 336
 		}
338 337
 
@@ -351,9 +350,9 @@  discard block
 block discarded – undo
351 350
 LIMIT 10
352 351
 EOF;
353 352
 
354
-		$result = $this->runQuery( $query );
353
+		$result = $this->runQuery($query);
355 354
 
356
-		return $this->getOtherEntities( $result );
355
+		return $this->getOtherEntities($result);
357 356
 	}
358 357
 
359 358
 	/**
@@ -378,16 +377,15 @@  discard block
 block discarded – undo
378 377
 		$dataType = $this->propertyDataTypeLookup->getDataTypeIdForProperty(
379 378
 			$snak->getPropertyId()
380 379
 		);
381
-		list( $value, $isFullValue ) = $this->getRdfLiteral( $dataType, $dataValue );
382
-		if ( $isFullValue ) {
380
+		list($value, $isFullValue) = $this->getRdfLiteral($dataType, $dataValue);
381
+		if ($isFullValue) {
383 382
 			$prefix .= 'v';
384 383
 		}
385 384
 		$path = $type === Context::TYPE_QUALIFIER ?
386
-			"$prefix:$pid" :
387
-			"prov:wasDerivedFrom/$prefix:$pid";
385
+			"$prefix:$pid" : "prov:wasDerivedFrom/$prefix:$pid";
388 386
 
389 387
 		$deprecatedFilter = '';
390
-		if ( $ignoreDeprecatedStatements ) {
388
+		if ($ignoreDeprecatedStatements) {
391 389
 			$deprecatedFilter = <<< EOF
392 390
   MINUS { ?otherStatement wikibase:rank wikibase:DeprecatedRank. }
393 391
 EOF;
@@ -407,9 +405,9 @@  discard block
 block discarded – undo
407 405
 LIMIT 10
408 406
 EOF;
409 407
 
410
-		$result = $this->runQuery( $query );
408
+		$result = $this->runQuery($query);
411 409
 
412
-		return $this->getOtherEntities( $result );
410
+		return $this->getOtherEntities($result);
413 411
 	}
414 412
 
415 413
 	/**
@@ -419,8 +417,8 @@  discard block
 block discarded – undo
419 417
 	 *
420 418
 	 * @return string
421 419
 	 */
422
-	private function stringLiteral( $text ) {
423
-		return '"' . strtr( $text, [ '"' => '\\"', '\\' => '\\\\' ] ) . '"';
420
+	private function stringLiteral($text) {
421
+		return '"'.strtr($text, ['"' => '\\"', '\\' => '\\\\']).'"';
424 422
 	}
425 423
 
426 424
 	/**
@@ -430,18 +428,18 @@  discard block
 block discarded – undo
430 428
 	 *
431 429
 	 * @return CachedEntityIds
432 430
 	 */
433
-	private function getOtherEntities( CachedQueryResults $results ) {
434
-		return new CachedEntityIds( array_map(
435
-			function ( $resultBindings ) {
431
+	private function getOtherEntities(CachedQueryResults $results) {
432
+		return new CachedEntityIds(array_map(
433
+			function($resultBindings) {
436 434
 				$entityIRI = $resultBindings['otherEntity']['value'];
437
-				foreach ( $this->entityPrefixes as $entityPrefix ) {
438
-					$entityPrefixLength = strlen( $entityPrefix );
439
-					if ( substr( $entityIRI, 0, $entityPrefixLength ) === $entityPrefix ) {
435
+				foreach ($this->entityPrefixes as $entityPrefix) {
436
+					$entityPrefixLength = strlen($entityPrefix);
437
+					if (substr($entityIRI, 0, $entityPrefixLength) === $entityPrefix) {
440 438
 						try {
441 439
 							return $this->entityIdParser->parse(
442
-								substr( $entityIRI, $entityPrefixLength )
440
+								substr($entityIRI, $entityPrefixLength)
443 441
 							);
444
-						} catch ( EntityIdParsingException $e ) {
442
+						} catch (EntityIdParsingException $e) {
445 443
 							// fall through
446 444
 						}
447 445
 					}
@@ -452,7 +450,7 @@  discard block
 block discarded – undo
452 450
 				return null;
453 451
 			},
454 452
 			$results->getArray()['results']['bindings']
455
-		), $results->getMetadata() );
453
+		), $results->getMetadata());
456 454
 	}
457 455
 
458 456
 	// phpcs:disable Generic.Metrics.CyclomaticComplexity,Squiz.WhiteSpace.FunctionSpacing
@@ -465,49 +463,49 @@  discard block
 block discarded – undo
465 463
 	 * @return array the literal or IRI as a string in SPARQL syntax,
466 464
 	 * and a boolean indicating whether it refers to a full value node or not
467 465
 	 */
468
-	private function getRdfLiteral( $dataType, DataValue $dataValue ) {
469
-		switch ( $dataType ) {
466
+	private function getRdfLiteral($dataType, DataValue $dataValue) {
467
+		switch ($dataType) {
470 468
 			case 'string':
471 469
 			case 'external-id':
472
-				return [ $this->stringLiteral( $dataValue->getValue() ), false ];
470
+				return [$this->stringLiteral($dataValue->getValue()), false];
473 471
 			case 'commonsMedia':
474
-				$url = $this->rdfVocabulary->getMediaFileURI( $dataValue->getValue() );
475
-				return [ '<' . $url . '>', false ];
472
+				$url = $this->rdfVocabulary->getMediaFileURI($dataValue->getValue());
473
+				return ['<'.$url.'>', false];
476 474
 			case 'geo-shape':
477
-				$url = $this->rdfVocabulary->getGeoShapeURI( $dataValue->getValue() );
478
-				return [ '<' . $url . '>', false ];
475
+				$url = $this->rdfVocabulary->getGeoShapeURI($dataValue->getValue());
476
+				return ['<'.$url.'>', false];
479 477
 			case 'tabular-data':
480
-				$url = $this->rdfVocabulary->getTabularDataURI( $dataValue->getValue() );
481
-				return [ '<' . $url . '>', false ];
478
+				$url = $this->rdfVocabulary->getTabularDataURI($dataValue->getValue());
479
+				return ['<'.$url.'>', false];
482 480
 			case 'url':
483 481
 				$url = $dataValue->getValue();
484
-				if ( !preg_match( '/^[^<>"{}\\\\|^`\\x00-\\x20]*$/D', $url ) ) {
482
+				if (!preg_match('/^[^<>"{}\\\\|^`\\x00-\\x20]*$/D', $url)) {
485 483
 					// not a valid URL for SPARQL (see SPARQL spec, production 139 IRIREF)
486 484
 					// such an URL should never reach us, so just throw
487
-					throw new InvalidArgumentException( 'invalid URL: ' . $url );
485
+					throw new InvalidArgumentException('invalid URL: '.$url);
488 486
 				}
489
-				return [ '<' . $url . '>', false ];
487
+				return ['<'.$url.'>', false];
490 488
 			case 'wikibase-item':
491 489
 			case 'wikibase-property':
492 490
 				/** @var EntityIdValue $dataValue */
493 491
 				'@phan-var EntityIdValue $dataValue';
494
-				return [ 'wd:' . $dataValue->getEntityId()->getSerialization(), false ];
492
+				return ['wd:'.$dataValue->getEntityId()->getSerialization(), false];
495 493
 			case 'monolingualtext':
496 494
 				/** @var MonolingualTextValue $dataValue */
497 495
 				'@phan-var MonolingualTextValue $dataValue';
498 496
 				$lang = $dataValue->getLanguageCode();
499
-				if ( !preg_match( '/^[a-zA-Z]+(-[a-zA-Z0-9]+)*$/D', $lang ) ) {
497
+				if (!preg_match('/^[a-zA-Z]+(-[a-zA-Z0-9]+)*$/D', $lang)) {
500 498
 					// not a valid language tag for SPARQL (see SPARQL spec, production 145 LANGTAG)
501 499
 					// such a language tag should never reach us, so just throw
502
-					throw new InvalidArgumentException( 'invalid language tag: ' . $lang );
500
+					throw new InvalidArgumentException('invalid language tag: '.$lang);
503 501
 				}
504
-				return [ $this->stringLiteral( $dataValue->getText() ) . '@' . $lang, false ];
502
+				return [$this->stringLiteral($dataValue->getText()).'@'.$lang, false];
505 503
 			case 'globe-coordinate':
506 504
 			case 'quantity':
507 505
 			case 'time':
508
-				return [ 'wdv:' . $dataValue->getHash(), true ];
506
+				return ['wdv:'.$dataValue->getHash(), true];
509 507
 			default:
510
-				throw new InvalidArgumentException( 'unknown data type: ' . $dataType );
508
+				throw new InvalidArgumentException('unknown data type: '.$dataType);
511 509
 		}
512 510
 	}
513 511
 	// phpcs:enable
@@ -520,43 +518,43 @@  discard block
 block discarded – undo
520 518
 	 * @throws SparqlHelperException if the query times out or some other error occurs
521 519
 	 * @throws ConstraintParameterException if the $regex is invalid
522 520
 	 */
523
-	public function matchesRegularExpression( $text, $regex ) {
521
+	public function matchesRegularExpression($text, $regex) {
524 522
 		// caching wrapper around matchesRegularExpressionWithSparql
525 523
 
526
-		$textHash = hash( 'sha256', $text );
524
+		$textHash = hash('sha256', $text);
527 525
 		$cacheKey = $this->cache->makeKey(
528 526
 			'WikibaseQualityConstraints', // extension
529 527
 			'regex', // action
530 528
 			'WDQS-Java', // regex flavor
531
-			hash( 'sha256', $regex )
529
+			hash('sha256', $regex)
532 530
 		);
533 531
 
534 532
 		$cacheMapArray = $this->cache->getWithSetCallback(
535 533
 			$cacheKey,
536 534
 			WANObjectCache::TTL_DAY,
537
-			function ( $cacheMapArray ) use ( $text, $regex, $textHash ) {
535
+			function($cacheMapArray) use ($text, $regex, $textHash) {
538 536
 				// Initialize the cache map if not set
539
-				if ( $cacheMapArray === false ) {
537
+				if ($cacheMapArray === false) {
540 538
 					$key = 'wikibase.quality.constraints.regex.cache.refresh.init';
541
-					$this->dataFactory->increment( $key );
539
+					$this->dataFactory->increment($key);
542 540
 					return [];
543 541
 				}
544 542
 
545 543
 				$key = 'wikibase.quality.constraints.regex.cache.refresh';
546
-				$this->dataFactory->increment( $key );
547
-				$cacheMap = MapCacheLRU::newFromArray( $cacheMapArray, $this->cacheMapSize );
548
-				if ( $cacheMap->has( $textHash ) ) {
544
+				$this->dataFactory->increment($key);
545
+				$cacheMap = MapCacheLRU::newFromArray($cacheMapArray, $this->cacheMapSize);
546
+				if ($cacheMap->has($textHash)) {
549 547
 					$key = 'wikibase.quality.constraints.regex.cache.refresh.hit';
550
-					$this->dataFactory->increment( $key );
551
-					$cacheMap->get( $textHash ); // ping cache
548
+					$this->dataFactory->increment($key);
549
+					$cacheMap->get($textHash); // ping cache
552 550
 				} else {
553 551
 					$key = 'wikibase.quality.constraints.regex.cache.refresh.miss';
554
-					$this->dataFactory->increment( $key );
552
+					$this->dataFactory->increment($key);
555 553
 					try {
556
-						$matches = $this->matchesRegularExpressionWithSparql( $text, $regex );
557
-					} catch ( ConstraintParameterException $e ) {
558
-						$matches = $this->serializeConstraintParameterException( $e );
559
-					} catch ( SparqlHelperException $e ) {
554
+						$matches = $this->matchesRegularExpressionWithSparql($text, $regex);
555
+					} catch (ConstraintParameterException $e) {
556
+						$matches = $this->serializeConstraintParameterException($e);
557
+					} catch (SparqlHelperException $e) {
560 558
 						// don’t cache this
561 559
 						return $cacheMap->toArray();
562 560
 					}
@@ -580,42 +578,42 @@  discard block
 block discarded – undo
580 578
 			]
581 579
 		);
582 580
 
583
-		if ( isset( $cacheMapArray[$textHash] ) ) {
581
+		if (isset($cacheMapArray[$textHash])) {
584 582
 			$key = 'wikibase.quality.constraints.regex.cache.hit';
585
-			$this->dataFactory->increment( $key );
583
+			$this->dataFactory->increment($key);
586 584
 			$matches = $cacheMapArray[$textHash];
587
-			if ( is_bool( $matches ) ) {
585
+			if (is_bool($matches)) {
588 586
 				return $matches;
589
-			} elseif ( is_array( $matches ) &&
590
-				$matches['type'] == ConstraintParameterException::class ) {
591
-				throw $this->deserializeConstraintParameterException( $matches );
587
+			} elseif (is_array($matches) &&
588
+				$matches['type'] == ConstraintParameterException::class) {
589
+				throw $this->deserializeConstraintParameterException($matches);
592 590
 			} else {
593 591
 				throw new MWException(
594
-					'Value of unknown type in object cache (' .
595
-					'cache key: ' . $cacheKey . ', ' .
596
-					'cache map key: ' . $textHash . ', ' .
597
-					'value type: ' . gettype( $matches ) . ')'
592
+					'Value of unknown type in object cache ('.
593
+					'cache key: '.$cacheKey.', '.
594
+					'cache map key: '.$textHash.', '.
595
+					'value type: '.gettype($matches).')'
598 596
 				);
599 597
 			}
600 598
 		} else {
601 599
 			$key = 'wikibase.quality.constraints.regex.cache.miss';
602
-			$this->dataFactory->increment( $key );
603
-			return $this->matchesRegularExpressionWithSparql( $text, $regex );
600
+			$this->dataFactory->increment($key);
601
+			return $this->matchesRegularExpressionWithSparql($text, $regex);
604 602
 		}
605 603
 	}
606 604
 
607
-	private function serializeConstraintParameterException( ConstraintParameterException $cpe ) {
605
+	private function serializeConstraintParameterException(ConstraintParameterException $cpe) {
608 606
 		return [
609 607
 			'type' => ConstraintParameterException::class,
610
-			'violationMessage' => $this->violationMessageSerializer->serialize( $cpe->getViolationMessage() ),
608
+			'violationMessage' => $this->violationMessageSerializer->serialize($cpe->getViolationMessage()),
611 609
 		];
612 610
 	}
613 611
 
614
-	private function deserializeConstraintParameterException( array $serialization ) {
612
+	private function deserializeConstraintParameterException(array $serialization) {
615 613
 		$message = $this->violationMessageDeserializer->deserialize(
616 614
 			$serialization['violationMessage']
617 615
 		);
618
-		return new ConstraintParameterException( $message );
616
+		return new ConstraintParameterException($message);
619 617
 	}
620 618
 
621 619
 	/**
@@ -629,25 +627,25 @@  discard block
 block discarded – undo
629 627
 	 * @throws SparqlHelperException if the query times out or some other error occurs
630 628
 	 * @throws ConstraintParameterException if the $regex is invalid
631 629
 	 */
632
-	public function matchesRegularExpressionWithSparql( $text, $regex ) {
633
-		$textStringLiteral = $this->stringLiteral( $text );
634
-		$regexStringLiteral = $this->stringLiteral( '^(?:' . $regex . ')$' );
630
+	public function matchesRegularExpressionWithSparql($text, $regex) {
631
+		$textStringLiteral = $this->stringLiteral($text);
632
+		$regexStringLiteral = $this->stringLiteral('^(?:'.$regex.')$');
635 633
 
636 634
 		$query = <<<EOF
637 635
 SELECT (REGEX($textStringLiteral, $regexStringLiteral) AS ?matches) {}
638 636
 EOF;
639 637
 
640
-		$result = $this->runQuery( $query, false );
638
+		$result = $this->runQuery($query, false);
641 639
 
642 640
 		$vars = $result->getArray()['results']['bindings'][0];
643
-		if ( array_key_exists( 'matches', $vars ) ) {
641
+		if (array_key_exists('matches', $vars)) {
644 642
 			// true or false ⇒ regex okay, text matches or not
645 643
 			return $vars['matches']['value'] === 'true';
646 644
 		} else {
647 645
 			// empty result: regex broken
648 646
 			throw new ConstraintParameterException(
649
-				( new ViolationMessage( 'wbqc-violation-message-parameter-regex' ) )
650
-					->withInlineCode( $regex, Role::CONSTRAINT_PARAMETER_VALUE )
647
+				(new ViolationMessage('wbqc-violation-message-parameter-regex'))
648
+					->withInlineCode($regex, Role::CONSTRAINT_PARAMETER_VALUE)
651 649
 			);
652 650
 		}
653 651
 	}
@@ -659,14 +657,14 @@  discard block
 block discarded – undo
659 657
 	 *
660 658
 	 * @return boolean
661 659
 	 */
662
-	public function isTimeout( $responseContent ) {
663
-		$timeoutRegex = implode( '|', array_map(
664
-			function ( $fqn ) {
665
-				return preg_quote( $fqn, '/' );
660
+	public function isTimeout($responseContent) {
661
+		$timeoutRegex = implode('|', array_map(
662
+			function($fqn) {
663
+				return preg_quote($fqn, '/');
666 664
 			},
667 665
 			$this->timeoutExceptionClasses
668
-		) );
669
-		return (bool)preg_match( '/' . $timeoutRegex . '/', $responseContent );
666
+		));
667
+		return (bool) preg_match('/'.$timeoutRegex.'/', $responseContent);
670 668
 	}
671 669
 
672 670
 	/**
@@ -678,17 +676,17 @@  discard block
 block discarded – undo
678 676
 	 * @return int|boolean the max-age (in seconds)
679 677
 	 * or a plain boolean if no max-age can be determined
680 678
 	 */
681
-	public function getCacheMaxAge( $responseHeaders ) {
679
+	public function getCacheMaxAge($responseHeaders) {
682 680
 		if (
683
-			array_key_exists( 'x-cache-status', $responseHeaders ) &&
684
-			preg_match( '/^hit(?:-.*)?$/', $responseHeaders['x-cache-status'][0] )
681
+			array_key_exists('x-cache-status', $responseHeaders) &&
682
+			preg_match('/^hit(?:-.*)?$/', $responseHeaders['x-cache-status'][0])
685 683
 		) {
686 684
 			$maxage = [];
687 685
 			if (
688
-				array_key_exists( 'cache-control', $responseHeaders ) &&
689
-				preg_match( '/\bmax-age=(\d+)\b/', $responseHeaders['cache-control'][0], $maxage )
686
+				array_key_exists('cache-control', $responseHeaders) &&
687
+				preg_match('/\bmax-age=(\d+)\b/', $responseHeaders['cache-control'][0], $maxage)
690 688
 			) {
691
-				return intval( $maxage[1] );
689
+				return intval($maxage[1]);
692 690
 			} else {
693 691
 				return true;
694 692
 			}
@@ -709,34 +707,34 @@  discard block
 block discarded – undo
709 707
 	 * or SparlHelper::EMPTY_RETRY_AFTER if there is an empty Retry-After
710 708
 	 * or SparlHelper::INVALID_RETRY_AFTER if there is something wrong with the format
711 709
 	 */
712
-	public function getThrottling( MWHttpRequest $request ) {
713
-		$retryAfterValue = $request->getResponseHeader( 'Retry-After' );
714
-		if ( $retryAfterValue === null ) {
710
+	public function getThrottling(MWHttpRequest $request) {
711
+		$retryAfterValue = $request->getResponseHeader('Retry-After');
712
+		if ($retryAfterValue === null) {
715 713
 			return self::NO_RETRY_AFTER;
716 714
 		}
717 715
 
718
-		$trimmedRetryAfterValue = trim( $retryAfterValue );
719
-		if ( empty( $trimmedRetryAfterValue ) ) {
716
+		$trimmedRetryAfterValue = trim($retryAfterValue);
717
+		if (empty($trimmedRetryAfterValue)) {
720 718
 			return self::EMPTY_RETRY_AFTER;
721 719
 		}
722 720
 
723
-		if ( is_numeric( $trimmedRetryAfterValue ) ) {
724
-			$delaySeconds = (int)$trimmedRetryAfterValue;
725
-			if ( $delaySeconds >= 0 ) {
726
-				return $this->getTimestampInFuture( new DateInterval( 'PT' . $delaySeconds . 'S' ) );
721
+		if (is_numeric($trimmedRetryAfterValue)) {
722
+			$delaySeconds = (int) $trimmedRetryAfterValue;
723
+			if ($delaySeconds >= 0) {
724
+				return $this->getTimestampInFuture(new DateInterval('PT'.$delaySeconds.'S'));
727 725
 			}
728 726
 		} else {
729
-			$return = strtotime( $trimmedRetryAfterValue );
730
-			if ( !empty( $return ) ) {
731
-				return new ConvertibleTimestamp( $return );
727
+			$return = strtotime($trimmedRetryAfterValue);
728
+			if (!empty($return)) {
729
+				return new ConvertibleTimestamp($return);
732 730
 			}
733 731
 		}
734 732
 		return self::INVALID_RETRY_AFTER;
735 733
 	}
736 734
 
737
-	private function getTimestampInFuture( DateInterval $delta ) {
735
+	private function getTimestampInFuture(DateInterval $delta) {
738 736
 		$now = new ConvertibleTimestamp();
739
-		return new ConvertibleTimestamp( $now->timestamp->add( $delta ) );
737
+		return new ConvertibleTimestamp($now->timestamp->add($delta));
740 738
 	}
741 739
 
742 740
 	/**
@@ -750,65 +748,64 @@  discard block
 block discarded – undo
750 748
 	 *
751 749
 	 * @throws SparqlHelperException if the query times out or some other error occurs
752 750
 	 */
753
-	public function runQuery( $query, $needsPrefixes = true ) {
751
+	public function runQuery($query, $needsPrefixes = true) {
754 752
 
755
-		if ( $this->throttlingLock->isLocked( self::EXPIRY_LOCK_ID ) ) {
756
-			$this->dataFactory->increment( 'wikibase.quality.constraints.sparql.throttling' );
753
+		if ($this->throttlingLock->isLocked(self::EXPIRY_LOCK_ID)) {
754
+			$this->dataFactory->increment('wikibase.quality.constraints.sparql.throttling');
757 755
 			throw new TooManySparqlRequestsException();
758 756
 		}
759 757
 
760
-		if ( $this->sparqlHasWikibaseSupport ) {
758
+		if ($this->sparqlHasWikibaseSupport) {
761 759
 			$needsPrefixes = false;
762 760
 		}
763 761
 
764
-		if ( $needsPrefixes ) {
765
-			$query = $this->prefixes . $query;
762
+		if ($needsPrefixes) {
763
+			$query = $this->prefixes.$query;
766 764
 		}
767
-		$query = "#wbqc\n" . $query;
765
+		$query = "#wbqc\n".$query;
768 766
 
769
-		$url = $this->endpoint . '?' . http_build_query(
767
+		$url = $this->endpoint.'?'.http_build_query(
770 768
 			[
771 769
 				'query' => $query,
772 770
 				'format' => 'json',
773 771
 				'maxQueryTimeMillis' => $this->maxQueryTimeMillis,
774 772
 			],
775
-			null, ini_get( 'arg_separator.output' ),
773
+			null, ini_get('arg_separator.output'),
776 774
 			// encode spaces with %20, not +
777 775
 			PHP_QUERY_RFC3986
778 776
 		);
779 777
 
780 778
 		$options = [
781 779
 			'method' => 'GET',
782
-			'timeout' => (int)round( ( $this->maxQueryTimeMillis + 1000 ) / 1000 ),
780
+			'timeout' => (int) round(($this->maxQueryTimeMillis + 1000) / 1000),
783 781
 			'connectTimeout' => 'default',
784 782
 			'userAgent' => $this->defaultUserAgent,
785 783
 		];
786
-		$request = $this->requestFactory->create( $url, $options, __METHOD__ );
787
-		$startTime = microtime( true );
784
+		$request = $this->requestFactory->create($url, $options, __METHOD__);
785
+		$startTime = microtime(true);
788 786
 		$requestStatus = $request->execute();
789
-		$endTime = microtime( true );
787
+		$endTime = microtime(true);
790 788
 		$this->dataFactory->timing(
791 789
 			'wikibase.quality.constraints.sparql.timing',
792
-			( $endTime - $startTime ) * 1000
790
+			($endTime - $startTime) * 1000
793 791
 		);
794 792
 
795
-		$this->guardAgainstTooManyRequestsError( $request );
793
+		$this->guardAgainstTooManyRequestsError($request);
796 794
 
797
-		$maxAge = $this->getCacheMaxAge( $request->getResponseHeaders() );
798
-		if ( $maxAge ) {
799
-			$this->dataFactory->increment( 'wikibase.quality.constraints.sparql.cached' );
795
+		$maxAge = $this->getCacheMaxAge($request->getResponseHeaders());
796
+		if ($maxAge) {
797
+			$this->dataFactory->increment('wikibase.quality.constraints.sparql.cached');
800 798
 		}
801 799
 
802
-		if ( $requestStatus->isOK() ) {
800
+		if ($requestStatus->isOK()) {
803 801
 			$json = $request->getContent();
804
-			$jsonStatus = FormatJson::parse( $json, FormatJson::FORCE_ASSOC );
805
-			if ( $jsonStatus->isOK() ) {
802
+			$jsonStatus = FormatJson::parse($json, FormatJson::FORCE_ASSOC);
803
+			if ($jsonStatus->isOK()) {
806 804
 				return new CachedQueryResults(
807 805
 					$jsonStatus->getValue(),
808 806
 					Metadata::ofCachingMetadata(
809 807
 						$maxAge ?
810
-							CachingMetadata::ofMaximumAgeInSeconds( $maxAge ) :
811
-							CachingMetadata::fresh()
808
+							CachingMetadata::ofMaximumAgeInSeconds($maxAge) : CachingMetadata::fresh()
812 809
 					)
813 810
 				);
814 811
 			} else {
@@ -825,9 +822,9 @@  discard block
 block discarded – undo
825 822
 			// fall through to general error handling
826 823
 		}
827 824
 
828
-		$this->dataFactory->increment( 'wikibase.quality.constraints.sparql.error' );
825
+		$this->dataFactory->increment('wikibase.quality.constraints.sparql.error');
829 826
 
830
-		if ( $this->isTimeout( $request->getContent() ) ) {
827
+		if ($this->isTimeout($request->getContent())) {
831 828
 			$this->dataFactory->increment(
832 829
 				'wikibase.quality.constraints.sparql.error.timeout'
833 830
 			);
@@ -842,29 +839,29 @@  discard block
 block discarded – undo
842 839
 	 * @param MWHttpRequest $request
843 840
 	 * @throws TooManySparqlRequestsException
844 841
 	 */
845
-	private function guardAgainstTooManyRequestsError( MWHttpRequest $request ): void {
846
-		if ( $request->getStatus() !== self::HTTP_TOO_MANY_REQUESTS ) {
842
+	private function guardAgainstTooManyRequestsError(MWHttpRequest $request): void {
843
+		if ($request->getStatus() !== self::HTTP_TOO_MANY_REQUESTS) {
847 844
 			return;
848 845
 		}
849 846
 
850 847
 		$fallbackBlockDuration = $this->sparqlThrottlingFallbackDuration;
851 848
 
852
-		if ( $fallbackBlockDuration < 0 ) {
853
-			throw new InvalidArgumentException( 'Fallback duration must be positive int but is: ' .
854
-				$fallbackBlockDuration );
849
+		if ($fallbackBlockDuration < 0) {
850
+			throw new InvalidArgumentException('Fallback duration must be positive int but is: '.
851
+				$fallbackBlockDuration);
855 852
 		}
856 853
 
857
-		$this->dataFactory->increment( 'wikibase.quality.constraints.sparql.throttling' );
858
-		$throttlingUntil = $this->getThrottling( $request );
859
-		if ( !( $throttlingUntil instanceof ConvertibleTimestamp ) ) {
860
-			$this->loggingHelper->logSparqlHelperTooManyRequestsRetryAfterInvalid( $request );
854
+		$this->dataFactory->increment('wikibase.quality.constraints.sparql.throttling');
855
+		$throttlingUntil = $this->getThrottling($request);
856
+		if (!($throttlingUntil instanceof ConvertibleTimestamp)) {
857
+			$this->loggingHelper->logSparqlHelperTooManyRequestsRetryAfterInvalid($request);
861 858
 			$this->throttlingLock->lock(
862 859
 				self::EXPIRY_LOCK_ID,
863
-				$this->getTimestampInFuture( new DateInterval( 'PT' . $fallbackBlockDuration . 'S' ) )
860
+				$this->getTimestampInFuture(new DateInterval('PT'.$fallbackBlockDuration.'S'))
864 861
 			);
865 862
 		} else {
866
-			$this->loggingHelper->logSparqlHelperTooManyRequestsRetryAfterPresent( $throttlingUntil, $request );
867
-			$this->throttlingLock->lock( self::EXPIRY_LOCK_ID, $throttlingUntil );
863
+			$this->loggingHelper->logSparqlHelperTooManyRequestsRetryAfterPresent($throttlingUntil, $request);
864
+			$this->throttlingLock->lock(self::EXPIRY_LOCK_ID, $throttlingUntil);
868 865
 		}
869 866
 		throw new TooManySparqlRequestsException();
870 867
 	}
Please login to merge, or discard this patch.
src/Api/CheckConstraintParameters.php 1 patch
Spacing   +51 added lines, -51 removed lines patch added patch discarded remove patch
@@ -78,16 +78,16 @@  discard block
 block discarded – undo
78 78
 		DelegatingConstraintChecker $delegatingConstraintChecker
79 79
 	): self {
80 80
 		$repo = WikibaseRepo::getDefaultInstance();
81
-		$helperFactory = $repo->getApiHelperFactory( RequestContext::getMain() );
81
+		$helperFactory = $repo->getApiHelperFactory(RequestContext::getMain());
82 82
 		$language = WikibaseRepo::getUserLanguage();
83 83
 
84 84
 		$entityIdHtmlLinkFormatterFactory = $repo->getEntityIdHtmlLinkFormatterFactory();
85 85
 		$entityIdHtmlLinkFormatter = $entityIdHtmlLinkFormatterFactory
86
-			->getEntityIdFormatter( $language );
86
+			->getEntityIdFormatter($language);
87 87
 		$formatterOptions = new FormatterOptions();
88
-		$formatterOptions->setOption( SnakFormatter::OPT_LANG, $language->getCode() );
88
+		$formatterOptions->setOption(SnakFormatter::OPT_LANG, $language->getCode());
89 89
 		$dataValueFormatter = $valueFormatterFactory
90
-			->getValueFormatter( SnakFormatter::FORMAT_HTML, $formatterOptions );
90
+			->getValueFormatter(SnakFormatter::FORMAT_HTML, $formatterOptions);
91 91
 		$violationMessageRenderer = new MultilingualTextViolationMessageRenderer(
92 92
 			$entityIdHtmlLinkFormatter,
93 93
 			$dataValueFormatter,
@@ -123,9 +123,9 @@  discard block
 block discarded – undo
123 123
 		StatementGuidParser $statementGuidParser,
124 124
 		IBufferingStatsdDataFactory $dataFactory
125 125
 	) {
126
-		parent::__construct( $main, $name );
126
+		parent::__construct($main, $name);
127 127
 
128
-		$this->apiErrorReporter = $apiHelperFactory->getErrorReporter( $this );
128
+		$this->apiErrorReporter = $apiHelperFactory->getErrorReporter($this);
129 129
 		$this->delegatingConstraintChecker = $delegatingConstraintChecker;
130 130
 		$this->violationMessageRenderer = $violationMessageRenderer;
131 131
 		$this->statementGuidParser = $statementGuidParser;
@@ -140,39 +140,39 @@  discard block
 block discarded – undo
140 140
 		$params = $this->extractRequestParams();
141 141
 		$result = $this->getResult();
142 142
 
143
-		$propertyIds = $this->parsePropertyIds( $params[self::PARAM_PROPERTY_ID] );
144
-		$constraintIds = $this->parseConstraintIds( $params[self::PARAM_CONSTRAINT_ID] );
143
+		$propertyIds = $this->parsePropertyIds($params[self::PARAM_PROPERTY_ID]);
144
+		$constraintIds = $this->parseConstraintIds($params[self::PARAM_CONSTRAINT_ID]);
145 145
 
146
-		$this->checkPropertyIds( $propertyIds, $result );
147
-		$this->checkConstraintIds( $constraintIds, $result );
146
+		$this->checkPropertyIds($propertyIds, $result);
147
+		$this->checkConstraintIds($constraintIds, $result);
148 148
 
149
-		$result->addValue( null, 'success', 1 );
149
+		$result->addValue(null, 'success', 1);
150 150
 	}
151 151
 
152 152
 	/**
153 153
 	 * @param array|null $propertyIdSerializations
154 154
 	 * @return PropertyId[]
155 155
 	 */
156
-	private function parsePropertyIds( $propertyIdSerializations ) {
157
-		if ( $propertyIdSerializations === null ) {
156
+	private function parsePropertyIds($propertyIdSerializations) {
157
+		if ($propertyIdSerializations === null) {
158 158
 			return [];
159
-		} elseif ( empty( $propertyIdSerializations ) ) {
159
+		} elseif (empty($propertyIdSerializations)) {
160 160
 			$this->apiErrorReporter->dieError(
161
-				'If ' . self::PARAM_PROPERTY_ID . ' is specified, it must be nonempty.',
161
+				'If '.self::PARAM_PROPERTY_ID.' is specified, it must be nonempty.',
162 162
 				'no-data'
163 163
 			);
164 164
 		}
165 165
 
166 166
 		return array_map(
167
-			function ( $propertyIdSerialization ) {
167
+			function($propertyIdSerialization) {
168 168
 				try {
169
-					return new PropertyId( $propertyIdSerialization );
170
-				} catch ( InvalidArgumentException $e ) {
169
+					return new PropertyId($propertyIdSerialization);
170
+				} catch (InvalidArgumentException $e) {
171 171
 					$this->apiErrorReporter->dieError(
172 172
 						"Invalid id: $propertyIdSerialization",
173 173
 						'invalid-property-id',
174 174
 						0, // default argument
175
-						[ self::PARAM_PROPERTY_ID => $propertyIdSerialization ]
175
+						[self::PARAM_PROPERTY_ID => $propertyIdSerialization]
176 176
 					);
177 177
 				}
178 178
 			},
@@ -184,35 +184,35 @@  discard block
 block discarded – undo
184 184
 	 * @param array|null $constraintIds
185 185
 	 * @return string[]
186 186
 	 */
187
-	private function parseConstraintIds( $constraintIds ) {
188
-		if ( $constraintIds === null ) {
187
+	private function parseConstraintIds($constraintIds) {
188
+		if ($constraintIds === null) {
189 189
 			return [];
190
-		} elseif ( empty( $constraintIds ) ) {
190
+		} elseif (empty($constraintIds)) {
191 191
 			$this->apiErrorReporter->dieError(
192
-				'If ' . self::PARAM_CONSTRAINT_ID . ' is specified, it must be nonempty.',
192
+				'If '.self::PARAM_CONSTRAINT_ID.' is specified, it must be nonempty.',
193 193
 				'no-data'
194 194
 			);
195 195
 		}
196 196
 
197 197
 		return array_map(
198
-			function ( $constraintId ) {
198
+			function($constraintId) {
199 199
 				try {
200
-					$propertyId = $this->statementGuidParser->parse( $constraintId )->getEntityId();
201
-					if ( !$propertyId instanceof PropertyId ) {
200
+					$propertyId = $this->statementGuidParser->parse($constraintId)->getEntityId();
201
+					if (!$propertyId instanceof PropertyId) {
202 202
 						$this->apiErrorReporter->dieError(
203 203
 							"Invalid property ID: {$propertyId->getSerialization()}",
204 204
 							'invalid-property-id',
205 205
 							0, // default argument
206
-							[ self::PARAM_CONSTRAINT_ID => $constraintId ]
206
+							[self::PARAM_CONSTRAINT_ID => $constraintId]
207 207
 						);
208 208
 					}
209 209
 					return $constraintId;
210
-				} catch ( StatementGuidParsingException $e ) {
210
+				} catch (StatementGuidParsingException $e) {
211 211
 					$this->apiErrorReporter->dieError(
212 212
 						"Invalid statement GUID: $constraintId",
213 213
 						'invalid-guid',
214 214
 						0, // default argument
215
-						[ self::PARAM_CONSTRAINT_ID => $constraintId ]
215
+						[self::PARAM_CONSTRAINT_ID => $constraintId]
216 216
 					);
217 217
 				}
218 218
 			},
@@ -224,12 +224,12 @@  discard block
 block discarded – undo
224 224
 	 * @param PropertyId[] $propertyIds
225 225
 	 * @param ApiResult $result
226 226
 	 */
227
-	private function checkPropertyIds( array $propertyIds, ApiResult $result ) {
228
-		foreach ( $propertyIds as $propertyId ) {
229
-			$result->addArrayType( $this->getResultPathForPropertyId( $propertyId ), 'assoc' );
227
+	private function checkPropertyIds(array $propertyIds, ApiResult $result) {
228
+		foreach ($propertyIds as $propertyId) {
229
+			$result->addArrayType($this->getResultPathForPropertyId($propertyId), 'assoc');
230 230
 			$allConstraintExceptions = $this->delegatingConstraintChecker
231
-				->checkConstraintParametersOnPropertyId( $propertyId );
232
-			foreach ( $allConstraintExceptions as $constraintId => $constraintParameterExceptions ) {
231
+				->checkConstraintParametersOnPropertyId($propertyId);
232
+			foreach ($allConstraintExceptions as $constraintId => $constraintParameterExceptions) {
233 233
 				$this->addConstraintParameterExceptionsToResult(
234 234
 					$constraintId,
235 235
 					$constraintParameterExceptions,
@@ -243,15 +243,15 @@  discard block
 block discarded – undo
243 243
 	 * @param string[] $constraintIds
244 244
 	 * @param ApiResult $result
245 245
 	 */
246
-	private function checkConstraintIds( array $constraintIds, ApiResult $result ) {
247
-		foreach ( $constraintIds as $constraintId ) {
248
-			if ( $result->getResultData( $this->getResultPathForConstraintId( $constraintId ) ) ) {
246
+	private function checkConstraintIds(array $constraintIds, ApiResult $result) {
247
+		foreach ($constraintIds as $constraintId) {
248
+			if ($result->getResultData($this->getResultPathForConstraintId($constraintId))) {
249 249
 				// already checked as part of checkPropertyIds()
250 250
 				continue;
251 251
 			}
252 252
 			$constraintParameterExceptions = $this->delegatingConstraintChecker
253
-				->checkConstraintParametersOnConstraintId( $constraintId );
254
-			$this->addConstraintParameterExceptionsToResult( $constraintId, $constraintParameterExceptions, $result );
253
+				->checkConstraintParametersOnConstraintId($constraintId);
254
+			$this->addConstraintParameterExceptionsToResult($constraintId, $constraintParameterExceptions, $result);
255 255
 		}
256 256
 	}
257 257
 
@@ -259,18 +259,18 @@  discard block
 block discarded – undo
259 259
 	 * @param PropertyId $propertyId
260 260
 	 * @return string[]
261 261
 	 */
262
-	private function getResultPathForPropertyId( PropertyId $propertyId ) {
263
-		return [ $this->getModuleName(), $propertyId->getSerialization() ];
262
+	private function getResultPathForPropertyId(PropertyId $propertyId) {
263
+		return [$this->getModuleName(), $propertyId->getSerialization()];
264 264
 	}
265 265
 
266 266
 	/**
267 267
 	 * @param string $constraintId
268 268
 	 * @return string[]
269 269
 	 */
270
-	private function getResultPathForConstraintId( $constraintId ) {
271
-		$propertyId = $this->statementGuidParser->parse( $constraintId )->getEntityId();
270
+	private function getResultPathForConstraintId($constraintId) {
271
+		$propertyId = $this->statementGuidParser->parse($constraintId)->getEntityId();
272 272
 		'@phan-var PropertyId $propertyId';
273
-		return array_merge( $this->getResultPathForPropertyId( $propertyId ), [ $constraintId ] );
273
+		return array_merge($this->getResultPathForPropertyId($propertyId), [$constraintId]);
274 274
 	}
275 275
 
276 276
 	/**
@@ -285,8 +285,8 @@  discard block
 block discarded – undo
285 285
 		$constraintParameterExceptions,
286 286
 		ApiResult $result
287 287
 	) {
288
-		$path = $this->getResultPathForConstraintId( $constraintId );
289
-		if ( $constraintParameterExceptions === null ) {
288
+		$path = $this->getResultPathForConstraintId($constraintId);
289
+		if ($constraintParameterExceptions === null) {
290 290
 			$result->addValue(
291 291
 				$path,
292 292
 				self::KEY_STATUS,
@@ -296,12 +296,12 @@  discard block
 block discarded – undo
296 296
 			$result->addValue(
297 297
 				$path,
298 298
 				self::KEY_STATUS,
299
-				empty( $constraintParameterExceptions ) ? self::STATUS_OKAY : self::STATUS_NOT_OKAY
299
+				empty($constraintParameterExceptions) ? self::STATUS_OKAY : self::STATUS_NOT_OKAY
300 300
 			);
301 301
 			$result->addValue(
302 302
 				$path,
303 303
 				self::KEY_PROBLEMS,
304
-				array_map( [ $this, 'formatConstraintParameterException' ], $constraintParameterExceptions )
304
+				array_map([$this, 'formatConstraintParameterException'], $constraintParameterExceptions)
305 305
 			);
306 306
 		}
307 307
 	}
@@ -312,7 +312,7 @@  discard block
 block discarded – undo
312 312
 	 * @param ConstraintParameterException $e
313 313
 	 * @return string[]
314 314
 	 */
315
-	private function formatConstraintParameterException( ConstraintParameterException $e ) {
315
+	private function formatConstraintParameterException(ConstraintParameterException $e) {
316 316
 		return [
317 317
 			self::KEY_MESSAGE_HTML => $this->violationMessageRenderer->render(
318 318
 				$e->getViolationMessage()
@@ -345,8 +345,8 @@  discard block
 block discarded – undo
345 345
 		return [
346 346
 			'action=wbcheckconstraintparameters&propertyid=P247'
347 347
 				=> 'apihelp-wbcheckconstraintparameters-example-propertyid-1',
348
-			'action=wbcheckconstraintparameters&' .
349
-			'constraintid=P247$0fe1711e-4c0f-82ce-3af0-830b721d0fba|' .
348
+			'action=wbcheckconstraintparameters&'.
349
+			'constraintid=P247$0fe1711e-4c0f-82ce-3af0-830b721d0fba|'.
350 350
 			'P225$cdc71e4a-47a0-12c5-dfb3-3f6fc0b6613f'
351 351
 				=> 'apihelp-wbcheckconstraintparameters-example-constraintid-2',
352 352
 		];
Please login to merge, or discard this patch.
src/Api/CheckConstraints.php 1 patch
Spacing   +33 added lines, -33 removed lines patch added patch discarded remove patch
@@ -86,13 +86,13 @@  discard block
 block discarded – undo
86 86
 
87 87
 		$language = WikibaseRepo::getUserLanguage();
88 88
 		$formatterOptions = new FormatterOptions();
89
-		$formatterOptions->setOption( SnakFormatter::OPT_LANG, $language->getCode() );
90
-		$valueFormatter = $valueFormatterFactory->getValueFormatter( SnakFormatter::FORMAT_HTML, $formatterOptions );
89
+		$formatterOptions->setOption(SnakFormatter::OPT_LANG, $language->getCode());
90
+		$valueFormatter = $valueFormatterFactory->getValueFormatter(SnakFormatter::FORMAT_HTML, $formatterOptions);
91 91
 
92 92
 		$entityIdHtmlLinkFormatterFactory = $repo->getEntityIdHtmlLinkFormatterFactory();
93
-		$entityIdHtmlLinkFormatter = $entityIdHtmlLinkFormatterFactory->getEntityIdFormatter( $language );
93
+		$entityIdHtmlLinkFormatter = $entityIdHtmlLinkFormatterFactory->getEntityIdFormatter($language);
94 94
 		$entityIdLabelFormatterFactory = new EntityIdLabelFormatterFactory();
95
-		$entityIdLabelFormatter = $entityIdLabelFormatterFactory->getEntityIdFormatter( $language );
95
+		$entityIdLabelFormatter = $entityIdLabelFormatterFactory->getEntityIdFormatter($language);
96 96
 
97 97
 		$checkResultsRenderer = new CheckResultsRenderer(
98 98
 			$entityTitleLookup,
@@ -110,7 +110,7 @@  discard block
 block discarded – undo
110 110
 			$name,
111 111
 			$entityIdParser,
112 112
 			$statementGuidValidator,
113
-			$repo->getApiHelperFactory( RequestContext::getMain() ),
113
+			$repo->getApiHelperFactory(RequestContext::getMain()),
114 114
 			$resultsSource,
115 115
 			$checkResultsRenderer,
116 116
 			$dataFactory
@@ -137,11 +137,11 @@  discard block
 block discarded – undo
137 137
 		CheckResultsRenderer $checkResultsRenderer,
138 138
 		IBufferingStatsdDataFactory $dataFactory
139 139
 	) {
140
-		parent::__construct( $main, $name );
140
+		parent::__construct($main, $name);
141 141
 		$this->entityIdParser = $entityIdParser;
142 142
 		$this->statementGuidValidator = $statementGuidValidator;
143
-		$this->resultBuilder = $apiHelperFactory->getResultBuilder( $this );
144
-		$this->errorReporter = $apiHelperFactory->getErrorReporter( $this );
143
+		$this->resultBuilder = $apiHelperFactory->getResultBuilder($this);
144
+		$this->errorReporter = $apiHelperFactory->getErrorReporter($this);
145 145
 		$this->resultsSource = $resultsSource;
146 146
 		$this->checkResultsRenderer = $checkResultsRenderer;
147 147
 		$this->dataFactory = $dataFactory;
@@ -157,9 +157,9 @@  discard block
 block discarded – undo
157 157
 
158 158
 		$params = $this->extractRequestParams();
159 159
 
160
-		$this->validateParameters( $params );
161
-		$entityIds = $this->parseEntityIds( $params );
162
-		$claimIds = $this->parseClaimIds( $params );
160
+		$this->validateParameters($params);
161
+		$entityIds = $this->parseEntityIds($params);
162
+		$claimIds = $this->parseClaimIds($params);
163 163
 		$constraintIDs = $params[self::PARAM_CONSTRAINT_ID];
164 164
 		$statuses = $params[self::PARAM_STATUS];
165 165
 
@@ -175,7 +175,7 @@  discard block
 block discarded – undo
175 175
 				)
176 176
 			)->getArray()
177 177
 		);
178
-		$this->resultBuilder->markSuccess( 1 );
178
+		$this->resultBuilder->markSuccess(1);
179 179
 	}
180 180
 
181 181
 	/**
@@ -183,24 +183,24 @@  discard block
 block discarded – undo
183 183
 	 *
184 184
 	 * @return EntityId[]
185 185
 	 */
186
-	private function parseEntityIds( array $params ) {
186
+	private function parseEntityIds(array $params) {
187 187
 		$ids = $params[self::PARAM_ID];
188 188
 
189
-		if ( $ids === null ) {
189
+		if ($ids === null) {
190 190
 			return [];
191
-		} elseif ( $ids === [] ) {
191
+		} elseif ($ids === []) {
192 192
 			$this->errorReporter->dieError(
193
-				'If ' . self::PARAM_ID . ' is specified, it must be nonempty.', 'no-data' );
193
+				'If '.self::PARAM_ID.' is specified, it must be nonempty.', 'no-data' );
194 194
 		}
195 195
 
196
-		return array_map( function ( $id ) {
196
+		return array_map(function($id) {
197 197
 			try {
198
-				return $this->entityIdParser->parse( $id );
199
-			} catch ( EntityIdParsingException $e ) {
198
+				return $this->entityIdParser->parse($id);
199
+			} catch (EntityIdParsingException $e) {
200 200
 				$this->errorReporter->dieError(
201
-					"Invalid id: $id", 'invalid-entity-id', 0, [ self::PARAM_ID => $id ] );
201
+					"Invalid id: $id", 'invalid-entity-id', 0, [self::PARAM_ID => $id] );
202 202
 			}
203
-		}, $ids );
203
+		}, $ids);
204 204
 	}
205 205
 
206 206
 	/**
@@ -208,35 +208,35 @@  discard block
 block discarded – undo
208 208
 	 *
209 209
 	 * @return string[]
210 210
 	 */
211
-	private function parseClaimIds( array $params ) {
211
+	private function parseClaimIds(array $params) {
212 212
 		$ids = $params[self::PARAM_CLAIM_ID];
213 213
 
214
-		if ( $ids === null ) {
214
+		if ($ids === null) {
215 215
 			return [];
216
-		} elseif ( $ids === [] ) {
216
+		} elseif ($ids === []) {
217 217
 			$this->errorReporter->dieError(
218
-				'If ' . self::PARAM_CLAIM_ID . ' is specified, it must be nonempty.', 'no-data' );
218
+				'If '.self::PARAM_CLAIM_ID.' is specified, it must be nonempty.', 'no-data' );
219 219
 		}
220 220
 
221
-		foreach ( $ids as $id ) {
222
-			if ( !$this->statementGuidValidator->validate( $id ) ) {
221
+		foreach ($ids as $id) {
222
+			if (!$this->statementGuidValidator->validate($id)) {
223 223
 				$this->errorReporter->dieError(
224
-					"Invalid claim id: $id", 'invalid-guid', 0, [ self::PARAM_CLAIM_ID => $id ] );
224
+					"Invalid claim id: $id", 'invalid-guid', 0, [self::PARAM_CLAIM_ID => $id] );
225 225
 			}
226 226
 		}
227 227
 
228 228
 		return $ids;
229 229
 	}
230 230
 
231
-	private function validateParameters( array $params ) {
232
-		if ( $params[self::PARAM_CONSTRAINT_ID] !== null
233
-			 && empty( $params[self::PARAM_CONSTRAINT_ID] )
231
+	private function validateParameters(array $params) {
232
+		if ($params[self::PARAM_CONSTRAINT_ID] !== null
233
+			 && empty($params[self::PARAM_CONSTRAINT_ID])
234 234
 		) {
235 235
 			$paramConstraintId = self::PARAM_CONSTRAINT_ID;
236 236
 			$this->errorReporter->dieError(
237 237
 				"If $paramConstraintId is specified, it must be nonempty.", 'no-data' );
238 238
 		}
239
-		if ( $params[self::PARAM_ID] === null && $params[self::PARAM_CLAIM_ID] === null ) {
239
+		if ($params[self::PARAM_ID] === null && $params[self::PARAM_CLAIM_ID] === null) {
240 240
 			$paramId = self::PARAM_ID;
241 241
 			$paramClaimId = self::PARAM_CLAIM_ID;
242 242
 			$this->errorReporter->dieError(
@@ -277,7 +277,7 @@  discard block
 block discarded – undo
277 277
 				],
278 278
 				ApiBase::PARAM_ISMULTI => true,
279 279
 				ApiBase::PARAM_ALL => true,
280
-				ApiBase::PARAM_DFLT => implode( '|', CachingResultsSource::CACHED_STATUSES ),
280
+				ApiBase::PARAM_DFLT => implode('|', CachingResultsSource::CACHED_STATUSES),
281 281
 				ApiBase::PARAM_HELP_MSG_PER_VALUE => [],
282 282
 			],
283 283
 		];
Please login to merge, or discard this patch.
maintenance/ImportConstraintEntities.php 1 patch
Spacing   +59 added lines, -59 removed lines patch added patch discarded remove patch
@@ -17,10 +17,10 @@  discard block
 block discarded – undo
17 17
 use Wikibase\Repo\WikibaseRepo;
18 18
 
19 19
 // @codeCoverageIgnoreStart
20
-$basePath = getenv( "MW_INSTALL_PATH" ) !== false
21
-	? getenv( "MW_INSTALL_PATH" ) : __DIR__ . "/../../..";
20
+$basePath = getenv("MW_INSTALL_PATH") !== false
21
+	? getenv("MW_INSTALL_PATH") : __DIR__."/../../..";
22 22
 
23
-require_once $basePath . "/maintenance/Maintenance.php";
23
+require_once $basePath."/maintenance/Maintenance.php";
24 24
 // @codeCoverageIgnoreEnd
25 25
 
26 26
 /**
@@ -59,20 +59,20 @@  discard block
 block discarded – undo
59 59
 		parent::__construct();
60 60
 
61 61
 		$this->addDescription(
62
-			'Import entities needed for constraint checks ' .
62
+			'Import entities needed for constraint checks '.
63 63
 			'from Wikidata into the local repository.'
64 64
 		);
65 65
 		$this->addOption(
66 66
 			'config-format',
67
-			'The format in which the resulting configuration will be omitted: ' .
68
-			'"globals" for directly settings global variables, suitable for inclusion in LocalSettings.php (default), ' .
67
+			'The format in which the resulting configuration will be omitted: '.
68
+			'"globals" for directly settings global variables, suitable for inclusion in LocalSettings.php (default), '.
69 69
 			'or "wgConf" for printing parts of arrays suitable for inclusion in $wgConf->settings.'
70 70
 		);
71 71
 		$this->addOption(
72 72
 			'dry-run',
73 73
 			'Don’t actually import entities, just print which ones would be imported.'
74 74
 		);
75
-		$this->requireExtension( 'WikibaseQualityConstraints' );
75
+		$this->requireExtension('WikibaseQualityConstraints');
76 76
 	}
77 77
 
78 78
 	/**
@@ -80,12 +80,12 @@  discard block
 block discarded – undo
80 80
 	 */
81 81
 	private function setupServices() {
82 82
 		$services = MediaWikiServices::getInstance();
83
-		$this->entitySerializer = WikibaseRepo::getAllTypesEntitySerializer( $services );
84
-		$this->entityDeserializer = WikibaseRepo::getInternalFormatEntityDeserializer( $services );
85
-		$this->entityStore = WikibaseRepo::getEntityStore( $services );
83
+		$this->entitySerializer = WikibaseRepo::getAllTypesEntitySerializer($services);
84
+		$this->entityDeserializer = WikibaseRepo::getInternalFormatEntityDeserializer($services);
85
+		$this->entityStore = WikibaseRepo::getEntityStore($services);
86 86
 		$this->httpRequestFactory = $services->getHttpRequestFactory();
87
-		if ( !$this->getOption( 'dry-run', false ) ) {
88
-			$this->user = User::newSystemUser( 'WikibaseQualityConstraints importer' );
87
+		if (!$this->getOption('dry-run', false)) {
88
+			$this->user = User::newSystemUser('WikibaseQualityConstraints importer');
89 89
 		}
90 90
 	}
91 91
 
@@ -94,21 +94,21 @@  discard block
 block discarded – undo
94 94
 
95 95
 		$configUpdates = [];
96 96
 
97
-		$extensionJsonFile = __DIR__ . '/../extension.json';
98
-		$extensionJsonText = file_get_contents( $extensionJsonFile );
99
-		$extensionJson = json_decode( $extensionJsonText, /* assoc = */ true );
97
+		$extensionJsonFile = __DIR__.'/../extension.json';
98
+		$extensionJsonText = file_get_contents($extensionJsonFile);
99
+		$extensionJson = json_decode($extensionJsonText, /* assoc = */ true);
100 100
 		// @phan-suppress-next-line PhanTypeArraySuspiciousNullable
101
-		$wikidataEntityIds = $this->getEntitiesToImport( $extensionJson['config'], $this->getConfig() );
101
+		$wikidataEntityIds = $this->getEntitiesToImport($extensionJson['config'], $this->getConfig());
102 102
 
103
-		foreach ( $wikidataEntityIds as $key => $wikidataEntityId ) {
104
-			$localEntityId = $this->importEntityFromWikidata( $wikidataEntityId );
103
+		foreach ($wikidataEntityIds as $key => $wikidataEntityId) {
104
+			$localEntityId = $this->importEntityFromWikidata($wikidataEntityId);
105 105
 			$configUpdates[$key] = [
106 106
 				'wikidata' => $wikidataEntityId,
107 107
 				'local' => $localEntityId,
108 108
 			];
109 109
 		}
110 110
 
111
-		$this->outputConfigUpdates( $configUpdates );
111
+		$this->outputConfigUpdates($configUpdates);
112 112
 	}
113 113
 
114 114
 	/**
@@ -116,18 +116,18 @@  discard block
 block discarded – undo
116 116
 	 * @param Config $wikiConfig
117 117
 	 * @return string[]
118 118
 	 */
119
-	private function getEntitiesToImport( array $extensionJsonConfig, Config $wikiConfig ) {
119
+	private function getEntitiesToImport(array $extensionJsonConfig, Config $wikiConfig) {
120 120
 		$wikidataEntityIds = [];
121 121
 
122
-		foreach ( $extensionJsonConfig as $key => $value ) {
123
-			if ( !preg_match( '/Id$/', $key ) ) {
122
+		foreach ($extensionJsonConfig as $key => $value) {
123
+			if (!preg_match('/Id$/', $key)) {
124 124
 				continue;
125 125
 			}
126 126
 
127 127
 			$wikidataEntityId = $value['value'];
128
-			$localEntityId = $wikiConfig->get( $key );
128
+			$localEntityId = $wikiConfig->get($key);
129 129
 
130
-			if ( $localEntityId === $wikidataEntityId ) {
130
+			if ($localEntityId === $wikidataEntityId) {
131 131
 				$wikidataEntityIds[$key] = $wikidataEntityId;
132 132
 			}
133 133
 		}
@@ -139,10 +139,10 @@  discard block
 block discarded – undo
139 139
 	 * @param string $wikidataEntityId
140 140
 	 * @return string local entity ID
141 141
 	 */
142
-	private function importEntityFromWikidata( $wikidataEntityId ) {
142
+	private function importEntityFromWikidata($wikidataEntityId) {
143 143
 		$wikidataEntityUrl = "https://www.wikidata.org/wiki/Special:EntityData/$wikidataEntityId.json";
144
-		$wikidataEntitiesJson = $this->httpRequestFactory->get( $wikidataEntityUrl, [], __METHOD__ );
145
-		return $this->importEntityFromJson( $wikidataEntityId, $wikidataEntitiesJson );
144
+		$wikidataEntitiesJson = $this->httpRequestFactory->get($wikidataEntityUrl, [], __METHOD__);
145
+		return $this->importEntityFromJson($wikidataEntityId, $wikidataEntitiesJson);
146 146
 	}
147 147
 
148 148
 	/**
@@ -150,24 +150,24 @@  discard block
 block discarded – undo
150 150
 	 * @param string $wikidataEntitiesJson
151 151
 	 * @return string local entity ID
152 152
 	 */
153
-	private function importEntityFromJson( $wikidataEntityId, $wikidataEntitiesJson ) {
153
+	private function importEntityFromJson($wikidataEntityId, $wikidataEntitiesJson) {
154 154
 		// @phan-suppress-next-line PhanTypeArraySuspiciousNullable
155
-		$wikidataEntityArray = json_decode( $wikidataEntitiesJson, true )['entities'][$wikidataEntityId];
156
-		$wikidataEntity = $this->entityDeserializer->deserialize( $wikidataEntityArray );
155
+		$wikidataEntityArray = json_decode($wikidataEntitiesJson, true)['entities'][$wikidataEntityId];
156
+		$wikidataEntity = $this->entityDeserializer->deserialize($wikidataEntityArray);
157 157
 
158
-		$wikidataEntity->setId( null );
158
+		$wikidataEntity->setId(null);
159 159
 
160
-		if ( $wikidataEntity instanceof StatementListProvider ) {
160
+		if ($wikidataEntity instanceof StatementListProvider) {
161 161
 			$wikidataEntity->getStatements()->clear();
162 162
 		}
163 163
 
164
-		if ( $wikidataEntity instanceof Item ) {
165
-			$wikidataEntity->setSiteLinkList( new SiteLinkList() );
164
+		if ($wikidataEntity instanceof Item) {
165
+			$wikidataEntity->setSiteLinkList(new SiteLinkList());
166 166
 		}
167 167
 
168
-		if ( $this->getOption( 'dry-run', false ) ) {
169
-			$wikidataEntityJson = json_encode( $this->entitySerializer->serialize( $wikidataEntity ) );
170
-			$this->output( $wikidataEntityJson . "\n" );
168
+		if ($this->getOption('dry-run', false)) {
169
+			$wikidataEntityJson = json_encode($this->entitySerializer->serialize($wikidataEntity));
170
+			$this->output($wikidataEntityJson."\n");
171 171
 			return "-$wikidataEntityId";
172 172
 		}
173 173
 
@@ -180,12 +180,12 @@  discard block
 block discarded – undo
180 180
 			)->getEntity();
181 181
 
182 182
 			return $localEntity->getId()->getSerialization();
183
-		} catch ( StorageException $storageException ) {
184
-			return $this->storageExceptionToEntityId( $storageException );
183
+		} catch (StorageException $storageException) {
184
+			return $this->storageExceptionToEntityId($storageException);
185 185
 		}
186 186
 	}
187 187
 
188
-	private function storageExceptionToEntityId( StorageException $storageException ) {
188
+	private function storageExceptionToEntityId(StorageException $storageException) {
189 189
 		$message = $storageException->getMessage();
190 190
 		// example messages:
191 191
 		// * Item [[Item:Q475|Q475]] already has label "as references"
@@ -195,25 +195,25 @@  discard block
 block discarded – undo
195 195
 		// * Property [[Property:P694|P694]] already has label "instance of"
196 196
 		//   associated with language code en.
197 197
 		$pattern = '/[[|]([^][|]*)]] already has label .* associated with language code/';
198
-		if ( preg_match( $pattern, $message, $matches ) ) {
198
+		if (preg_match($pattern, $message, $matches)) {
199 199
 			return $matches[1];
200 200
 		} else {
201 201
 			throw $storageException;
202 202
 		}
203 203
 	}
204 204
 
205
-	private function outputConfigUpdates( array $configUpdates ) {
206
-		$configFormat = $this->getOption( 'config-format', 'globals' );
207
-		switch ( $configFormat ) {
205
+	private function outputConfigUpdates(array $configUpdates) {
206
+		$configFormat = $this->getOption('config-format', 'globals');
207
+		switch ($configFormat) {
208 208
 			case 'globals':
209
-				$this->outputConfigUpdatesGlobals( $configUpdates );
209
+				$this->outputConfigUpdatesGlobals($configUpdates);
210 210
 				break;
211 211
 			case 'wgConf':
212
-				$this->outputConfigUpdatesWgConf( $configUpdates );
212
+				$this->outputConfigUpdatesWgConf($configUpdates);
213 213
 				break;
214 214
 			default:
215
-				$this->error( "Invalid config format \"$configFormat\", using \"globals\"" );
216
-				$this->outputConfigUpdatesGlobals( $configUpdates );
215
+				$this->error("Invalid config format \"$configFormat\", using \"globals\"");
216
+				$this->outputConfigUpdatesGlobals($configUpdates);
217 217
 				break;
218 218
 		}
219 219
 	}
@@ -221,22 +221,22 @@  discard block
 block discarded – undo
221 221
 	/**
222 222
 	 * @param array[] $configUpdates
223 223
 	 */
224
-	private function outputConfigUpdatesGlobals( array $configUpdates ) {
225
-		foreach ( $configUpdates as $key => $value ) {
226
-			$localValueCode = var_export( $value['local'], true );
227
-			$this->output( "\$wg$key = $localValueCode;\n" );
224
+	private function outputConfigUpdatesGlobals(array $configUpdates) {
225
+		foreach ($configUpdates as $key => $value) {
226
+			$localValueCode = var_export($value['local'], true);
227
+			$this->output("\$wg$key = $localValueCode;\n");
228 228
 		}
229 229
 	}
230 230
 
231 231
 	/**
232 232
 	 * @param array[] $configUpdates
233 233
 	 */
234
-	private function outputConfigUpdatesWgConf( array $configUpdates ) {
235
-		foreach ( $configUpdates as $key => $value ) {
236
-			$keyCode = var_export( "wg$key", true );
237
-			$wikidataValueCode = var_export( $value['wikidata'], true );
238
-			$localValueCode = var_export( $value['local'], true );
239
-			$wikiIdCode = var_export( wfWikiID(), true );
234
+	private function outputConfigUpdatesWgConf(array $configUpdates) {
235
+		foreach ($configUpdates as $key => $value) {
236
+			$keyCode = var_export("wg$key", true);
237
+			$wikidataValueCode = var_export($value['wikidata'], true);
238
+			$localValueCode = var_export($value['local'], true);
239
+			$wikiIdCode = var_export(wfWikiID(), true);
240 240
 			$block = <<< EOF
241 241
 $keyCode => [
242 242
 	'default' => $wikidataValueCode,
@@ -245,7 +245,7 @@  discard block
 block discarded – undo
245 245
 
246 246
 
247 247
 EOF;
248
-			$this->output( $block );
248
+			$this->output($block);
249 249
 		}
250 250
 	}
251 251
 
Please login to merge, or discard this patch.