Completed
Push — master ( ca3498...fac060 )
by
unknown
13:57 queued 11:23
created
src/ConstraintCheck/Helper/SparqlHelper.php 1 patch
Spacing   +130 added lines, -132 removed lines patch added patch discarded remove patch
@@ -91,18 +91,18 @@  discard block
 block discarded – undo
91 91
 		$this->cache = $cache;
92 92
 		$this->dataFactory = $dataFactory;
93 93
 
94
-		$this->entityPrefix = $rdfVocabulary->getNamespaceURI( RdfVocabulary::NS_ENTITY );
94
+		$this->entityPrefix = $rdfVocabulary->getNamespaceURI(RdfVocabulary::NS_ENTITY);
95 95
 		$this->prefixes = <<<EOT
96
-PREFIX wd: <{$rdfVocabulary->getNamespaceURI( RdfVocabulary::NS_ENTITY )}>
97
-PREFIX wds: <{$rdfVocabulary->getNamespaceURI( RdfVocabulary::NS_STATEMENT )}>
98
-PREFIX wdt: <{$rdfVocabulary->getNamespaceURI( RdfVocabulary::NSP_DIRECT_CLAIM )}>
99
-PREFIX wdv: <{$rdfVocabulary->getNamespaceURI( RdfVocabulary::NS_VALUE )}>
100
-PREFIX p: <{$rdfVocabulary->getNamespaceURI( RdfVocabulary::NSP_CLAIM )}>
101
-PREFIX ps: <{$rdfVocabulary->getNamespaceURI( RdfVocabulary::NSP_CLAIM_STATEMENT )}>
102
-PREFIX pq: <{$rdfVocabulary->getNamespaceURI( RdfVocabulary::NSP_QUALIFIER )}>
103
-PREFIX pqv: <{$rdfVocabulary->getNamespaceURI( RdfVocabulary::NSP_QUALIFIER_VALUE )}>
104
-PREFIX pr: <{$rdfVocabulary->getNamespaceURI( RdfVocabulary::NSP_REFERENCE )}>
105
-PREFIX prv: <{$rdfVocabulary->getNamespaceURI( RdfVocabulary::NSP_REFERENCE_VALUE )}>
96
+PREFIX wd: <{$rdfVocabulary->getNamespaceURI(RdfVocabulary::NS_ENTITY)}>
97
+PREFIX wds: <{$rdfVocabulary->getNamespaceURI(RdfVocabulary::NS_STATEMENT)}>
98
+PREFIX wdt: <{$rdfVocabulary->getNamespaceURI(RdfVocabulary::NSP_DIRECT_CLAIM)}>
99
+PREFIX wdv: <{$rdfVocabulary->getNamespaceURI(RdfVocabulary::NS_VALUE)}>
100
+PREFIX p: <{$rdfVocabulary->getNamespaceURI(RdfVocabulary::NSP_CLAIM)}>
101
+PREFIX ps: <{$rdfVocabulary->getNamespaceURI(RdfVocabulary::NSP_CLAIM_STATEMENT)}>
102
+PREFIX pq: <{$rdfVocabulary->getNamespaceURI(RdfVocabulary::NSP_QUALIFIER)}>
103
+PREFIX pqv: <{$rdfVocabulary->getNamespaceURI(RdfVocabulary::NSP_QUALIFIER_VALUE)}>
104
+PREFIX pr: <{$rdfVocabulary->getNamespaceURI(RdfVocabulary::NSP_REFERENCE)}>
105
+PREFIX prv: <{$rdfVocabulary->getNamespaceURI(RdfVocabulary::NSP_REFERENCE_VALUE)}>
106 106
 PREFIX wikibase: <http://wikiba.se/ontology#>
107 107
 PREFIX wikibase-beta: <http://wikiba.se/ontology-beta#>
108 108
 EOT;
@@ -117,21 +117,21 @@  discard block
 block discarded – undo
117 117
 	 * @return CachedBool
118 118
 	 * @throws SparqlHelperException if the query times out or some other error occurs
119 119
 	 */
120
-	public function hasType( $id, array $classes, $withInstance ) {
121
-		$instanceOfId = $this->config->get( 'WBQualityConstraintsInstanceOfId' );
122
-		$subclassOfId = $this->config->get( 'WBQualityConstraintsSubclassOfId' );
120
+	public function hasType($id, array $classes, $withInstance) {
121
+		$instanceOfId = $this->config->get('WBQualityConstraintsInstanceOfId');
122
+		$subclassOfId = $this->config->get('WBQualityConstraintsSubclassOfId');
123 123
 
124
-		$path = ( $withInstance ? "wdt:$instanceOfId/" : "" ) . "wdt:$subclassOfId*";
124
+		$path = ($withInstance ? "wdt:$instanceOfId/" : "")."wdt:$subclassOfId*";
125 125
 
126 126
 		$metadatas = [];
127 127
 
128
-		foreach ( array_chunk( $classes, 20 ) as $classesChunk ) {
129
-			$classesValues = implode( ' ', array_map(
130
-				function( $class ) {
131
-					return 'wd:' . $class;
128
+		foreach (array_chunk($classes, 20) as $classesChunk) {
129
+			$classesValues = implode(' ', array_map(
130
+				function($class) {
131
+					return 'wd:'.$class;
132 132
 				},
133 133
 				$classesChunk
134
-			) );
134
+			));
135 135
 
136 136
 			$query = <<<EOF
137 137
 ASK {
@@ -142,19 +142,19 @@  discard block
 block discarded – undo
142 142
 EOF;
143 143
 			// TODO hint:gearing is a workaround for T168973 and can hopefully be removed eventually
144 144
 
145
-			$result = $this->runQuery( $query );
145
+			$result = $this->runQuery($query);
146 146
 			$metadatas[] = $result->getMetadata();
147
-			if ( $result->getArray()['boolean'] ) {
147
+			if ($result->getArray()['boolean']) {
148 148
 				return new CachedBool(
149 149
 					true,
150
-					Metadata::merge( $metadatas )
150
+					Metadata::merge($metadatas)
151 151
 				);
152 152
 			}
153 153
 		}
154 154
 
155 155
 		return new CachedBool(
156 156
 			false,
157
-			Metadata::merge( $metadatas )
157
+			Metadata::merge($metadatas)
158 158
 		);
159 159
 	}
160 160
 
@@ -170,10 +170,10 @@  discard block
 block discarded – undo
170 170
 		$ignoreDeprecatedStatements
171 171
 	) {
172 172
 		$pid = $statement->getPropertyId()->serialize();
173
-		$guid = str_replace( '$', '-', $statement->getGuid() );
173
+		$guid = str_replace('$', '-', $statement->getGuid());
174 174
 
175 175
 		$deprecatedFilter = '';
176
-		if ( $ignoreDeprecatedStatements ) {
176
+		if ($ignoreDeprecatedStatements) {
177 177
 			$deprecatedFilter .= 'MINUS { ?otherStatement wikibase:rank wikibase:DeprecatedRank. }';
178 178
 			$deprecatedFilter .= 'MINUS { ?otherStatement wikibase-beta:rank wikibase-beta:DeprecatedRank. }';
179 179
 		}
@@ -193,9 +193,9 @@  discard block
 block discarded – undo
193 193
 LIMIT 10
194 194
 EOF;
195 195
 
196
-		$result = $this->runQuery( $query );
196
+		$result = $this->runQuery($query);
197 197
 
198
-		return $this->getOtherEntities( $result );
198
+		return $this->getOtherEntities($result);
199 199
 	}
200 200
 
201 201
 	/**
@@ -220,16 +220,15 @@  discard block
 block discarded – undo
220 220
 		$dataType = $this->propertyDataTypeLookup->getDataTypeIdForProperty(
221 221
 			$snak->getPropertyId()
222 222
 		);
223
-		list( $value, $isFullValue ) = $this->getRdfLiteral( $dataType, $dataValue );
224
-		if ( $isFullValue ) {
223
+		list($value, $isFullValue) = $this->getRdfLiteral($dataType, $dataValue);
224
+		if ($isFullValue) {
225 225
 			$prefix .= 'v';
226 226
 		}
227 227
 		$path = $type === Context::TYPE_QUALIFIER ?
228
-			"$prefix:$pid" :
229
-			"prov:wasDerivedFrom/$prefix:$pid";
228
+			"$prefix:$pid" : "prov:wasDerivedFrom/$prefix:$pid";
230 229
 
231 230
 		$deprecatedFilter = '';
232
-		if ( $ignoreDeprecatedStatements ) {
231
+		if ($ignoreDeprecatedStatements) {
233 232
 			$deprecatedFilter = <<< EOF
234 233
   MINUS { ?otherStatement wikibase:rank wikibase:DeprecatedRank. }
235 234
   MINUS { ?otherStatement wikibase-beta:rank wikibase-beta:DeprecatedRank. }
@@ -250,9 +249,9 @@  discard block
 block discarded – undo
250 249
 LIMIT 10
251 250
 EOF;
252 251
 
253
-		$result = $this->runQuery( $query );
252
+		$result = $this->runQuery($query);
254 253
 
255
-		return $this->getOtherEntities( $result );
254
+		return $this->getOtherEntities($result);
256 255
 	}
257 256
 
258 257
 	/**
@@ -262,8 +261,8 @@  discard block
 block discarded – undo
262 261
 	 *
263 262
 	 * @return string
264 263
 	 */
265
-	private function stringLiteral( $text ) {
266
-		return '"' . strtr( $text, [ '"' => '\\"', '\\' => '\\\\' ] ) . '"';
264
+	private function stringLiteral($text) {
265
+		return '"'.strtr($text, ['"' => '\\"', '\\' => '\\\\']).'"';
267 266
 	}
268 267
 
269 268
 	/**
@@ -273,17 +272,17 @@  discard block
 block discarded – undo
273 272
 	 *
274 273
 	 * @return CachedEntityIds
275 274
 	 */
276
-	private function getOtherEntities( CachedQueryResults $results ) {
277
-		return new CachedEntityIds( array_map(
278
-			function ( $resultBindings ) {
275
+	private function getOtherEntities(CachedQueryResults $results) {
276
+		return new CachedEntityIds(array_map(
277
+			function($resultBindings) {
279 278
 				$entityIRI = $resultBindings['otherEntity']['value'];
280
-				$entityPrefixLength = strlen( $this->entityPrefix );
281
-				if ( substr( $entityIRI, 0, $entityPrefixLength ) === $this->entityPrefix ) {
279
+				$entityPrefixLength = strlen($this->entityPrefix);
280
+				if (substr($entityIRI, 0, $entityPrefixLength) === $this->entityPrefix) {
282 281
 					try {
283 282
 						return $this->entityIdParser->parse(
284
-							substr( $entityIRI, $entityPrefixLength )
283
+							substr($entityIRI, $entityPrefixLength)
285 284
 						);
286
-					} catch ( EntityIdParsingException $e ) {
285
+					} catch (EntityIdParsingException $e) {
287 286
 						// fall through
288 287
 					}
289 288
 				}
@@ -291,7 +290,7 @@  discard block
 block discarded – undo
291 290
 				return null;
292 291
 			},
293 292
 			$results->getArray()['results']['bindings']
294
-		), $results->getMetadata() );
293
+		), $results->getMetadata());
295 294
 	}
296 295
 
297 296
 	// @codingStandardsIgnoreStart cyclomatic complexity of this function is too high
@@ -304,47 +303,47 @@  discard block
 block discarded – undo
304 303
 	 * @return array the literal or IRI as a string in SPARQL syntax,
305 304
 	 * and a boolean indicating whether it refers to a full value node or not
306 305
 	 */
307
-	private function getRdfLiteral( $dataType, DataValue $dataValue ) {
308
-		switch ( $dataType ) {
306
+	private function getRdfLiteral($dataType, DataValue $dataValue) {
307
+		switch ($dataType) {
309 308
 			case 'string':
310 309
 			case 'external-id':
311
-				return [ $this->stringLiteral( $dataValue->getValue() ), false ];
310
+				return [$this->stringLiteral($dataValue->getValue()), false];
312 311
 			case 'commonsMedia':
313
-				$url = $this->rdfVocabulary->getMediaFileURI( $dataValue->getValue() );
314
-				return [ '<' . $url . '>', false ];
312
+				$url = $this->rdfVocabulary->getMediaFileURI($dataValue->getValue());
313
+				return ['<'.$url.'>', false];
315 314
 			case 'geo-shape':
316
-				$url = $this->rdfVocabulary->getGeoShapeURI( $dataValue->getValue() );
317
-				return [ '<' . $url . '>', false ];
315
+				$url = $this->rdfVocabulary->getGeoShapeURI($dataValue->getValue());
316
+				return ['<'.$url.'>', false];
318 317
 			case 'tabular-data':
319
-				$url = $this->rdfVocabulary->getTabularDataURI( $dataValue->getValue() );
320
-				return [ '<' . $url . '>', false ];
318
+				$url = $this->rdfVocabulary->getTabularDataURI($dataValue->getValue());
319
+				return ['<'.$url.'>', false];
321 320
 			case 'url':
322 321
 				$url = $dataValue->getValue();
323
-				if ( !preg_match( '/^[^<>"{}\\\\|^`\\x00-\\x20]*$/D', $url ) ) {
322
+				if (!preg_match('/^[^<>"{}\\\\|^`\\x00-\\x20]*$/D', $url)) {
324 323
 					// not a valid URL for SPARQL (see SPARQL spec, production 139 IRIREF)
325 324
 					// such an URL should never reach us, so just throw
326
-					throw new InvalidArgumentException( 'invalid URL: ' . $url );
325
+					throw new InvalidArgumentException('invalid URL: '.$url);
327 326
 				}
328
-				return [ '<' . $url . '>', false ];
327
+				return ['<'.$url.'>', false];
329 328
 			case 'wikibase-item':
330 329
 			case 'wikibase-property':
331 330
 				/** @var EntityIdValue $dataValue */
332
-				return [ 'wd:' . $dataValue->getEntityId()->getSerialization(), false ];
331
+				return ['wd:'.$dataValue->getEntityId()->getSerialization(), false];
333 332
 			case 'monolingualtext':
334 333
 				/** @var MonolingualTextValue $dataValue */
335 334
 				$lang = $dataValue->getLanguageCode();
336
-				if ( !preg_match( '/^[a-zA-Z]+(-[a-zA-Z0-9]+)*$/D', $lang ) ) {
335
+				if (!preg_match('/^[a-zA-Z]+(-[a-zA-Z0-9]+)*$/D', $lang)) {
337 336
 					// not a valid language tag for SPARQL (see SPARQL spec, production 145 LANGTAG)
338 337
 					// such a language tag should never reach us, so just throw
339
-					throw new InvalidArgumentException( 'invalid language tag: ' . $lang );
338
+					throw new InvalidArgumentException('invalid language tag: '.$lang);
340 339
 				}
341
-				return [ $this->stringLiteral( $dataValue->getText() ) . '@' . $lang, false ];
340
+				return [$this->stringLiteral($dataValue->getText()).'@'.$lang, false];
342 341
 			case 'globe-coordinate':
343 342
 			case 'quantity':
344 343
 			case 'time':
345
-				return [ 'wdv:' . $dataValue->getHash(), true ];
344
+				return ['wdv:'.$dataValue->getHash(), true];
346 345
 			default:
347
-				throw new InvalidArgumentException( 'unknown data type: ' . $dataType );
346
+				throw new InvalidArgumentException('unknown data type: '.$dataType);
348 347
 		}
349 348
 	}
350 349
 	// @codingStandardsIgnoreEnd
@@ -357,47 +356,47 @@  discard block
 block discarded – undo
357 356
 	 * @throws SparqlHelperException if the query times out or some other error occurs
358 357
 	 * @throws ConstraintParameterException if the $regex is invalid
359 358
 	 */
360
-	public function matchesRegularExpression( $text, $regex ) {
359
+	public function matchesRegularExpression($text, $regex) {
361 360
 		// caching wrapper around matchesRegularExpressionWithSparql
362 361
 
363
-		$textHash = hash( 'sha256', $text );
362
+		$textHash = hash('sha256', $text);
364 363
 		$cacheKey = $this->cache->makeKey(
365 364
 			'WikibaseQualityConstraints', // extension
366 365
 			'regex', // action
367 366
 			'WDQS-Java', // regex flavor
368
-			hash( 'sha256', $regex )
367
+			hash('sha256', $regex)
369 368
 		);
370
-		$cacheMapSize = $this->config->get( 'WBQualityConstraintsFormatCacheMapSize' );
369
+		$cacheMapSize = $this->config->get('WBQualityConstraintsFormatCacheMapSize');
371 370
 
372 371
 		$cacheMapArray = $this->cache->getWithSetCallback(
373 372
 			$cacheKey,
374 373
 			WANObjectCache::TTL_DAY,
375
-			function( $cacheMapArray ) use ( $text, $regex, $textHash, $cacheMapSize ) {
374
+			function($cacheMapArray) use ($text, $regex, $textHash, $cacheMapSize) {
376 375
 				// Initialize the cache map if not set
377
-				if ( $cacheMapArray === false ) {
376
+				if ($cacheMapArray === false) {
378 377
 					$key = 'wikibase.quality.constraints.regex.cache.refresh.init';
379
-					$this->dataFactory->increment( $key );
378
+					$this->dataFactory->increment($key);
380 379
 					return [];
381 380
 				}
382 381
 
383 382
 				$key = 'wikibase.quality.constraints.regex.cache.refresh';
384
-				$this->dataFactory->increment( $key );
385
-				$cacheMap = MapCacheLRU::newFromArray( $cacheMapArray, $cacheMapSize );
386
-				if ( $cacheMap->has( $textHash ) ) {
383
+				$this->dataFactory->increment($key);
384
+				$cacheMap = MapCacheLRU::newFromArray($cacheMapArray, $cacheMapSize);
385
+				if ($cacheMap->has($textHash)) {
387 386
 					$key = 'wikibase.quality.constraints.regex.cache.refresh.hit';
388
-					$this->dataFactory->increment( $key );
389
-					$cacheMap->get( $textHash ); // ping cache
387
+					$this->dataFactory->increment($key);
388
+					$cacheMap->get($textHash); // ping cache
390 389
 				} else {
391 390
 					$key = 'wikibase.quality.constraints.regex.cache.refresh.miss';
392
-					$this->dataFactory->increment( $key );
391
+					$this->dataFactory->increment($key);
393 392
 					try {
394
-						$matches = $this->matchesRegularExpressionWithSparql( $text, $regex );
395
-					} catch ( ConstraintParameterException $e ) {
393
+						$matches = $this->matchesRegularExpressionWithSparql($text, $regex);
394
+					} catch (ConstraintParameterException $e) {
396 395
 						$matches = [
397 396
 							'type' => ConstraintParameterException::class,
398 397
 							'message' => $e->getMessage(),
399 398
 						];
400
-					} catch ( SparqlHelperException $e ) {
399
+					} catch (SparqlHelperException $e) {
401 400
 						// don’t cache this
402 401
 						return $cacheMap->toArray();
403 402
 					}
@@ -421,27 +420,27 @@  discard block
 block discarded – undo
421 420
 			]
422 421
 		);
423 422
 
424
-		if ( isset( $cacheMapArray[$textHash] ) ) {
423
+		if (isset($cacheMapArray[$textHash])) {
425 424
 			$key = 'wikibase.quality.constraints.regex.cache.hit';
426
-			$this->dataFactory->increment( $key );
425
+			$this->dataFactory->increment($key);
427 426
 			$matches = $cacheMapArray[$textHash];
428
-			if ( is_bool( $matches ) ) {
427
+			if (is_bool($matches)) {
429 428
 				return $matches;
430
-			} elseif ( is_array( $matches ) &&
431
-				$matches['type'] == ConstraintParameterException::class ) {
432
-				throw new ConstraintParameterException( $matches['message'] );
429
+			} elseif (is_array($matches) &&
430
+				$matches['type'] == ConstraintParameterException::class) {
431
+				throw new ConstraintParameterException($matches['message']);
433 432
 			} else {
434 433
 				throw new MWException(
435
-					'Value of unknown type in object cache (' .
436
-					'cache key: ' . $cacheKey . ', ' .
437
-					'cache map key: ' . $textHash . ', ' .
438
-					'value type: ' . gettype( $matches ) . ')'
434
+					'Value of unknown type in object cache ('.
435
+					'cache key: '.$cacheKey.', '.
436
+					'cache map key: '.$textHash.', '.
437
+					'value type: '.gettype($matches).')'
439 438
 				);
440 439
 			}
441 440
 		} else {
442 441
 			$key = 'wikibase.quality.constraints.regex.cache.miss';
443
-			$this->dataFactory->increment( $key );
444
-			return $this->matchesRegularExpressionWithSparql( $text, $regex );
442
+			$this->dataFactory->increment($key);
443
+			return $this->matchesRegularExpressionWithSparql($text, $regex);
445 444
 		}
446 445
 	}
447 446
 
@@ -456,26 +455,26 @@  discard block
 block discarded – undo
456 455
 	 * @throws SparqlHelperException if the query times out or some other error occurs
457 456
 	 * @throws ConstraintParameterException if the $regex is invalid
458 457
 	 */
459
-	public function matchesRegularExpressionWithSparql( $text, $regex ) {
460
-		$textStringLiteral = $this->stringLiteral( $text );
461
-		$regexStringLiteral = $this->stringLiteral( '^' . $regex . '$' );
458
+	public function matchesRegularExpressionWithSparql($text, $regex) {
459
+		$textStringLiteral = $this->stringLiteral($text);
460
+		$regexStringLiteral = $this->stringLiteral('^'.$regex.'$');
462 461
 
463 462
 		$query = <<<EOF
464 463
 SELECT (REGEX($textStringLiteral, $regexStringLiteral) AS ?matches) {}
465 464
 EOF;
466 465
 
467
-		$result = $this->runQuery( $query );
466
+		$result = $this->runQuery($query);
468 467
 
469 468
 		$vars = $result->getArray()['results']['bindings'][0];
470
-		if ( array_key_exists( 'matches', $vars ) ) {
469
+		if (array_key_exists('matches', $vars)) {
471 470
 			// true or false ⇒ regex okay, text matches or not
472 471
 			return $vars['matches']['value'] === 'true';
473 472
 		} else {
474 473
 			// empty result: regex broken
475 474
 			throw new ConstraintParameterException(
476
-				wfMessage( 'wbqc-violation-message-parameter-regex' )
477
-					->rawParams( ConstraintParameterRenderer::formatByRole( Role::CONSTRAINT_PARAMETER_VALUE,
478
-						'<code><nowiki>' . htmlspecialchars( $regex ) . '</nowiki></code>' ) )
475
+				wfMessage('wbqc-violation-message-parameter-regex')
476
+					->rawParams(ConstraintParameterRenderer::formatByRole(Role::CONSTRAINT_PARAMETER_VALUE,
477
+						'<code><nowiki>'.htmlspecialchars($regex).'</nowiki></code>'))
479 478
 					->escaped()
480 479
 			);
481 480
 		}
@@ -488,14 +487,14 @@  discard block
 block discarded – undo
488 487
 	 *
489 488
 	 * @return boolean
490 489
 	 */
491
-	public function isTimeout( $responseContent ) {
492
-		$timeoutRegex = implode( '|', array_map(
493
-			function ( $fqn ) {
494
-				return preg_quote( $fqn, '/' );
490
+	public function isTimeout($responseContent) {
491
+		$timeoutRegex = implode('|', array_map(
492
+			function($fqn) {
493
+				return preg_quote($fqn, '/');
495 494
 			},
496
-			$this->config->get( 'WBQualityConstraintsSparqlTimeoutExceptionClasses' )
497
-		) );
498
-		return (bool)preg_match( '/' . $timeoutRegex . '/', $responseContent );
495
+			$this->config->get('WBQualityConstraintsSparqlTimeoutExceptionClasses')
496
+		));
497
+		return (bool) preg_match('/'.$timeoutRegex.'/', $responseContent);
499 498
 	}
500 499
 
501 500
 	/**
@@ -507,17 +506,17 @@  discard block
 block discarded – undo
507 506
 	 * @return integer|boolean the max-age (in seconds)
508 507
 	 * or a plain boolean if no max-age can be determined
509 508
 	 */
510
-	public function getCacheMaxAge( $responseHeaders ) {
509
+	public function getCacheMaxAge($responseHeaders) {
511 510
 		if (
512
-			array_key_exists( 'x-cache-status', $responseHeaders ) &&
513
-			preg_match( '/^hit(?:-.*)?$/', $responseHeaders['x-cache-status'][0] )
511
+			array_key_exists('x-cache-status', $responseHeaders) &&
512
+			preg_match('/^hit(?:-.*)?$/', $responseHeaders['x-cache-status'][0])
514 513
 		) {
515 514
 			$maxage = [];
516 515
 			if (
517
-				array_key_exists( 'cache-control', $responseHeaders ) &&
518
-				preg_match( '/\bmax-age=(\d+)\b/', $responseHeaders['cache-control'][0], $maxage )
516
+				array_key_exists('cache-control', $responseHeaders) &&
517
+				preg_match('/\bmax-age=(\d+)\b/', $responseHeaders['cache-control'][0], $maxage)
519 518
 			) {
520
-				return intval( $maxage[1] );
519
+				return intval($maxage[1]);
521 520
 			} else {
522 521
 				return true;
523 522
 			}
@@ -535,59 +534,58 @@  discard block
 block discarded – undo
535 534
 	 *
536 535
 	 * @throws SparqlHelperException if the query times out or some other error occurs
537 536
 	 */
538
-	public function runQuery( $query ) {
537
+	public function runQuery($query) {
539 538
 
540
-		$endpoint = $this->config->get( 'WBQualityConstraintsSparqlEndpoint' );
541
-		$maxQueryTimeMillis = $this->config->get( 'WBQualityConstraintsSparqlMaxMillis' );
542
-		$url = $endpoint . '?' . http_build_query(
539
+		$endpoint = $this->config->get('WBQualityConstraintsSparqlEndpoint');
540
+		$maxQueryTimeMillis = $this->config->get('WBQualityConstraintsSparqlMaxMillis');
541
+		$url = $endpoint.'?'.http_build_query(
543 542
 			[
544
-				'query' => "#wbqc\n" . $this->prefixes . $query,
543
+				'query' => "#wbqc\n".$this->prefixes.$query,
545 544
 				'format' => 'json',
546 545
 				'maxQueryTimeMillis' => $maxQueryTimeMillis,
547 546
 			],
548
-			null, ini_get( 'arg_separator.output' ),
547
+			null, ini_get('arg_separator.output'),
549 548
 			// encode spaces with %20, not +
550 549
 			PHP_QUERY_RFC3986
551 550
 		);
552 551
 
553 552
 		$options = [
554 553
 			'method' => 'GET',
555
-			'timeout' => (int)round( ( $maxQueryTimeMillis + 1000 ) / 1000 ),
554
+			'timeout' => (int) round(($maxQueryTimeMillis + 1000) / 1000),
556 555
 			'connectTimeout' => 'default',
557 556
 		];
558
-		$request = MWHttpRequest::factory( $url, $options );
559
-		$startTime = microtime( true );
557
+		$request = MWHttpRequest::factory($url, $options);
558
+		$startTime = microtime(true);
560 559
 		$status = $request->execute();
561
-		$endTime = microtime( true );
560
+		$endTime = microtime(true);
562 561
 		$this->dataFactory->timing(
563 562
 			'wikibase.quality.constraints.sparql.timing',
564
-			( $endTime - $startTime ) * 1000
563
+			($endTime - $startTime) * 1000
565 564
 		);
566 565
 
567
-		$maxAge = $this->getCacheMaxAge( $request->getResponseHeaders() );
568
-		if ( $maxAge ) {
569
-			$this->dataFactory->increment( 'wikibase.quality.constraints.sparql.cached' );
566
+		$maxAge = $this->getCacheMaxAge($request->getResponseHeaders());
567
+		if ($maxAge) {
568
+			$this->dataFactory->increment('wikibase.quality.constraints.sparql.cached');
570 569
 		}
571 570
 
572
-		if ( $status->isOK() ) {
571
+		if ($status->isOK()) {
573 572
 			$json = $request->getContent();
574
-			$arr = json_decode( $json, true );
573
+			$arr = json_decode($json, true);
575 574
 			return new CachedQueryResults(
576 575
 				$arr,
577 576
 				Metadata::ofCachingMetadata(
578 577
 					$maxAge ?
579
-						CachingMetadata::ofMaximumAgeInSeconds( $maxAge ) :
580
-						CachingMetadata::fresh()
578
+						CachingMetadata::ofMaximumAgeInSeconds($maxAge) : CachingMetadata::fresh()
581 579
 				)
582 580
 			);
583 581
 		} else {
584
-			$this->dataFactory->increment( 'wikibase.quality.constraints.sparql.error' );
582
+			$this->dataFactory->increment('wikibase.quality.constraints.sparql.error');
585 583
 
586 584
 			$this->dataFactory->increment(
587 585
 				"wikibase.quality.constraints.sparql.error.http.{$request->getStatus()}"
588 586
 			);
589 587
 
590
-			if ( $this->isTimeout( $request->getContent() ) ) {
588
+			if ($this->isTimeout($request->getContent())) {
591 589
 				$this->dataFactory->increment(
592 590
 					'wikibase.quality.constraints.sparql.error.timeout'
593 591
 				);
Please login to merge, or discard this patch.
src/ConstraintCheck/Checker/DiffWithinRangeChecker.php 1 patch
Spacing   +43 added lines, -44 removed lines patch added patch discarded remove patch
@@ -91,8 +91,8 @@  discard block
 block discarded – undo
91 91
 	 * @throws ConstraintParameterException
92 92
 	 * @return array [ DataValue|null $min, DataValue|null $max, PropertyId $property, array $parameters ]
93 93
 	 */
94
-	private function parseConstraintParameters( Constraint $constraint ) {
95
-		list( $min, $max ) = $this->constraintParameterParser->parseRangeParameter(
94
+	private function parseConstraintParameters(Constraint $constraint) {
95
+		list($min, $max) = $this->constraintParameterParser->parseRangeParameter(
96 96
 			$constraint->getConstraintParameters(),
97 97
 			$constraint->getConstraintTypeItemId(),
98 98
 			'quantity'
@@ -102,15 +102,15 @@  discard block
 block discarded – undo
102 102
 			$constraint->getConstraintTypeItemId()
103 103
 		);
104 104
 
105
-		if ( $min !== null ) {
106
-			$parameters['minimum_quantity'] = [ $min ];
105
+		if ($min !== null) {
106
+			$parameters['minimum_quantity'] = [$min];
107 107
 		}
108
-		if ( $max !== null ) {
109
-			$parameters['maximum_quantity'] = [ $max ];
108
+		if ($max !== null) {
109
+			$parameters['maximum_quantity'] = [$max];
110 110
 		}
111
-		$parameters['property'] = [ $property ];
111
+		$parameters['property'] = [$property];
112 112
 
113
-		return [ $min, $max, $property, $parameters ];
113
+		return [$min, $max, $property, $parameters];
114 114
 	}
115 115
 
116 116
 	/**
@@ -120,13 +120,13 @@  discard block
 block discarded – undo
120 120
 	 *
121 121
 	 * @return bool
122 122
 	 */
123
-	private function rangeInYears( $min, $max ) {
124
-		$yearUnit = $this->config->get( 'WBQualityConstraintsYearUnit' );
123
+	private function rangeInYears($min, $max) {
124
+		$yearUnit = $this->config->get('WBQualityConstraintsYearUnit');
125 125
 
126
-		if ( $min !== null && $min->getUnit() === $yearUnit ) {
126
+		if ($min !== null && $min->getUnit() === $yearUnit) {
127 127
 			return true;
128 128
 		}
129
-		if ( $max !== null && $max->getUnit() === $yearUnit ) {
129
+		if ($max !== null && $max->getUnit() === $yearUnit) {
130 130
 			return true;
131 131
 		}
132 132
 
@@ -142,32 +142,32 @@  discard block
 block discarded – undo
142 142
 	 * @throws ConstraintParameterException
143 143
 	 * @return CheckResult
144 144
 	 */
145
-	public function checkConstraint( Context $context, Constraint $constraint ) {
146
-		if ( $context->getSnakRank() === Statement::RANK_DEPRECATED ) {
147
-			return new CheckResult( $context, $constraint, [], CheckResult::STATUS_DEPRECATED );
145
+	public function checkConstraint(Context $context, Constraint $constraint) {
146
+		if ($context->getSnakRank() === Statement::RANK_DEPRECATED) {
147
+			return new CheckResult($context, $constraint, [], CheckResult::STATUS_DEPRECATED);
148 148
 		}
149 149
 
150 150
 		$parameters = [];
151 151
 
152 152
 		$snak = $context->getSnak();
153 153
 
154
-		if ( !$snak instanceof PropertyValueSnak ) {
154
+		if (!$snak instanceof PropertyValueSnak) {
155 155
 			// nothing to check
156
-			return new CheckResult( $context, $constraint, $parameters, CheckResult::STATUS_COMPLIANCE, '' );
156
+			return new CheckResult($context, $constraint, $parameters, CheckResult::STATUS_COMPLIANCE, '');
157 157
 		}
158 158
 
159 159
 		$minuend = $snak->getDataValue();
160 160
 
161 161
 		/** @var PropertyId $property */
162
-		list( $min, $max, $property, $parameters ) = $this->parseConstraintParameters( $constraint );
162
+		list($min, $max, $property, $parameters) = $this->parseConstraintParameters($constraint);
163 163
 
164 164
 		// checks only the first occurrence of the referenced property (this constraint implies a single value constraint on that property)
165 165
 		/** @var Statement $otherStatement */
166
-		foreach ( $context->getEntity()->getStatements() as $otherStatement ) {
166
+		foreach ($context->getEntity()->getStatements() as $otherStatement) {
167 167
 			$otherMainSnak = $otherStatement->getMainSnak();
168 168
 
169 169
 			if (
170
-				!$property->equals( $otherStatement->getPropertyId() ) ||
170
+				!$property->equals($otherStatement->getPropertyId()) ||
171 171
 				$otherStatement->getRank() === Statement::RANK_DEPRECATED ||
172 172
 				!$otherMainSnak instanceof PropertyValueSnak
173 173
 			) {
@@ -175,28 +175,27 @@  discard block
 block discarded – undo
175 175
 			}
176 176
 
177 177
 			$subtrahend = $otherMainSnak->getDataValue();
178
-			if ( $subtrahend->getType() === $minuend->getType() ) {
179
-				$diff = $this->rangeInYears( $min, $max ) ?
180
-					$this->rangeCheckerHelper->getDifferenceInYears( $minuend, $subtrahend ) :
181
-					$this->rangeCheckerHelper->getDifference( $minuend, $subtrahend );
178
+			if ($subtrahend->getType() === $minuend->getType()) {
179
+				$diff = $this->rangeInYears($min, $max) ?
180
+					$this->rangeCheckerHelper->getDifferenceInYears($minuend, $subtrahend) : $this->rangeCheckerHelper->getDifference($minuend, $subtrahend);
182 181
 
183
-				if ( $this->rangeCheckerHelper->getComparison( $min, $diff ) > 0 ||
184
-					$this->rangeCheckerHelper->getComparison( $diff, $max ) > 0
182
+				if ($this->rangeCheckerHelper->getComparison($min, $diff) > 0 ||
183
+					$this->rangeCheckerHelper->getComparison($diff, $max) > 0
185 184
 				) {
186 185
 					// at least one of $min, $max is set at this point, otherwise there could be no violation
187
-					$openness = $min !== null ? ( $max !== null ? '' : '-rightopen' ) : '-leftopen';
188
-					$message = wfMessage( "wbqc-violation-message-diff-within-range$openness" );
186
+					$openness = $min !== null ? ($max !== null ? '' : '-rightopen') : '-leftopen';
187
+					$message = wfMessage("wbqc-violation-message-diff-within-range$openness");
189 188
 					$message->rawParams(
190
-						$this->constraintParameterRenderer->formatEntityId( $context->getSnak()->getPropertyId(), Role::PREDICATE ),
191
-						$this->constraintParameterRenderer->formatDataValue( $minuend, Role::OBJECT ),
192
-						$this->constraintParameterRenderer->formatEntityId( $otherStatement->getPropertyId(), Role::PREDICATE ),
193
-						$this->constraintParameterRenderer->formatDataValue( $subtrahend, Role::OBJECT )
189
+						$this->constraintParameterRenderer->formatEntityId($context->getSnak()->getPropertyId(), Role::PREDICATE),
190
+						$this->constraintParameterRenderer->formatDataValue($minuend, Role::OBJECT),
191
+						$this->constraintParameterRenderer->formatEntityId($otherStatement->getPropertyId(), Role::PREDICATE),
192
+						$this->constraintParameterRenderer->formatDataValue($subtrahend, Role::OBJECT)
194 193
 					);
195
-					if ( $min !== null ) {
196
-						$message->rawParams( $this->constraintParameterRenderer->formatDataValue( $min, Role::OBJECT ) );
194
+					if ($min !== null) {
195
+						$message->rawParams($this->constraintParameterRenderer->formatDataValue($min, Role::OBJECT));
197 196
 					}
198
-					if ( $max !== null ) {
199
-						$message->rawParams( $this->constraintParameterRenderer->formatDataValue( $max, Role::OBJECT ) );
197
+					if ($max !== null) {
198
+						$message->rawParams($this->constraintParameterRenderer->formatDataValue($max, Role::OBJECT));
200 199
 					}
201 200
 					$message = $message->escaped();
202 201
 					$status = CheckResult::STATUS_VIOLATION;
@@ -205,19 +204,19 @@  discard block
 block discarded – undo
205 204
 					$status = CheckResult::STATUS_COMPLIANCE;
206 205
 				}
207 206
 			} else {
208
-				$message = wfMessage( "wbqc-violation-message-diff-within-range-must-have-equal-types" )->escaped();
207
+				$message = wfMessage("wbqc-violation-message-diff-within-range-must-have-equal-types")->escaped();
209 208
 				$status = CheckResult::STATUS_VIOLATION;
210 209
 			}
211 210
 
212
-			return new CheckResult( $context, $constraint, $parameters, $status, $message );
211
+			return new CheckResult($context, $constraint, $parameters, $status, $message);
213 212
 		}
214 213
 
215
-		$message = wfMessage( "wbqc-violation-message-diff-within-range-property-must-exist" )->escaped();
214
+		$message = wfMessage("wbqc-violation-message-diff-within-range-property-must-exist")->escaped();
216 215
 		$status = CheckResult::STATUS_VIOLATION;
217
-		return new CheckResult( $context, $constraint, $parameters, $status, $message );
216
+		return new CheckResult($context, $constraint, $parameters, $status, $message);
218 217
 	}
219 218
 
220
-	public function checkConstraintParameters( Constraint $constraint ) {
219
+	public function checkConstraintParameters(Constraint $constraint) {
221 220
 		$constraintParameters = $constraint->getConstraintParameters();
222 221
 		$exceptions = [];
223 222
 		try {
@@ -226,12 +225,12 @@  discard block
 block discarded – undo
226 225
 				$constraint->getConstraintTypeItemId(),
227 226
 				'quantity'
228 227
 			);
229
-		} catch ( ConstraintParameterException $e ) {
228
+		} catch (ConstraintParameterException $e) {
230 229
 			$exceptions[] = $e;
231 230
 		}
232 231
 		try {
233
-			$this->constraintParameterParser->parsePropertyParameter( $constraintParameters, $constraint->getConstraintTypeItemId() );
234
-		} catch ( ConstraintParameterException $e ) {
232
+			$this->constraintParameterParser->parsePropertyParameter($constraintParameters, $constraint->getConstraintTypeItemId());
233
+		} catch (ConstraintParameterException $e) {
235 234
 			$exceptions[] = $e;
236 235
 		}
237 236
 		return $exceptions;
Please login to merge, or discard this patch.
src/ConstraintCheck/Checker/CommonsLinkChecker.php 1 patch
Spacing   +42 added lines, -42 removed lines patch added patch discarded remove patch
@@ -82,22 +82,22 @@  discard block
 block discarded – undo
82 82
 	 * @return array first element is the namespace number (default namespace for TitleParser),
83 83
 	 * second element is a string to prepend to the title before giving it to the TitleParser
84 84
 	 */
85
-	private function getCommonsNamespace( $namespace ) {
85
+	private function getCommonsNamespace($namespace) {
86 86
 		// for namespace numbers see mediawiki-config repo, wmf-config/InitialiseSettings.php,
87 87
 		// 'wgExtraNamespaces' key, 'commonswiki' subkey
88
-		switch ( $namespace ) {
88
+		switch ($namespace) {
89 89
 			case '':
90
-				return [ NS_MAIN, '' ];
90
+				return [NS_MAIN, ''];
91 91
 			case 'Creator':
92
-				return [ 100, '' ];
92
+				return [100, ''];
93 93
 			case 'TimedText':
94
-				return [ 102, '' ];
94
+				return [102, ''];
95 95
 			case 'Sequence':
96
-				return [ 104, '' ];
96
+				return [104, ''];
97 97
 			case 'Institution':
98
-				return [ 106, '' ];
98
+				return [106, ''];
99 99
 			default:
100
-				return [ NS_MAIN, $namespace . ':' ];
100
+				return [NS_MAIN, $namespace.':'];
101 101
 		}
102 102
 	}
103 103
 
@@ -110,17 +110,17 @@  discard block
 block discarded – undo
110 110
 	 * @throws ConstraintParameterException
111 111
 	 * @return CheckResult
112 112
 	 */
113
-	public function checkConstraint( Context $context, Constraint $constraint ) {
113
+	public function checkConstraint(Context $context, Constraint $constraint) {
114 114
 		$parameters = [];
115 115
 		$constraintParameters = $constraint->getConstraintParameters();
116
-		$namespace = $this->constraintParameterParser->parseNamespaceParameter( $constraintParameters, $constraint->getConstraintTypeItemId() );
117
-		$parameters['namespace'] = [ $namespace ];
116
+		$namespace = $this->constraintParameterParser->parseNamespaceParameter($constraintParameters, $constraint->getConstraintTypeItemId());
117
+		$parameters['namespace'] = [$namespace];
118 118
 
119 119
 		$snak = $context->getSnak();
120 120
 
121
-		if ( !$snak instanceof PropertyValueSnak ) {
121
+		if (!$snak instanceof PropertyValueSnak) {
122 122
 			// nothing to check
123
-			return new CheckResult( $context, $constraint, $parameters, CheckResult::STATUS_COMPLIANCE, '' );
123
+			return new CheckResult($context, $constraint, $parameters, CheckResult::STATUS_COMPLIANCE, '');
124 124
 		}
125 125
 
126 126
 		$dataValue = $snak->getDataValue();
@@ -130,49 +130,49 @@  discard block
 block discarded – undo
130 130
 		 *   type of $dataValue for properties with 'Commons link' constraint has to be 'string'
131 131
 		 *   parameter $namespace can be null, works for commons galleries
132 132
 		 */
133
-		if ( $dataValue->getType() !== 'string' ) {
134
-			$message = wfMessage( "wbqc-violation-message-value-needed-of-type" )
133
+		if ($dataValue->getType() !== 'string') {
134
+			$message = wfMessage("wbqc-violation-message-value-needed-of-type")
135 135
 					 ->rawParams(
136
-						 $this->constraintParameterRenderer->formatItemId( $constraint->getConstraintTypeItemId(), Role::CONSTRAINT_TYPE_ITEM ),
137
-						 wfMessage( 'datatypes-type-string' )->escaped()
136
+						 $this->constraintParameterRenderer->formatItemId($constraint->getConstraintTypeItemId(), Role::CONSTRAINT_TYPE_ITEM),
137
+						 wfMessage('datatypes-type-string')->escaped()
138 138
 					 )
139 139
 					 ->escaped();
140
-			return new CheckResult( $context, $constraint, $parameters, CheckResult::STATUS_VIOLATION, $message );
140
+			return new CheckResult($context, $constraint, $parameters, CheckResult::STATUS_VIOLATION, $message);
141 141
 		}
142 142
 
143 143
 		$commonsLink = $dataValue->getValue();
144 144
 
145 145
 		try {
146
-			if ( !$this->commonsLinkIsWellFormed( $commonsLink ) ) {
147
-				throw new MalformedTitleException( 'wbqc-violation-message-commons-link-not-well-formed', $commonsLink ); // caught below
146
+			if (!$this->commonsLinkIsWellFormed($commonsLink)) {
147
+				throw new MalformedTitleException('wbqc-violation-message-commons-link-not-well-formed', $commonsLink); // caught below
148 148
 			}
149
-			list( $defaultNamespace, $prefix ) = $this->getCommonsNamespace( $namespace );
150
-			$title = $this->titleParser->parseTitle( $prefix . $commonsLink, $defaultNamespace );
151
-			if ( $this->pageExists( $title ) ) {
149
+			list($defaultNamespace, $prefix) = $this->getCommonsNamespace($namespace);
150
+			$title = $this->titleParser->parseTitle($prefix.$commonsLink, $defaultNamespace);
151
+			if ($this->pageExists($title)) {
152 152
 				$message = '';
153 153
 				$status = CheckResult::STATUS_COMPLIANCE;
154 154
 			} else {
155
-				if ( $this->valueIncludesNamespace( $commonsLink, $namespace ) ) {
156
-					throw new MalformedTitleException( 'wbqc-violation-message-commons-link-not-well-formed', $commonsLink ); // caught below
155
+				if ($this->valueIncludesNamespace($commonsLink, $namespace)) {
156
+					throw new MalformedTitleException('wbqc-violation-message-commons-link-not-well-formed', $commonsLink); // caught below
157 157
 				} else {
158
-					$message = wfMessage( "wbqc-violation-message-commons-link-no-existent" )->escaped();
158
+					$message = wfMessage("wbqc-violation-message-commons-link-no-existent")->escaped();
159 159
 					$status = CheckResult::STATUS_VIOLATION;
160 160
 				}
161 161
 			}
162
-		} catch ( MalformedTitleException $e ) {
163
-			$message = wfMessage( "wbqc-violation-message-commons-link-not-well-formed" )->escaped();
162
+		} catch (MalformedTitleException $e) {
163
+			$message = wfMessage("wbqc-violation-message-commons-link-not-well-formed")->escaped();
164 164
 			$status = CheckResult::STATUS_VIOLATION;
165 165
 		}
166 166
 
167
-		return new CheckResult( $context, $constraint, $parameters, $status, $message );
167
+		return new CheckResult($context, $constraint, $parameters, $status, $message);
168 168
 	}
169 169
 
170
-	public function checkConstraintParameters( Constraint $constraint ) {
170
+	public function checkConstraintParameters(Constraint $constraint) {
171 171
 		$constraintParameters = $constraint->getConstraintParameters();
172 172
 		$exceptions = [];
173 173
 		try {
174
-			$this->constraintParameterParser->parseNamespaceParameter( $constraintParameters, $constraint->getConstraintTypeItemId() );
175
-		} catch ( ConstraintParameterException $e ) {
174
+			$this->constraintParameterParser->parseNamespaceParameter($constraintParameters, $constraint->getConstraintTypeItemId());
175
+		} catch (ConstraintParameterException $e) {
176 176
 			$exceptions[] = $e;
177 177
 		}
178 178
 		return $exceptions;
@@ -183,19 +183,19 @@  discard block
 block discarded – undo
183 183
 	 *
184 184
 	 * @return bool
185 185
 	 */
186
-	private function pageExists( TitleValue $title ) {
186
+	private function pageExists(TitleValue $title) {
187 187
 		$commonsWikiId = 'commonswiki';
188
-		if ( defined( 'MW_PHPUNIT_TEST' ) ) {
188
+		if (defined('MW_PHPUNIT_TEST')) {
189 189
 			$commonsWikiId = false;
190 190
 		}
191 191
 
192
-		$dbLoadBalancer = wfGetLB( $commonsWikiId );
192
+		$dbLoadBalancer = wfGetLB($commonsWikiId);
193 193
 		$dbConnection = $dbLoadBalancer->getConnection(
194 194
 			DB_REPLICA, false, $commonsWikiId );
195
-		$row = $dbConnection->selectRow( 'page', '*', [
195
+		$row = $dbConnection->selectRow('page', '*', [
196 196
 			'page_title' => $title->getDBkey(),
197 197
 			'page_namespace' => $title->getNamespace()
198
-		] );
198
+		]);
199 199
 
200 200
 		return $row !== false;
201 201
 	}
@@ -205,9 +205,9 @@  discard block
 block discarded – undo
205 205
 	 *
206 206
 	 * @return bool
207 207
 	 */
208
-	private function commonsLinkIsWellFormed( $commonsLink ) {
209
-		$toReplace = [ "_", "%20" ];
210
-		$compareString = trim( str_replace( $toReplace, '', $commonsLink ) );
208
+	private function commonsLinkIsWellFormed($commonsLink) {
209
+		$toReplace = ["_", "%20"];
210
+		$compareString = trim(str_replace($toReplace, '', $commonsLink));
211 211
 		return $commonsLink === $compareString;
212 212
 	}
213 213
 
@@ -220,9 +220,9 @@  discard block
 block discarded – undo
220 220
 	 *
221 221
 	 * @return bool
222 222
 	 */
223
-	private function valueIncludesNamespace( $value, $namespace ) {
223
+	private function valueIncludesNamespace($value, $namespace) {
224 224
 		return $namespace !== '' &&
225
-			strncasecmp( $value, $namespace . ':', strlen( $namespace ) + 1 ) === 0;
225
+			strncasecmp($value, $namespace.':', strlen($namespace) + 1) === 0;
226 226
 	}
227 227
 
228 228
 }
Please login to merge, or discard this patch.