@@ -38,90 +38,90 @@ |
||
| 38 | 38 | const RESULTS_SOURCE = 'WBQC_ResultsSource'; |
| 39 | 39 | const EXPIRY_LOCK = 'WBQC_ExpiryLock'; |
| 40 | 40 | |
| 41 | - private static function getService( MediaWikiServices $services = null, $name ) { |
|
| 42 | - if ( $services === null ) { |
|
| 41 | + private static function getService(MediaWikiServices $services = null, $name) { |
|
| 42 | + if ($services === null) { |
|
| 43 | 43 | $services = MediaWikiServices::getInstance(); |
| 44 | 44 | } |
| 45 | - return $services->getService( $name ); |
|
| 45 | + return $services->getService($name); |
|
| 46 | 46 | } |
| 47 | 47 | |
| 48 | - public static function getLoggingHelper( MediaWikiServices $services = null ): LoggingHelper { |
|
| 49 | - return self::getService( $services, self::LOGGING_HELPER ); |
|
| 48 | + public static function getLoggingHelper(MediaWikiServices $services = null): LoggingHelper { |
|
| 49 | + return self::getService($services, self::LOGGING_HELPER); |
|
| 50 | 50 | } |
| 51 | 51 | |
| 52 | 52 | public static function getConstraintRepository( |
| 53 | 53 | MediaWikiServices $services = null |
| 54 | 54 | ): ConstraintRepository { |
| 55 | - return self::getService( $services, self::CONSTRAINT_REPOSITORY ); |
|
| 55 | + return self::getService($services, self::CONSTRAINT_REPOSITORY); |
|
| 56 | 56 | } |
| 57 | 57 | |
| 58 | - public static function getConstraintLookup( MediaWikiServices $services = null ): ConstraintLookup { |
|
| 59 | - return self::getService( $services, self::CONSTRAINT_LOOKUP ); |
|
| 58 | + public static function getConstraintLookup(MediaWikiServices $services = null): ConstraintLookup { |
|
| 59 | + return self::getService($services, self::CONSTRAINT_LOOKUP); |
|
| 60 | 60 | } |
| 61 | 61 | |
| 62 | 62 | public static function getCheckResultSerializer( |
| 63 | 63 | MediaWikiServices $services = null |
| 64 | 64 | ): CheckResultSerializer { |
| 65 | - return self::getService( $services, self::CHECK_RESULT_SERIALIZER ); |
|
| 65 | + return self::getService($services, self::CHECK_RESULT_SERIALIZER); |
|
| 66 | 66 | } |
| 67 | 67 | |
| 68 | 68 | public static function getCheckResultDeserializer( |
| 69 | 69 | MediaWikiServices $services = null |
| 70 | 70 | ): CheckResultDeserializer { |
| 71 | - return self::getService( $services, self::CHECK_RESULT_DESERIALIZER ); |
|
| 71 | + return self::getService($services, self::CHECK_RESULT_DESERIALIZER); |
|
| 72 | 72 | } |
| 73 | 73 | |
| 74 | 74 | public static function getViolationMessageSerializer( |
| 75 | 75 | MediaWikiServices $services = null |
| 76 | 76 | ): ViolationMessageSerializer { |
| 77 | - return self::getService( $services, self::VIOLATION_MESSAGE_SERIALIZER ); |
|
| 77 | + return self::getService($services, self::VIOLATION_MESSAGE_SERIALIZER); |
|
| 78 | 78 | } |
| 79 | 79 | |
| 80 | 80 | public static function getViolationMessageDeserializer( |
| 81 | 81 | MediaWikiServices $services = null |
| 82 | 82 | ): ViolationMessageDeserializer { |
| 83 | - return self::getService( $services, self::VIOLATION_MESSAGE_DESERIALIZER ); |
|
| 83 | + return self::getService($services, self::VIOLATION_MESSAGE_DESERIALIZER); |
|
| 84 | 84 | } |
| 85 | 85 | |
| 86 | 86 | public static function getConstraintParameterParser( |
| 87 | 87 | MediaWikiServices $services = null |
| 88 | 88 | ): ConstraintParameterParser { |
| 89 | - return self::getService( $services, self::CONSTRAINT_PARAMETER_PARSER ); |
|
| 89 | + return self::getService($services, self::CONSTRAINT_PARAMETER_PARSER); |
|
| 90 | 90 | } |
| 91 | 91 | |
| 92 | 92 | public static function getConnectionCheckerHelper( |
| 93 | 93 | MediaWikiServices $services = null |
| 94 | 94 | ): ConnectionCheckerHelper { |
| 95 | - return self::getService( $services, self::CONNECTION_CHECKER_HELPER ); |
|
| 95 | + return self::getService($services, self::CONNECTION_CHECKER_HELPER); |
|
| 96 | 96 | } |
| 97 | 97 | |
| 98 | - public static function getRangeCheckerHelper( MediaWikiServices $services = null ): RangeCheckerHelper { |
|
| 99 | - return self::getService( $services, self::RANGE_CHECKER_HELPER ); |
|
| 98 | + public static function getRangeCheckerHelper(MediaWikiServices $services = null): RangeCheckerHelper { |
|
| 99 | + return self::getService($services, self::RANGE_CHECKER_HELPER); |
|
| 100 | 100 | } |
| 101 | 101 | |
| 102 | - public static function getSparqlHelper( MediaWikiServices $services = null ): SparqlHelper { |
|
| 103 | - return self::getService( $services, self::SPARQL_HELPER ); |
|
| 102 | + public static function getSparqlHelper(MediaWikiServices $services = null): SparqlHelper { |
|
| 103 | + return self::getService($services, self::SPARQL_HELPER); |
|
| 104 | 104 | } |
| 105 | 105 | |
| 106 | - public static function getTypeCheckerHelper( MediaWikiServices $services = null ): TypeCheckerHelper { |
|
| 107 | - return self::getService( $services, self::TYPE_CHECKER_HELPER ); |
|
| 106 | + public static function getTypeCheckerHelper(MediaWikiServices $services = null): TypeCheckerHelper { |
|
| 107 | + return self::getService($services, self::TYPE_CHECKER_HELPER); |
|
| 108 | 108 | } |
| 109 | 109 | |
| 110 | 110 | public static function getDelegatingConstraintChecker( |
| 111 | 111 | MediaWikiServices $services = null |
| 112 | 112 | ): DelegatingConstraintChecker { |
| 113 | - return self::getService( $services, self::DELEGATING_CONSTRAINT_CHECKER ); |
|
| 113 | + return self::getService($services, self::DELEGATING_CONSTRAINT_CHECKER); |
|
| 114 | 114 | } |
| 115 | 115 | |
| 116 | - public static function getResultsSource( MediaWikiServices $services = null ): ResultsSource { |
|
| 117 | - return self::getService( $services, self::RESULTS_SOURCE ); |
|
| 116 | + public static function getResultsSource(MediaWikiServices $services = null): ResultsSource { |
|
| 117 | + return self::getService($services, self::RESULTS_SOURCE); |
|
| 118 | 118 | } |
| 119 | 119 | |
| 120 | 120 | /** |
| 121 | 121 | * @return ExpiryLock |
| 122 | 122 | */ |
| 123 | - public static function getExpiryLock( MediaWikiServices $services = null ) { |
|
| 124 | - return self::getService( $services, self::EXPIRY_LOCK ); |
|
| 123 | + public static function getExpiryLock(MediaWikiServices $services = null) { |
|
| 124 | + return self::getService($services, self::EXPIRY_LOCK); |
|
| 125 | 125 | } |
| 126 | 126 | |
| 127 | 127 | } |
@@ -65,6 +65,7 @@ discard block |
||
| 65 | 65 | * and return it along with the associated log level. |
| 66 | 66 | * |
| 67 | 67 | * @param float $durationSeconds |
| 68 | + * @param double[] $limits |
|
| 68 | 69 | * @return array [ $limitSeconds, $logLevel ] |
| 69 | 70 | */ |
| 70 | 71 | private function findLimit( $limits, $durationSeconds ) { |
@@ -174,6 +175,7 @@ discard block |
||
| 174 | 175 | * @param EntityId $entityId |
| 175 | 176 | * @param CheckResult[] $checkResults |
| 176 | 177 | * @param float $durationSeconds |
| 178 | + * @param string $method |
|
| 177 | 179 | */ |
| 178 | 180 | public function logConstraintCheckOnEntity( |
| 179 | 181 | EntityId $entityId, |
@@ -53,12 +53,12 @@ discard block |
||
| 53 | 53 | $this->dataFactory = $dataFactory; |
| 54 | 54 | $this->logger = $logger; |
| 55 | 55 | $this->constraintCheckDurationLimits = [ |
| 56 | - 'info' => $config->get( 'WBQualityConstraintsCheckDurationInfoSeconds' ), |
|
| 57 | - 'warning' => $config->get( 'WBQualityConstraintsCheckDurationWarningSeconds' ), |
|
| 56 | + 'info' => $config->get('WBQualityConstraintsCheckDurationInfoSeconds'), |
|
| 57 | + 'warning' => $config->get('WBQualityConstraintsCheckDurationWarningSeconds'), |
|
| 58 | 58 | ]; |
| 59 | 59 | $this->constraintCheckOnEntityDurationLimits = [ |
| 60 | - 'info' => $config->get( 'WBQualityConstraintsCheckOnEntityDurationInfoSeconds' ), |
|
| 61 | - 'warning' => $config->get( 'WBQualityConstraintsCheckOnEntityDurationWarningSeconds' ), |
|
| 60 | + 'info' => $config->get('WBQualityConstraintsCheckOnEntityDurationInfoSeconds'), |
|
| 61 | + 'warning' => $config->get('WBQualityConstraintsCheckOnEntityDurationWarningSeconds'), |
|
| 62 | 62 | ]; |
| 63 | 63 | } |
| 64 | 64 | |
@@ -69,23 +69,23 @@ discard block |
||
| 69 | 69 | * @param float $durationSeconds |
| 70 | 70 | * @return array [ $limitSeconds, $logLevel ] |
| 71 | 71 | */ |
| 72 | - private function findLimit( $limits, $durationSeconds ) { |
|
| 72 | + private function findLimit($limits, $durationSeconds) { |
|
| 73 | 73 | $limitSeconds = null; |
| 74 | 74 | $logLevel = null; |
| 75 | 75 | |
| 76 | - foreach ( $limits as $level => $limit ) { |
|
| 76 | + foreach ($limits as $level => $limit) { |
|
| 77 | 77 | if ( |
| 78 | 78 | // duration exceeds this limit |
| 79 | - isset( $limit ) && $durationSeconds > $limit && |
|
| 79 | + isset($limit) && $durationSeconds > $limit && |
|
| 80 | 80 | // this limit is longer than previous longest limit |
| 81 | - ( $limitSeconds === null || $limit > $limitSeconds ) |
|
| 81 | + ($limitSeconds === null || $limit > $limitSeconds) |
|
| 82 | 82 | ) { |
| 83 | 83 | $limitSeconds = $limit; |
| 84 | 84 | $logLevel = $level; |
| 85 | 85 | } |
| 86 | 86 | } |
| 87 | 87 | |
| 88 | - return [ $limitSeconds, $logLevel ]; |
|
| 88 | + return [$limitSeconds, $logLevel]; |
|
| 89 | 89 | } |
| 90 | 90 | |
| 91 | 91 | /** |
@@ -110,31 +110,31 @@ discard block |
||
| 110 | 110 | $durationSeconds, |
| 111 | 111 | $method |
| 112 | 112 | ) { |
| 113 | - $constraintCheckerClassShortName = substr( strrchr( $constraintCheckerClass, '\\' ), 1 ); |
|
| 113 | + $constraintCheckerClassShortName = substr(strrchr($constraintCheckerClass, '\\'), 1); |
|
| 114 | 114 | $constraintTypeItemId = $constraint->getConstraintTypeItemId(); |
| 115 | 115 | |
| 116 | 116 | $this->dataFactory->timing( |
| 117 | - 'wikibase.quality.constraints.check.timing.' . |
|
| 118 | - $constraintTypeItemId . '-' . |
|
| 117 | + 'wikibase.quality.constraints.check.timing.'. |
|
| 118 | + $constraintTypeItemId.'-'. |
|
| 119 | 119 | $constraintCheckerClassShortName, |
| 120 | 120 | $durationSeconds * 1000 |
| 121 | 121 | ); |
| 122 | 122 | |
| 123 | 123 | // find the longest limit (and associated log level) that the duration exceeds |
| 124 | - list( $limitSeconds, $logLevel ) = $this->findLimit( |
|
| 124 | + list($limitSeconds, $logLevel) = $this->findLimit( |
|
| 125 | 125 | $this->constraintCheckDurationLimits, |
| 126 | 126 | $durationSeconds |
| 127 | 127 | ); |
| 128 | - if ( $limitSeconds === null ) { |
|
| 128 | + if ($limitSeconds === null) { |
|
| 129 | 129 | return; |
| 130 | 130 | } |
| 131 | - if ( $context->getType() !== Context::TYPE_STATEMENT ) { |
|
| 131 | + if ($context->getType() !== Context::TYPE_STATEMENT) { |
|
| 132 | 132 | // TODO log less details but still log something |
| 133 | 133 | return; |
| 134 | 134 | } |
| 135 | 135 | |
| 136 | 136 | $resultMessage = $result->getMessage(); |
| 137 | - if ( $resultMessage !== null ) { |
|
| 137 | + if ($resultMessage !== null) { |
|
| 138 | 138 | $resultMessageKey = $resultMessage->getMessageKey(); |
| 139 | 139 | } else { |
| 140 | 140 | $resultMessageKey = null; |
@@ -142,8 +142,8 @@ discard block |
||
| 142 | 142 | |
| 143 | 143 | $this->logger->log( |
| 144 | 144 | $logLevel, |
| 145 | - 'Constraint check with {constraintCheckerClassShortName} ' . |
|
| 146 | - 'took longer than {limitSeconds} second(s) ' . |
|
| 145 | + 'Constraint check with {constraintCheckerClassShortName} '. |
|
| 146 | + 'took longer than {limitSeconds} second(s) '. |
|
| 147 | 147 | '(duration: {durationSeconds} seconds).', |
| 148 | 148 | [ |
| 149 | 149 | 'method' => $method, |
@@ -153,13 +153,13 @@ discard block |
||
| 153 | 153 | 'constraintId' => $constraint->getConstraintId(), |
| 154 | 154 | 'constraintPropertyId' => $constraint->getPropertyId()->getSerialization(), |
| 155 | 155 | 'constraintTypeItemId' => $constraintTypeItemId, |
| 156 | - 'constraintParameters' => json_encode( $constraint->getConstraintParameters() ), |
|
| 156 | + 'constraintParameters' => json_encode($constraint->getConstraintParameters()), |
|
| 157 | 157 | 'constraintCheckerClass' => $constraintCheckerClass, |
| 158 | 158 | 'constraintCheckerClassShortName' => $constraintCheckerClassShortName, |
| 159 | 159 | 'entityId' => $context->getEntity()->getId()->getSerialization(), |
| 160 | 160 | 'statementGuid' => $context->getSnakStatement()->getGuid(), |
| 161 | 161 | 'resultStatus' => $result->getStatus(), |
| 162 | - 'resultParameters' => json_encode( $result->getParameters() ), |
|
| 162 | + 'resultParameters' => json_encode($result->getParameters()), |
|
| 163 | 163 | 'resultMessage' => $resultMessageKey, |
| 164 | 164 | ] |
| 165 | 165 | ); |
@@ -189,18 +189,18 @@ discard block |
||
| 189 | 189 | ); |
| 190 | 190 | |
| 191 | 191 | // find the longest limit (and associated log level) that the duration exceeds |
| 192 | - list( $limitSeconds, $logLevel ) = $this->findLimit( |
|
| 192 | + list($limitSeconds, $logLevel) = $this->findLimit( |
|
| 193 | 193 | $this->constraintCheckOnEntityDurationLimits, |
| 194 | 194 | $durationSeconds |
| 195 | 195 | ); |
| 196 | - if ( $limitSeconds === null ) { |
|
| 196 | + if ($limitSeconds === null) { |
|
| 197 | 197 | return; |
| 198 | 198 | } |
| 199 | 199 | |
| 200 | 200 | $this->logger->log( |
| 201 | 201 | $logLevel, |
| 202 | - 'Full constraint check on {entityId} ' . |
|
| 203 | - 'took longer than {limitSeconds} second(s) ' . |
|
| 202 | + 'Full constraint check on {entityId} '. |
|
| 203 | + 'took longer than {limitSeconds} second(s) '. |
|
| 204 | 204 | '(duration: {durationSeconds} seconds).', |
| 205 | 205 | [ |
| 206 | 206 | 'method' => $method, |
@@ -218,7 +218,7 @@ discard block |
||
| 218 | 218 | * |
| 219 | 219 | * @param EntityId $entityId |
| 220 | 220 | */ |
| 221 | - public function logCheckConstraintsCacheHit( EntityId $entityId ) { |
|
| 221 | + public function logCheckConstraintsCacheHit(EntityId $entityId) { |
|
| 222 | 222 | $this->dataFactory->increment( |
| 223 | 223 | 'wikibase.quality.constraints.cache.entity.hit' |
| 224 | 224 | ); |
@@ -229,10 +229,10 @@ discard block |
||
| 229 | 229 | * |
| 230 | 230 | * @param EntityId[] $entityIds |
| 231 | 231 | */ |
| 232 | - public function logCheckConstraintsCacheMisses( array $entityIds ) { |
|
| 232 | + public function logCheckConstraintsCacheMisses(array $entityIds) { |
|
| 233 | 233 | $this->dataFactory->updateCount( |
| 234 | 234 | 'wikibase.quality.constraints.cache.entity.miss', |
| 235 | - count( $entityIds ) |
|
| 235 | + count($entityIds) |
|
| 236 | 236 | ); |
| 237 | 237 | } |
| 238 | 238 | |
@@ -259,17 +259,17 @@ discard block |
||
| 259 | 259 | * @param EntityId[] $entityIds |
| 260 | 260 | * @param int $maxRevisionIds |
| 261 | 261 | */ |
| 262 | - public function logHugeDependencyMetadata( array $entityIds, $maxRevisionIds ) { |
|
| 262 | + public function logHugeDependencyMetadata(array $entityIds, $maxRevisionIds) { |
|
| 263 | 263 | $this->logger->log( |
| 264 | 264 | 'warning', |
| 265 | - 'Dependency metadata for constraint check result has huge set of entity IDs ' . |
|
| 266 | - '(count ' . count( $entityIds ) . ', limit ' . $maxRevisionIds . '); ' . |
|
| 265 | + 'Dependency metadata for constraint check result has huge set of entity IDs '. |
|
| 266 | + '(count '.count($entityIds).', limit '.$maxRevisionIds.'); '. |
|
| 267 | 267 | 'caching disabled for this check result.', |
| 268 | 268 | [ |
| 269 | 269 | 'loggingMethod' => __METHOD__, |
| 270 | 270 | 'entityIds' => json_encode( |
| 271 | 271 | array_map( |
| 272 | - function ( EntityId $entityId ) { |
|
| 272 | + function(EntityId $entityId) { |
|
| 273 | 273 | return $entityId->getSerialization(); |
| 274 | 274 | }, |
| 275 | 275 | $entityIds |
@@ -280,22 +280,22 @@ discard block |
||
| 280 | 280 | ); |
| 281 | 281 | } |
| 282 | 282 | |
| 283 | - public function logSparqlHelperTooManyRequestsRetryAfterPresent( ConvertibleTimestamp $retryAfterTime, MWHttpRequest $request ) { |
|
| 283 | + public function logSparqlHelperTooManyRequestsRetryAfterPresent(ConvertibleTimestamp $retryAfterTime, MWHttpRequest $request) { |
|
| 284 | 284 | $this->logger->notice( |
| 285 | 285 | 'Sparql API replied with status 429 and a retry-after header. Requesting to retry after {retryAfterTime}', |
| 286 | 286 | [ |
| 287 | 287 | 'retryAfterTime' => $retryAfterTime, |
| 288 | - 'responseHeaders' => json_encode( $request->getResponseHeaders() ), |
|
| 288 | + 'responseHeaders' => json_encode($request->getResponseHeaders()), |
|
| 289 | 289 | 'responseContent' => $request->getContent(), |
| 290 | 290 | ] |
| 291 | 291 | ); |
| 292 | 292 | } |
| 293 | 293 | |
| 294 | - public function logSparqlHelperTooManyRequestsRetryAfterInvalid( MWHttpRequest $request ) { |
|
| 294 | + public function logSparqlHelperTooManyRequestsRetryAfterInvalid(MWHttpRequest $request) { |
|
| 295 | 295 | $this->logger->warning( |
| 296 | 296 | 'Sparql API replied with status 429 and no valid retry-after header.', |
| 297 | 297 | [ |
| 298 | - 'responseHeaders' => json_encode( $request->getResponseHeaders() ), |
|
| 298 | + 'responseHeaders' => json_encode($request->getResponseHeaders()), |
|
| 299 | 299 | 'responseContent' => $request->getContent(), |
| 300 | 300 | ] |
| 301 | 301 | ); |
@@ -8,7 +8,7 @@ |
||
| 8 | 8 | class TooManySparqlRequestsException extends SparqlHelperException { |
| 9 | 9 | |
| 10 | 10 | public function __construct() { |
| 11 | - parent::__construct( 'The SPARQL query endpoint reports too many requests.' ); |
|
| 11 | + parent::__construct('The SPARQL query endpoint reports too many requests.'); |
|
| 12 | 12 | } |
| 13 | 13 | |
| 14 | 14 | } |
@@ -9,8 +9,8 @@ |
||
| 9 | 9 | */ |
| 10 | 10 | class SparqlHelperException extends RuntimeException { |
| 11 | 11 | |
| 12 | - public function __construct( $msg = 'The SPARQL query endpoint returned an error.' ) { |
|
| 13 | - parent::__construct( $msg ); |
|
| 12 | + public function __construct($msg = 'The SPARQL query endpoint returned an error.') { |
|
| 13 | + parent::__construct($msg); |
|
| 14 | 14 | } |
| 15 | 15 | |
| 16 | 16 | } |
@@ -27,28 +27,28 @@ discard block |
||
| 27 | 27 | use WikibaseQuality\ConstraintReport\ConstraintCheck\Result\CheckResultSerializer; |
| 28 | 28 | |
| 29 | 29 | return [ |
| 30 | - ConstraintsServices::EXPIRY_LOCK => function( MediaWikiServices $services ) { |
|
| 31 | - return new ExpiryLock( ObjectCache::getInstance( CACHE_ANYTHING ) ); |
|
| 30 | + ConstraintsServices::EXPIRY_LOCK => function(MediaWikiServices $services) { |
|
| 31 | + return new ExpiryLock(ObjectCache::getInstance(CACHE_ANYTHING)); |
|
| 32 | 32 | }, |
| 33 | 33 | |
| 34 | - ConstraintsServices::LOGGING_HELPER => function( MediaWikiServices $services ) { |
|
| 34 | + ConstraintsServices::LOGGING_HELPER => function(MediaWikiServices $services) { |
|
| 35 | 35 | return new LoggingHelper( |
| 36 | 36 | $services->getStatsdDataFactory(), |
| 37 | - LoggerFactory::getInstance( 'WikibaseQualityConstraints' ), |
|
| 37 | + LoggerFactory::getInstance('WikibaseQualityConstraints'), |
|
| 38 | 38 | $services->getMainConfig() |
| 39 | 39 | ); |
| 40 | 40 | }, |
| 41 | 41 | |
| 42 | - ConstraintsServices::CONSTRAINT_REPOSITORY => function( MediaWikiServices $services ) { |
|
| 42 | + ConstraintsServices::CONSTRAINT_REPOSITORY => function(MediaWikiServices $services) { |
|
| 43 | 43 | return new ConstraintRepository(); |
| 44 | 44 | }, |
| 45 | 45 | |
| 46 | - ConstraintsServices::CONSTRAINT_LOOKUP => function( MediaWikiServices $services ) { |
|
| 47 | - $constraintRepository = ConstraintsServices::getConstraintRepository( $services ); |
|
| 48 | - return new CachingConstraintLookup( $constraintRepository ); |
|
| 46 | + ConstraintsServices::CONSTRAINT_LOOKUP => function(MediaWikiServices $services) { |
|
| 47 | + $constraintRepository = ConstraintsServices::getConstraintRepository($services); |
|
| 48 | + return new CachingConstraintLookup($constraintRepository); |
|
| 49 | 49 | }, |
| 50 | 50 | |
| 51 | - ConstraintsServices::CHECK_RESULT_SERIALIZER => function( MediaWikiServices $services ) { |
|
| 51 | + ConstraintsServices::CHECK_RESULT_SERIALIZER => function(MediaWikiServices $services) { |
|
| 52 | 52 | return new CheckResultSerializer( |
| 53 | 53 | new ConstraintSerializer( |
| 54 | 54 | false // constraint parameters are not exposed |
@@ -59,7 +59,7 @@ discard block |
||
| 59 | 59 | ); |
| 60 | 60 | }, |
| 61 | 61 | |
| 62 | - ConstraintsServices::CHECK_RESULT_DESERIALIZER => function( MediaWikiServices $services ) { |
|
| 62 | + ConstraintsServices::CHECK_RESULT_DESERIALIZER => function(MediaWikiServices $services) { |
|
| 63 | 63 | // TODO in the future, get EntityIdParser and DataValueFactory from $services? |
| 64 | 64 | $repo = WikibaseRepo::getDefaultInstance(); |
| 65 | 65 | $entityIdParser = $repo->getEntityIdParser(); |
@@ -76,11 +76,11 @@ discard block |
||
| 76 | 76 | ); |
| 77 | 77 | }, |
| 78 | 78 | |
| 79 | - ConstraintsServices::VIOLATION_MESSAGE_SERIALIZER => function( MediaWikiServices $services ) { |
|
| 79 | + ConstraintsServices::VIOLATION_MESSAGE_SERIALIZER => function(MediaWikiServices $services) { |
|
| 80 | 80 | return new ViolationMessageSerializer(); |
| 81 | 81 | }, |
| 82 | 82 | |
| 83 | - ConstraintsServices::VIOLATION_MESSAGE_DESERIALIZER => function( MediaWikiServices $services ) { |
|
| 83 | + ConstraintsServices::VIOLATION_MESSAGE_DESERIALIZER => function(MediaWikiServices $services) { |
|
| 84 | 84 | // TODO in the future, get EntityIdParser and DataValueFactory from $services? |
| 85 | 85 | $repo = WikibaseRepo::getDefaultInstance(); |
| 86 | 86 | $entityIdParser = $repo->getEntityIdParser(); |
@@ -92,7 +92,7 @@ discard block |
||
| 92 | 92 | ); |
| 93 | 93 | }, |
| 94 | 94 | |
| 95 | - ConstraintsServices::CONSTRAINT_PARAMETER_PARSER => function( MediaWikiServices $services ) { |
|
| 95 | + ConstraintsServices::CONSTRAINT_PARAMETER_PARSER => function(MediaWikiServices $services) { |
|
| 96 | 96 | // TODO in the future, get DeserializerFactory and concept base URIs from $services? |
| 97 | 97 | $repo = WikibaseRepo::getDefaultInstance(); |
| 98 | 98 | $deserializerFactory = $repo->getBaseDataModelDeserializerFactory(); |
@@ -105,11 +105,11 @@ discard block |
||
| 105 | 105 | ); |
| 106 | 106 | }, |
| 107 | 107 | |
| 108 | - ConstraintsServices::CONNECTION_CHECKER_HELPER => function( MediaWikiServices $services ) { |
|
| 108 | + ConstraintsServices::CONNECTION_CHECKER_HELPER => function(MediaWikiServices $services) { |
|
| 109 | 109 | return new ConnectionCheckerHelper(); |
| 110 | 110 | }, |
| 111 | 111 | |
| 112 | - ConstraintsServices::RANGE_CHECKER_HELPER => function( MediaWikiServices $services ) { |
|
| 112 | + ConstraintsServices::RANGE_CHECKER_HELPER => function(MediaWikiServices $services) { |
|
| 113 | 113 | // TODO in the future, get UnitConverter from $services? |
| 114 | 114 | $repo = WikibaseRepo::getDefaultInstance(); |
| 115 | 115 | $unitConverter = $repo->getUnitConverter(); |
@@ -120,9 +120,9 @@ discard block |
||
| 120 | 120 | ); |
| 121 | 121 | }, |
| 122 | 122 | |
| 123 | - ConstraintsServices::SPARQL_HELPER => function( MediaWikiServices $services ) { |
|
| 124 | - $endpoint = $services->getMainConfig()->get( 'WBQualityConstraintsSparqlEndpoint' ); |
|
| 125 | - if ( $endpoint === '' ) { |
|
| 123 | + ConstraintsServices::SPARQL_HELPER => function(MediaWikiServices $services) { |
|
| 124 | + $endpoint = $services->getMainConfig()->get('WBQualityConstraintsSparqlEndpoint'); |
|
| 125 | + if ($endpoint === '') { |
|
| 126 | 126 | return new DummySparqlHelper(); |
| 127 | 127 | } |
| 128 | 128 | |
@@ -138,117 +138,117 @@ discard block |
||
| 138 | 138 | $entityIdParser, |
| 139 | 139 | $propertyDataTypeLookup, |
| 140 | 140 | $services->getMainWANObjectCache(), |
| 141 | - ConstraintsServices::getViolationMessageSerializer( $services ), |
|
| 142 | - ConstraintsServices::getViolationMessageDeserializer( $services ), |
|
| 141 | + ConstraintsServices::getViolationMessageSerializer($services), |
|
| 142 | + ConstraintsServices::getViolationMessageDeserializer($services), |
|
| 143 | 143 | $services->getStatsdDataFactory(), |
| 144 | - ConstraintsServices::getExpiryLock( $services ), |
|
| 144 | + ConstraintsServices::getExpiryLock($services), |
|
| 145 | 145 | ConstraintsServices::getLoggingHelper(), |
| 146 | - wfWikiID() . ' WikibaseQualityConstraints ' . Http::userAgent(), |
|
| 146 | + wfWikiID().' WikibaseQualityConstraints '.Http::userAgent(), |
|
| 147 | 147 | $services->getHttpRequestFactory() |
| 148 | 148 | ); |
| 149 | 149 | }, |
| 150 | 150 | |
| 151 | - ConstraintsServices::TYPE_CHECKER_HELPER => function( MediaWikiServices $services ) { |
|
| 151 | + ConstraintsServices::TYPE_CHECKER_HELPER => function(MediaWikiServices $services) { |
|
| 152 | 152 | return new TypeCheckerHelper( |
| 153 | - WikibaseServices::getEntityLookup( $services ), |
|
| 153 | + WikibaseServices::getEntityLookup($services), |
|
| 154 | 154 | $services->getMainConfig(), |
| 155 | - ConstraintsServices::getSparqlHelper( $services ), |
|
| 155 | + ConstraintsServices::getSparqlHelper($services), |
|
| 156 | 156 | $services->getStatsdDataFactory() |
| 157 | 157 | ); |
| 158 | 158 | }, |
| 159 | 159 | |
| 160 | - ConstraintsServices::DELEGATING_CONSTRAINT_CHECKER => function( MediaWikiServices $services ) { |
|
| 160 | + ConstraintsServices::DELEGATING_CONSTRAINT_CHECKER => function(MediaWikiServices $services) { |
|
| 161 | 161 | // TODO in the future, get StatementGuidParser from $services? |
| 162 | 162 | $repo = WikibaseRepo::getDefaultInstance(); |
| 163 | 163 | $statementGuidParser = $repo->getStatementGuidParser(); |
| 164 | 164 | |
| 165 | 165 | $config = $services->getMainConfig(); |
| 166 | 166 | $checkerMap = [ |
| 167 | - $config->get( 'WBQualityConstraintsConflictsWithConstraintId' ) |
|
| 168 | - => ConstraintCheckerServices::getConflictsWithChecker( $services ), |
|
| 169 | - $config->get( 'WBQualityConstraintsItemRequiresClaimConstraintId' ) |
|
| 170 | - => ConstraintCheckerServices::getItemChecker( $services ), |
|
| 171 | - $config->get( 'WBQualityConstraintsValueRequiresClaimConstraintId' ) |
|
| 172 | - => ConstraintCheckerServices::getTargetRequiredClaimChecker( $services ), |
|
| 173 | - $config->get( 'WBQualityConstraintsSymmetricConstraintId' ) |
|
| 174 | - => ConstraintCheckerServices::getSymmetricChecker( $services ), |
|
| 175 | - $config->get( 'WBQualityConstraintsInverseConstraintId' ) |
|
| 176 | - => ConstraintCheckerServices::getInverseChecker( $services ), |
|
| 177 | - $config->get( 'WBQualityConstraintsUsedAsQualifierConstraintId' ) |
|
| 178 | - => ConstraintCheckerServices::getQualifierChecker( $services ), |
|
| 179 | - $config->get( 'WBQualityConstraintsAllowedQualifiersConstraintId' ) |
|
| 180 | - => ConstraintCheckerServices::getQualifiersChecker( $services ), |
|
| 181 | - $config->get( 'WBQualityConstraintsMandatoryQualifierConstraintId' ) |
|
| 182 | - => ConstraintCheckerServices::getMandatoryQualifiersChecker( $services ), |
|
| 183 | - $config->get( 'WBQualityConstraintsRangeConstraintId' ) |
|
| 184 | - => ConstraintCheckerServices::getRangeChecker( $services ), |
|
| 185 | - $config->get( 'WBQualityConstraintsDifferenceWithinRangeConstraintId' ) |
|
| 186 | - => ConstraintCheckerServices::getDiffWithinRangeChecker( $services ), |
|
| 187 | - $config->get( 'WBQualityConstraintsTypeConstraintId' ) |
|
| 188 | - => ConstraintCheckerServices::getTypeChecker( $services ), |
|
| 189 | - $config->get( 'WBQualityConstraintsValueTypeConstraintId' ) |
|
| 190 | - => ConstraintCheckerServices::getValueTypeChecker( $services ), |
|
| 191 | - $config->get( 'WBQualityConstraintsSingleValueConstraintId' ) |
|
| 192 | - => ConstraintCheckerServices::getSingleValueChecker( $services ), |
|
| 193 | - $config->get( 'WBQualityConstraintsMultiValueConstraintId' ) |
|
| 194 | - => ConstraintCheckerServices::getMultiValueChecker( $services ), |
|
| 195 | - $config->get( 'WBQualityConstraintsDistinctValuesConstraintId' ) |
|
| 196 | - => ConstraintCheckerServices::getUniqueValueChecker( $services ), |
|
| 197 | - $config->get( 'WBQualityConstraintsFormatConstraintId' ) |
|
| 198 | - => ConstraintCheckerServices::getFormatChecker( $services ), |
|
| 199 | - $config->get( 'WBQualityConstraintsCommonsLinkConstraintId' ) |
|
| 200 | - => ConstraintCheckerServices::getCommonsLinkChecker( $services ), |
|
| 201 | - $config->get( 'WBQualityConstraintsOneOfConstraintId' ) |
|
| 202 | - => ConstraintCheckerServices::getOneOfChecker( $services ), |
|
| 203 | - $config->get( 'WBQualityConstraintsUsedForValuesOnlyConstraintId' ) |
|
| 204 | - => ConstraintCheckerServices::getValueOnlyChecker( $services ), |
|
| 205 | - $config->get( 'WBQualityConstraintsUsedAsReferenceConstraintId' ) |
|
| 206 | - => ConstraintCheckerServices::getReferenceChecker( $services ), |
|
| 207 | - $config->get( 'WBQualityConstraintsNoBoundsConstraintId' ) |
|
| 208 | - => ConstraintCheckerServices::getNoBoundsChecker( $services ), |
|
| 209 | - $config->get( 'WBQualityConstraintsAllowedUnitsConstraintId' ) |
|
| 210 | - => ConstraintCheckerServices::getAllowedUnitsChecker( $services ), |
|
| 211 | - $config->get( 'WBQualityConstraintsSingleBestValueConstraintId' ) |
|
| 212 | - => ConstraintCheckerServices::getSingleBestValueChecker( $services ), |
|
| 213 | - $config->get( 'WBQualityConstraintsAllowedEntityTypesConstraintId' ) |
|
| 214 | - => ConstraintCheckerServices::getEntityTypeChecker( $services ), |
|
| 215 | - $config->get( 'WBQualityConstraintsNoneOfConstraintId' ) |
|
| 216 | - => ConstraintCheckerServices::getNoneOfChecker( $services ), |
|
| 217 | - $config->get( 'WBQualityConstraintsIntegerConstraintId' ) |
|
| 218 | - => ConstraintCheckerServices::getIntegerChecker( $services ), |
|
| 219 | - $config->get( 'WBQualityConstraintsCitationNeededConstraintId' ) |
|
| 220 | - => ConstraintCheckerServices::getCitationNeededChecker( $services ), |
|
| 221 | - $config->get( 'WBQualityConstraintsPropertyScopeConstraintId' ) |
|
| 222 | - => ConstraintCheckerServices::getPropertyScopeChecker( $services ), |
|
| 223 | - $config->get( 'WBQualityConstraintsContemporaryConstraintId' ) |
|
| 224 | - => ConstraintCheckerServices::getContemporaryChecker( $services ), |
|
| 167 | + $config->get('WBQualityConstraintsConflictsWithConstraintId') |
|
| 168 | + => ConstraintCheckerServices::getConflictsWithChecker($services), |
|
| 169 | + $config->get('WBQualityConstraintsItemRequiresClaimConstraintId') |
|
| 170 | + => ConstraintCheckerServices::getItemChecker($services), |
|
| 171 | + $config->get('WBQualityConstraintsValueRequiresClaimConstraintId') |
|
| 172 | + => ConstraintCheckerServices::getTargetRequiredClaimChecker($services), |
|
| 173 | + $config->get('WBQualityConstraintsSymmetricConstraintId') |
|
| 174 | + => ConstraintCheckerServices::getSymmetricChecker($services), |
|
| 175 | + $config->get('WBQualityConstraintsInverseConstraintId') |
|
| 176 | + => ConstraintCheckerServices::getInverseChecker($services), |
|
| 177 | + $config->get('WBQualityConstraintsUsedAsQualifierConstraintId') |
|
| 178 | + => ConstraintCheckerServices::getQualifierChecker($services), |
|
| 179 | + $config->get('WBQualityConstraintsAllowedQualifiersConstraintId') |
|
| 180 | + => ConstraintCheckerServices::getQualifiersChecker($services), |
|
| 181 | + $config->get('WBQualityConstraintsMandatoryQualifierConstraintId') |
|
| 182 | + => ConstraintCheckerServices::getMandatoryQualifiersChecker($services), |
|
| 183 | + $config->get('WBQualityConstraintsRangeConstraintId') |
|
| 184 | + => ConstraintCheckerServices::getRangeChecker($services), |
|
| 185 | + $config->get('WBQualityConstraintsDifferenceWithinRangeConstraintId') |
|
| 186 | + => ConstraintCheckerServices::getDiffWithinRangeChecker($services), |
|
| 187 | + $config->get('WBQualityConstraintsTypeConstraintId') |
|
| 188 | + => ConstraintCheckerServices::getTypeChecker($services), |
|
| 189 | + $config->get('WBQualityConstraintsValueTypeConstraintId') |
|
| 190 | + => ConstraintCheckerServices::getValueTypeChecker($services), |
|
| 191 | + $config->get('WBQualityConstraintsSingleValueConstraintId') |
|
| 192 | + => ConstraintCheckerServices::getSingleValueChecker($services), |
|
| 193 | + $config->get('WBQualityConstraintsMultiValueConstraintId') |
|
| 194 | + => ConstraintCheckerServices::getMultiValueChecker($services), |
|
| 195 | + $config->get('WBQualityConstraintsDistinctValuesConstraintId') |
|
| 196 | + => ConstraintCheckerServices::getUniqueValueChecker($services), |
|
| 197 | + $config->get('WBQualityConstraintsFormatConstraintId') |
|
| 198 | + => ConstraintCheckerServices::getFormatChecker($services), |
|
| 199 | + $config->get('WBQualityConstraintsCommonsLinkConstraintId') |
|
| 200 | + => ConstraintCheckerServices::getCommonsLinkChecker($services), |
|
| 201 | + $config->get('WBQualityConstraintsOneOfConstraintId') |
|
| 202 | + => ConstraintCheckerServices::getOneOfChecker($services), |
|
| 203 | + $config->get('WBQualityConstraintsUsedForValuesOnlyConstraintId') |
|
| 204 | + => ConstraintCheckerServices::getValueOnlyChecker($services), |
|
| 205 | + $config->get('WBQualityConstraintsUsedAsReferenceConstraintId') |
|
| 206 | + => ConstraintCheckerServices::getReferenceChecker($services), |
|
| 207 | + $config->get('WBQualityConstraintsNoBoundsConstraintId') |
|
| 208 | + => ConstraintCheckerServices::getNoBoundsChecker($services), |
|
| 209 | + $config->get('WBQualityConstraintsAllowedUnitsConstraintId') |
|
| 210 | + => ConstraintCheckerServices::getAllowedUnitsChecker($services), |
|
| 211 | + $config->get('WBQualityConstraintsSingleBestValueConstraintId') |
|
| 212 | + => ConstraintCheckerServices::getSingleBestValueChecker($services), |
|
| 213 | + $config->get('WBQualityConstraintsAllowedEntityTypesConstraintId') |
|
| 214 | + => ConstraintCheckerServices::getEntityTypeChecker($services), |
|
| 215 | + $config->get('WBQualityConstraintsNoneOfConstraintId') |
|
| 216 | + => ConstraintCheckerServices::getNoneOfChecker($services), |
|
| 217 | + $config->get('WBQualityConstraintsIntegerConstraintId') |
|
| 218 | + => ConstraintCheckerServices::getIntegerChecker($services), |
|
| 219 | + $config->get('WBQualityConstraintsCitationNeededConstraintId') |
|
| 220 | + => ConstraintCheckerServices::getCitationNeededChecker($services), |
|
| 221 | + $config->get('WBQualityConstraintsPropertyScopeConstraintId') |
|
| 222 | + => ConstraintCheckerServices::getPropertyScopeChecker($services), |
|
| 223 | + $config->get('WBQualityConstraintsContemporaryConstraintId') |
|
| 224 | + => ConstraintCheckerServices::getContemporaryChecker($services), |
|
| 225 | 225 | ]; |
| 226 | 226 | |
| 227 | 227 | return new DelegatingConstraintChecker( |
| 228 | - WikibaseServices::getEntityLookup( $services ), |
|
| 228 | + WikibaseServices::getEntityLookup($services), |
|
| 229 | 229 | $checkerMap, |
| 230 | - ConstraintsServices::getConstraintLookup( $services ), |
|
| 231 | - ConstraintsServices::getConstraintParameterParser( $services ), |
|
| 230 | + ConstraintsServices::getConstraintLookup($services), |
|
| 231 | + ConstraintsServices::getConstraintParameterParser($services), |
|
| 232 | 232 | $statementGuidParser, |
| 233 | - ConstraintsServices::getLoggingHelper( $services ), |
|
| 234 | - $config->get( 'WBQualityConstraintsCheckQualifiers' ), |
|
| 235 | - $config->get( 'WBQualityConstraintsCheckReferences' ), |
|
| 236 | - $config->get( 'WBQualityConstraintsPropertiesWithViolatingQualifiers' ) |
|
| 233 | + ConstraintsServices::getLoggingHelper($services), |
|
| 234 | + $config->get('WBQualityConstraintsCheckQualifiers'), |
|
| 235 | + $config->get('WBQualityConstraintsCheckReferences'), |
|
| 236 | + $config->get('WBQualityConstraintsPropertiesWithViolatingQualifiers') |
|
| 237 | 237 | ); |
| 238 | 238 | }, |
| 239 | 239 | |
| 240 | - ConstraintsServices::RESULTS_SOURCE => function( MediaWikiServices $services ) { |
|
| 240 | + ConstraintsServices::RESULTS_SOURCE => function(MediaWikiServices $services) { |
|
| 241 | 241 | $config = $services->getMainConfig(); |
| 242 | 242 | $resultsSource = new CheckingResultsSource( |
| 243 | - ConstraintsServices::getDelegatingConstraintChecker( $services ) |
|
| 243 | + ConstraintsServices::getDelegatingConstraintChecker($services) |
|
| 244 | 244 | ); |
| 245 | 245 | |
| 246 | - if ( $config->get( 'WBQualityConstraintsCacheCheckConstraintsResults' ) ) { |
|
| 246 | + if ($config->get('WBQualityConstraintsCacheCheckConstraintsResults')) { |
|
| 247 | 247 | $possiblyStaleConstraintTypes = [ |
| 248 | - $config->get( 'WBQualityConstraintsCommonsLinkConstraintId' ), |
|
| 249 | - $config->get( 'WBQualityConstraintsTypeConstraintId' ), |
|
| 250 | - $config->get( 'WBQualityConstraintsValueTypeConstraintId' ), |
|
| 251 | - $config->get( 'WBQualityConstraintsDistinctValuesConstraintId' ), |
|
| 248 | + $config->get('WBQualityConstraintsCommonsLinkConstraintId'), |
|
| 249 | + $config->get('WBQualityConstraintsTypeConstraintId'), |
|
| 250 | + $config->get('WBQualityConstraintsValueTypeConstraintId'), |
|
| 251 | + $config->get('WBQualityConstraintsDistinctValuesConstraintId'), |
|
| 252 | 252 | ]; |
| 253 | 253 | // TODO in the future, get EntityIdParser and WikiPageEntityMetaDataAccessor from $services? |
| 254 | 254 | $repo = WikibaseRepo::getDefaultInstance(); |
@@ -258,14 +258,14 @@ discard block |
||
| 258 | 258 | $resultsSource = new CachingResultsSource( |
| 259 | 259 | $resultsSource, |
| 260 | 260 | ResultsCache::getDefaultInstance(), |
| 261 | - ConstraintsServices::getCheckResultSerializer( $services ), |
|
| 262 | - ConstraintsServices::getCheckResultDeserializer( $services ), |
|
| 261 | + ConstraintsServices::getCheckResultSerializer($services), |
|
| 262 | + ConstraintsServices::getCheckResultDeserializer($services), |
|
| 263 | 263 | $wikiPageEntityMetaDataAccessor, |
| 264 | 264 | $entityIdParser, |
| 265 | - $config->get( 'WBQualityConstraintsCacheCheckConstraintsTTLSeconds' ), |
|
| 265 | + $config->get('WBQualityConstraintsCacheCheckConstraintsTTLSeconds'), |
|
| 266 | 266 | $possiblyStaleConstraintTypes, |
| 267 | - $config->get( 'WBQualityConstraintsCacheCheckConstraintsMaximumRevisionIds' ), |
|
| 268 | - ConstraintsServices::getLoggingHelper( $services ) |
|
| 267 | + $config->get('WBQualityConstraintsCacheCheckConstraintsMaximumRevisionIds'), |
|
| 268 | + ConstraintsServices::getLoggingHelper($services) |
|
| 269 | 269 | ); |
| 270 | 270 | } |
| 271 | 271 | |
@@ -91,37 +91,37 @@ discard block |
||
| 91 | 91 | * @throws SparqlHelperException if the checker uses SPARQL and the query times out or some other error occurs |
| 92 | 92 | * @return CheckResult |
| 93 | 93 | */ |
| 94 | - public function checkConstraint( Context $context, Constraint $constraint ) { |
|
| 95 | - if ( $context->getSnakRank() === Statement::RANK_DEPRECATED ) { |
|
| 96 | - return new CheckResult( $context, $constraint, [], CheckResult::STATUS_DEPRECATED ); |
|
| 94 | + public function checkConstraint(Context $context, Constraint $constraint) { |
|
| 95 | + if ($context->getSnakRank() === Statement::RANK_DEPRECATED) { |
|
| 96 | + return new CheckResult($context, $constraint, [], CheckResult::STATUS_DEPRECATED); |
|
| 97 | 97 | } |
| 98 | 98 | |
| 99 | 99 | $parameters = []; |
| 100 | 100 | $constraintParameters = $constraint->getConstraintParameters(); |
| 101 | 101 | |
| 102 | - $classes = $this->constraintParameterParser->parseClassParameter( $constraintParameters, $constraint->getConstraintTypeItemId() ); |
|
| 102 | + $classes = $this->constraintParameterParser->parseClassParameter($constraintParameters, $constraint->getConstraintTypeItemId()); |
|
| 103 | 103 | $parameters['class'] = array_map( |
| 104 | - function( $id ) { |
|
| 105 | - return new ItemId( $id ); |
|
| 104 | + function($id) { |
|
| 105 | + return new ItemId($id); |
|
| 106 | 106 | }, |
| 107 | 107 | $classes |
| 108 | 108 | ); |
| 109 | 109 | |
| 110 | - $relation = $this->constraintParameterParser->parseRelationParameter( $constraintParameters, $constraint->getConstraintTypeItemId() ); |
|
| 110 | + $relation = $this->constraintParameterParser->parseRelationParameter($constraintParameters, $constraint->getConstraintTypeItemId()); |
|
| 111 | 111 | $relationIds = []; |
| 112 | - if ( $relation === 'instance' || $relation === 'instanceOrSubclass' ) { |
|
| 113 | - $relationIds[] = $this->config->get( 'WBQualityConstraintsInstanceOfId' ); |
|
| 112 | + if ($relation === 'instance' || $relation === 'instanceOrSubclass') { |
|
| 113 | + $relationIds[] = $this->config->get('WBQualityConstraintsInstanceOfId'); |
|
| 114 | 114 | } |
| 115 | - if ( $relation === 'subclass' || $relation === 'instanceOrSubclass' ) { |
|
| 116 | - $relationIds[] = $this->config->get( 'WBQualityConstraintsSubclassOfId' ); |
|
| 115 | + if ($relation === 'subclass' || $relation === 'instanceOrSubclass') { |
|
| 116 | + $relationIds[] = $this->config->get('WBQualityConstraintsSubclassOfId'); |
|
| 117 | 117 | } |
| 118 | - $parameters['relation'] = [ $relation ]; |
|
| 118 | + $parameters['relation'] = [$relation]; |
|
| 119 | 119 | |
| 120 | 120 | $snak = $context->getSnak(); |
| 121 | 121 | |
| 122 | - if ( !$snak instanceof PropertyValueSnak ) { |
|
| 122 | + if (!$snak instanceof PropertyValueSnak) { |
|
| 123 | 123 | // nothing to check |
| 124 | - return new CheckResult( $context, $constraint, $parameters, CheckResult::STATUS_COMPLIANCE ); |
|
| 124 | + return new CheckResult($context, $constraint, $parameters, CheckResult::STATUS_COMPLIANCE); |
|
| 125 | 125 | } |
| 126 | 126 | |
| 127 | 127 | $dataValue = $snak->getDataValue(); |
@@ -130,24 +130,24 @@ discard block |
||
| 130 | 130 | * error handling: |
| 131 | 131 | * type of $dataValue for properties with 'Value type' constraint has to be 'wikibase-entityid' |
| 132 | 132 | */ |
| 133 | - if ( $dataValue->getType() !== 'wikibase-entityid' ) { |
|
| 134 | - $message = ( new ViolationMessage( 'wbqc-violation-message-value-needed-of-type' ) ) |
|
| 135 | - ->withEntityId( new ItemId( $constraint->getConstraintTypeItemId() ), Role::CONSTRAINT_TYPE_ITEM ) |
|
| 136 | - ->withDataValueType( 'wikibase-entityid' ); |
|
| 137 | - return new CheckResult( $context, $constraint, $parameters, CheckResult::STATUS_VIOLATION, $message ); |
|
| 133 | + if ($dataValue->getType() !== 'wikibase-entityid') { |
|
| 134 | + $message = (new ViolationMessage('wbqc-violation-message-value-needed-of-type')) |
|
| 135 | + ->withEntityId(new ItemId($constraint->getConstraintTypeItemId()), Role::CONSTRAINT_TYPE_ITEM) |
|
| 136 | + ->withDataValueType('wikibase-entityid'); |
|
| 137 | + return new CheckResult($context, $constraint, $parameters, CheckResult::STATUS_VIOLATION, $message); |
|
| 138 | 138 | } |
| 139 | 139 | /** @var EntityIdValue $dataValue */ |
| 140 | 140 | |
| 141 | 141 | try { |
| 142 | - $item = $this->entityLookup->getEntity( $dataValue->getEntityId() ); |
|
| 143 | - } catch ( UnresolvedEntityRedirectException $e ) { |
|
| 142 | + $item = $this->entityLookup->getEntity($dataValue->getEntityId()); |
|
| 143 | + } catch (UnresolvedEntityRedirectException $e) { |
|
| 144 | 144 | // Edge case (double redirect): Pretend the entity doesn't exist |
| 145 | 145 | $item = null; |
| 146 | 146 | } |
| 147 | 147 | |
| 148 | - if ( !( $item instanceof StatementListProvider ) ) { |
|
| 149 | - $message = new ViolationMessage( 'wbqc-violation-message-value-entity-must-exist' ); |
|
| 150 | - return new CheckResult( $context, $constraint, $parameters, CheckResult::STATUS_VIOLATION, $message ); |
|
| 148 | + if (!($item instanceof StatementListProvider)) { |
|
| 149 | + $message = new ViolationMessage('wbqc-violation-message-value-entity-must-exist'); |
|
| 150 | + return new CheckResult($context, $constraint, $parameters, CheckResult::STATUS_VIOLATION, $message); |
|
| 151 | 151 | } |
| 152 | 152 | |
| 153 | 153 | $statements = $item->getStatements(); |
@@ -158,7 +158,7 @@ discard block |
||
| 158 | 158 | $classes |
| 159 | 159 | ); |
| 160 | 160 | |
| 161 | - if ( $result->getBool() ) { |
|
| 161 | + if ($result->getBool()) { |
|
| 162 | 162 | $message = null; |
| 163 | 163 | $status = CheckResult::STATUS_COMPLIANCE; |
| 164 | 164 | } else { |
@@ -172,21 +172,21 @@ discard block |
||
| 172 | 172 | $status = CheckResult::STATUS_VIOLATION; |
| 173 | 173 | } |
| 174 | 174 | |
| 175 | - return ( new CheckResult( $context, $constraint, $parameters, $status, $message ) ) |
|
| 176 | - ->withMetadata( $result->getMetadata() ); |
|
| 175 | + return (new CheckResult($context, $constraint, $parameters, $status, $message)) |
|
| 176 | + ->withMetadata($result->getMetadata()); |
|
| 177 | 177 | } |
| 178 | 178 | |
| 179 | - public function checkConstraintParameters( Constraint $constraint ) { |
|
| 179 | + public function checkConstraintParameters(Constraint $constraint) { |
|
| 180 | 180 | $constraintParameters = $constraint->getConstraintParameters(); |
| 181 | 181 | $exceptions = []; |
| 182 | 182 | try { |
| 183 | - $this->constraintParameterParser->parseClassParameter( $constraintParameters, $constraint->getConstraintTypeItemId() ); |
|
| 184 | - } catch ( ConstraintParameterException $e ) { |
|
| 183 | + $this->constraintParameterParser->parseClassParameter($constraintParameters, $constraint->getConstraintTypeItemId()); |
|
| 184 | + } catch (ConstraintParameterException $e) { |
|
| 185 | 185 | $exceptions[] = $e; |
| 186 | 186 | } |
| 187 | 187 | try { |
| 188 | - $this->constraintParameterParser->parseRelationParameter( $constraintParameters, $constraint->getConstraintTypeItemId() ); |
|
| 189 | - } catch ( ConstraintParameterException $e ) { |
|
| 188 | + $this->constraintParameterParser->parseRelationParameter($constraintParameters, $constraint->getConstraintTypeItemId()); |
|
| 189 | + } catch (ConstraintParameterException $e) { |
|
| 190 | 190 | $exceptions[] = $e; |
| 191 | 191 | } |
| 192 | 192 | return $exceptions; |
@@ -78,7 +78,7 @@ discard block |
||
| 78 | 78 | * @codeCoverageIgnore This method is purely declarative. |
| 79 | 79 | */ |
| 80 | 80 | public function getDefaultContextTypes() { |
| 81 | - return [ Context::TYPE_STATEMENT ]; |
|
| 81 | + return [Context::TYPE_STATEMENT]; |
|
| 82 | 82 | } |
| 83 | 83 | |
| 84 | 84 | /** |
@@ -90,30 +90,30 @@ discard block |
||
| 90 | 90 | * @return CheckResult |
| 91 | 91 | * @throws \ConfigException |
| 92 | 92 | */ |
| 93 | - public function checkConstraint( Context $context, Constraint $constraint ) { |
|
| 94 | - if ( $context->getSnakRank() === Statement::RANK_DEPRECATED ) { |
|
| 95 | - return new CheckResult( $context, $constraint, [], CheckResult::STATUS_DEPRECATED ); |
|
| 93 | + public function checkConstraint(Context $context, Constraint $constraint) { |
|
| 94 | + if ($context->getSnakRank() === Statement::RANK_DEPRECATED) { |
|
| 95 | + return new CheckResult($context, $constraint, [], CheckResult::STATUS_DEPRECATED); |
|
| 96 | 96 | } |
| 97 | 97 | $snak = $context->getSnak(); |
| 98 | - if ( !$snak instanceof PropertyValueSnak ) { |
|
| 98 | + if (!$snak instanceof PropertyValueSnak) { |
|
| 99 | 99 | // nothing to check |
| 100 | - return new CheckResult( $context, $constraint, [], CheckResult::STATUS_COMPLIANCE ); |
|
| 100 | + return new CheckResult($context, $constraint, [], CheckResult::STATUS_COMPLIANCE); |
|
| 101 | 101 | } |
| 102 | - if ( $snak->getDataValue()->getType() !== 'wikibase-entityid' ) { |
|
| 102 | + if ($snak->getDataValue()->getType() !== 'wikibase-entityid') { |
|
| 103 | 103 | // wrong data type |
| 104 | - $message = ( new ViolationMessage( 'wbqc-violation-message-value-needed-of-type' ) ) |
|
| 105 | - ->withEntityId( new ItemId( $constraint->getConstraintTypeItemId() ), Role::CONSTRAINT_TYPE_ITEM ) |
|
| 106 | - ->withDataValueType( 'wikibase-entityid' ); |
|
| 107 | - return new CheckResult( $context, $constraint, [], CheckResult::STATUS_VIOLATION, $message ); |
|
| 104 | + $message = (new ViolationMessage('wbqc-violation-message-value-needed-of-type')) |
|
| 105 | + ->withEntityId(new ItemId($constraint->getConstraintTypeItemId()), Role::CONSTRAINT_TYPE_ITEM) |
|
| 106 | + ->withDataValueType('wikibase-entityid'); |
|
| 107 | + return new CheckResult($context, $constraint, [], CheckResult::STATUS_VIOLATION, $message); |
|
| 108 | 108 | } |
| 109 | 109 | |
| 110 | 110 | /** @var EntityId $objectId */ |
| 111 | 111 | $objectId = $snak->getDataValue()->getEntityId(); |
| 112 | - $objectItem = $this->entityLookup->getEntity( $objectId ); |
|
| 113 | - if ( !( $objectItem instanceof StatementListProvider ) ) { |
|
| 112 | + $objectItem = $this->entityLookup->getEntity($objectId); |
|
| 113 | + if (!($objectItem instanceof StatementListProvider)) { |
|
| 114 | 114 | // object was deleted/doesn't exist |
| 115 | - $message = new ViolationMessage( 'wbqc-violation-message-value-entity-must-exist' ); |
|
| 116 | - return new CheckResult( $context, $constraint, [], CheckResult::STATUS_VIOLATION, $message ); |
|
| 115 | + $message = new ViolationMessage('wbqc-violation-message-value-entity-must-exist'); |
|
| 116 | + return new CheckResult($context, $constraint, [], CheckResult::STATUS_VIOLATION, $message); |
|
| 117 | 117 | } |
| 118 | 118 | /** @var Statement[] $objectStatements */ |
| 119 | 119 | $objectStatements = $objectItem->getStatements()->toArray(); |
@@ -123,9 +123,9 @@ discard block |
||
| 123 | 123 | /** @var Statement[] $subjectStatements */ |
| 124 | 124 | $subjectStatements = $context->getEntity()->getStatements()->toArray(); |
| 125 | 125 | /** @var String[] $startPropertyIds */ |
| 126 | - $startPropertyIds = $this->config->get( self::CONFIG_VARIABLE_START_PROPERTY_IDS ); |
|
| 126 | + $startPropertyIds = $this->config->get(self::CONFIG_VARIABLE_START_PROPERTY_IDS); |
|
| 127 | 127 | /** @var String[] $endPropertyIds */ |
| 128 | - $endPropertyIds = $this->config->get( self::CONFIG_VARIABLE_END_PROPERTY_IDS ); |
|
| 128 | + $endPropertyIds = $this->config->get(self::CONFIG_VARIABLE_END_PROPERTY_IDS); |
|
| 129 | 129 | $subjectStartValue = $this->getExtremeValue( |
| 130 | 130 | $startPropertyIds, |
| 131 | 131 | $subjectStatements, |
@@ -147,15 +147,15 @@ discard block |
||
| 147 | 147 | 'end' |
| 148 | 148 | ); |
| 149 | 149 | if ( |
| 150 | - $this->rangeCheckerHelper->getComparison( $subjectStartValue, $subjectEndValue ) <= 0 && |
|
| 151 | - $this->rangeCheckerHelper->getComparison( $objectStartValue, $objectEndValue ) <= 0 && ( |
|
| 152 | - $this->rangeCheckerHelper->getComparison( $subjectEndValue, $objectStartValue ) < 0 || |
|
| 153 | - $this->rangeCheckerHelper->getComparison( $objectEndValue, $subjectStartValue ) < 0 |
|
| 150 | + $this->rangeCheckerHelper->getComparison($subjectStartValue, $subjectEndValue) <= 0 && |
|
| 151 | + $this->rangeCheckerHelper->getComparison($objectStartValue, $objectEndValue) <= 0 && ( |
|
| 152 | + $this->rangeCheckerHelper->getComparison($subjectEndValue, $objectStartValue) < 0 || |
|
| 153 | + $this->rangeCheckerHelper->getComparison($objectEndValue, $subjectStartValue) < 0 |
|
| 154 | 154 | ) |
| 155 | 155 | ) { |
| 156 | 156 | if ( |
| 157 | 157 | $subjectEndValue == null || |
| 158 | - $this->rangeCheckerHelper->getComparison( $objectEndValue, $subjectEndValue ) < 0 |
|
| 158 | + $this->rangeCheckerHelper->getComparison($objectEndValue, $subjectEndValue) < 0 |
|
| 159 | 159 | ) { |
| 160 | 160 | $earlierEntityId = $objectId; |
| 161 | 161 | $minEndValue = $objectEndValue; |
@@ -178,7 +178,7 @@ discard block |
||
| 178 | 178 | $message = null; |
| 179 | 179 | $status = CheckResult::STATUS_COMPLIANCE; |
| 180 | 180 | } |
| 181 | - return new CheckResult( $context, $constraint, [], $status, $message ); |
|
| 181 | + return new CheckResult($context, $constraint, [], $status, $message); |
|
| 182 | 182 | } |
| 183 | 183 | |
| 184 | 184 | /** |
@@ -188,19 +188,19 @@ discard block |
||
| 188 | 188 | * |
| 189 | 189 | * @return DataValue|null |
| 190 | 190 | */ |
| 191 | - private function getExtremeValue( $extremePropertyIds, $statements, $startOrEnd ) { |
|
| 192 | - if ( $startOrEnd !== 'start' && $startOrEnd !== 'end' ) { |
|
| 193 | - throw new \InvalidArgumentException( '$startOrEnd must be \'start\' or \'end\'.' ); |
|
| 191 | + private function getExtremeValue($extremePropertyIds, $statements, $startOrEnd) { |
|
| 192 | + if ($startOrEnd !== 'start' && $startOrEnd !== 'end') { |
|
| 193 | + throw new \InvalidArgumentException('$startOrEnd must be \'start\' or \'end\'.'); |
|
| 194 | 194 | } |
| 195 | 195 | $extremeValue = null; |
| 196 | - foreach ( $extremePropertyIds as $extremePropertyId ) { |
|
| 197 | - $statementList = new StatementList( $statements ); |
|
| 198 | - $extremeStatements = $statementList->getByPropertyId( new PropertyId( $extremePropertyId ) ); |
|
| 196 | + foreach ($extremePropertyIds as $extremePropertyId) { |
|
| 197 | + $statementList = new StatementList($statements); |
|
| 198 | + $extremeStatements = $statementList->getByPropertyId(new PropertyId($extremePropertyId)); |
|
| 199 | 199 | /** @var Statement $extremeStatement */ |
| 200 | - foreach ( $extremeStatements as $extremeStatement ) { |
|
| 201 | - if ( $extremeStatement->getRank() !== Statement::RANK_DEPRECATED ) { |
|
| 200 | + foreach ($extremeStatements as $extremeStatement) { |
|
| 201 | + if ($extremeStatement->getRank() !== Statement::RANK_DEPRECATED) { |
|
| 202 | 202 | $snak = $extremeStatement->getMainSnak(); |
| 203 | - if ( !$snak instanceof PropertyValueSnak ) { |
|
| 203 | + if (!$snak instanceof PropertyValueSnak) { |
|
| 204 | 204 | return null; |
| 205 | 205 | } else { |
| 206 | 206 | $comparison = $this->rangeCheckerHelper->getComparison( |
@@ -209,8 +209,8 @@ discard block |
||
| 209 | 209 | ); |
| 210 | 210 | if ( |
| 211 | 211 | $extremeValue === null || |
| 212 | - ( $startOrEnd === 'start' && $comparison < 0 ) || |
|
| 213 | - ( $startOrEnd === 'end' && $comparison > 0 ) |
|
| 212 | + ($startOrEnd === 'start' && $comparison < 0) || |
|
| 213 | + ($startOrEnd === 'end' && $comparison > 0) |
|
| 214 | 214 | ) { |
| 215 | 215 | $extremeValue = $snak->getDataValue(); |
| 216 | 216 | } |
@@ -240,17 +240,16 @@ discard block |
||
| 240 | 240 | DataValue $maxStartValue |
| 241 | 241 | ) { |
| 242 | 242 | $messageKey = $earlierEntityId === $subjectId ? |
| 243 | - 'wbqc-violation-message-contemporary-subject-earlier' : |
|
| 244 | - 'wbqc-violation-message-contemporary-value-earlier'; |
|
| 245 | - return ( new ViolationMessage( $messageKey ) ) |
|
| 246 | - ->withEntityId( $subjectId, Role::SUBJECT ) |
|
| 247 | - ->withEntityId( $propertyId, Role::PREDICATE ) |
|
| 248 | - ->withEntityId( $objectId, Role::OBJECT ) |
|
| 249 | - ->withDataValue( $minEndValue, Role::OBJECT ) |
|
| 250 | - ->withDataValue( $maxStartValue, Role::OBJECT ); |
|
| 243 | + 'wbqc-violation-message-contemporary-subject-earlier' : 'wbqc-violation-message-contemporary-value-earlier'; |
|
| 244 | + return (new ViolationMessage($messageKey)) |
|
| 245 | + ->withEntityId($subjectId, Role::SUBJECT) |
|
| 246 | + ->withEntityId($propertyId, Role::PREDICATE) |
|
| 247 | + ->withEntityId($objectId, Role::OBJECT) |
|
| 248 | + ->withDataValue($minEndValue, Role::OBJECT) |
|
| 249 | + ->withDataValue($maxStartValue, Role::OBJECT); |
|
| 251 | 250 | } |
| 252 | 251 | |
| 253 | - public function checkConstraintParameters( Constraint $constraint ) { |
|
| 252 | + public function checkConstraintParameters(Constraint $constraint) { |
|
| 254 | 253 | // no parameters |
| 255 | 254 | return []; |
| 256 | 255 | } |
@@ -22,15 +22,15 @@ discard block |
||
| 22 | 22 | // no parent::__construct() call |
| 23 | 23 | } |
| 24 | 24 | |
| 25 | - public function hasType( $id, array $classes ) { |
|
| 26 | - throw new LogicException( 'methods of this class should never be called' ); |
|
| 25 | + public function hasType($id, array $classes) { |
|
| 26 | + throw new LogicException('methods of this class should never be called'); |
|
| 27 | 27 | } |
| 28 | 28 | |
| 29 | 29 | public function findEntitiesWithSameStatement( |
| 30 | 30 | Statement $statement, |
| 31 | 31 | $ignoreDeprecatedStatements |
| 32 | 32 | ) { |
| 33 | - throw new LogicException( 'methods of this class should never be called' ); |
|
| 33 | + throw new LogicException('methods of this class should never be called'); |
|
| 34 | 34 | } |
| 35 | 35 | |
| 36 | 36 | public function findEntitiesWithSameQualifierOrReference( |
@@ -39,15 +39,15 @@ discard block |
||
| 39 | 39 | $type, |
| 40 | 40 | $ignoreDeprecatedStatements |
| 41 | 41 | ) { |
| 42 | - throw new LogicException( 'methods of this class should never be called' ); |
|
| 42 | + throw new LogicException('methods of this class should never be called'); |
|
| 43 | 43 | } |
| 44 | 44 | |
| 45 | - public function matchesRegularExpression( $text, $regex ) { |
|
| 46 | - throw new LogicException( 'methods of this class should never be called' ); |
|
| 45 | + public function matchesRegularExpression($text, $regex) { |
|
| 46 | + throw new LogicException('methods of this class should never be called'); |
|
| 47 | 47 | } |
| 48 | 48 | |
| 49 | - public function runQuery( $query, $needsPrefixes = true ) { |
|
| 50 | - throw new LogicException( 'methods of this class should never be called' ); |
|
| 49 | + public function runQuery($query, $needsPrefixes = true) { |
|
| 50 | + throw new LogicException('methods of this class should never be called'); |
|
| 51 | 51 | } |
| 52 | 52 | |
| 53 | 53 | } |
@@ -161,19 +161,19 @@ discard block |
||
| 161 | 161 | $this->loggingHelper = $loggingHelper; |
| 162 | 162 | $this->defaultUserAgent = $defaultUserAgent; |
| 163 | 163 | $this->requestFactory = $requestFactory; |
| 164 | - $this->entityPrefix = $rdfVocabulary->getNamespaceURI( RdfVocabulary::NS_ENTITY ); |
|
| 164 | + $this->entityPrefix = $rdfVocabulary->getNamespaceURI(RdfVocabulary::NS_ENTITY); |
|
| 165 | 165 | $this->prefixes = <<<EOT |
| 166 | -PREFIX wd: <{$rdfVocabulary->getNamespaceURI( RdfVocabulary::NS_ENTITY )}> |
|
| 167 | -PREFIX wds: <{$rdfVocabulary->getNamespaceURI( RdfVocabulary::NS_STATEMENT )}> |
|
| 168 | -PREFIX wdt: <{$rdfVocabulary->getNamespaceURI( RdfVocabulary::NSP_DIRECT_CLAIM )}> |
|
| 169 | -PREFIX wdv: <{$rdfVocabulary->getNamespaceURI( RdfVocabulary::NS_VALUE )}> |
|
| 170 | -PREFIX p: <{$rdfVocabulary->getNamespaceURI( RdfVocabulary::NSP_CLAIM )}> |
|
| 171 | -PREFIX ps: <{$rdfVocabulary->getNamespaceURI( RdfVocabulary::NSP_CLAIM_STATEMENT )}> |
|
| 172 | -PREFIX pq: <{$rdfVocabulary->getNamespaceURI( RdfVocabulary::NSP_QUALIFIER )}> |
|
| 173 | -PREFIX pqv: <{$rdfVocabulary->getNamespaceURI( RdfVocabulary::NSP_QUALIFIER_VALUE )}> |
|
| 174 | -PREFIX pr: <{$rdfVocabulary->getNamespaceURI( RdfVocabulary::NSP_REFERENCE )}> |
|
| 175 | -PREFIX prv: <{$rdfVocabulary->getNamespaceURI( RdfVocabulary::NSP_REFERENCE_VALUE )}> |
|
| 176 | -PREFIX wikibase: <{$rdfVocabulary->getNamespaceURI( RdfVocabulary::NS_ONTOLOGY )}> |
|
| 166 | +PREFIX wd: <{$rdfVocabulary->getNamespaceURI(RdfVocabulary::NS_ENTITY)}> |
|
| 167 | +PREFIX wds: <{$rdfVocabulary->getNamespaceURI(RdfVocabulary::NS_STATEMENT)}> |
|
| 168 | +PREFIX wdt: <{$rdfVocabulary->getNamespaceURI(RdfVocabulary::NSP_DIRECT_CLAIM)}> |
|
| 169 | +PREFIX wdv: <{$rdfVocabulary->getNamespaceURI(RdfVocabulary::NS_VALUE)}> |
|
| 170 | +PREFIX p: <{$rdfVocabulary->getNamespaceURI(RdfVocabulary::NSP_CLAIM)}> |
|
| 171 | +PREFIX ps: <{$rdfVocabulary->getNamespaceURI(RdfVocabulary::NSP_CLAIM_STATEMENT)}> |
|
| 172 | +PREFIX pq: <{$rdfVocabulary->getNamespaceURI(RdfVocabulary::NSP_QUALIFIER)}> |
|
| 173 | +PREFIX pqv: <{$rdfVocabulary->getNamespaceURI(RdfVocabulary::NSP_QUALIFIER_VALUE)}> |
|
| 174 | +PREFIX pr: <{$rdfVocabulary->getNamespaceURI(RdfVocabulary::NSP_REFERENCE)}> |
|
| 175 | +PREFIX prv: <{$rdfVocabulary->getNamespaceURI(RdfVocabulary::NSP_REFERENCE_VALUE)}> |
|
| 176 | +PREFIX wikibase: <{$rdfVocabulary->getNamespaceURI(RdfVocabulary::NS_ONTOLOGY)}> |
|
| 177 | 177 | EOT; |
| 178 | 178 | } |
| 179 | 179 | |
@@ -184,22 +184,21 @@ discard block |
||
| 184 | 184 | * @return CachedBool |
| 185 | 185 | * @throws SparqlHelperException if the query times out or some other error occurs |
| 186 | 186 | */ |
| 187 | - public function hasType( $id, array $classes ) { |
|
| 188 | - $subclassOfId = $this->config->get( 'WBQualityConstraintsSubclassOfId' ); |
|
| 187 | + public function hasType($id, array $classes) { |
|
| 188 | + $subclassOfId = $this->config->get('WBQualityConstraintsSubclassOfId'); |
|
| 189 | 189 | // TODO hint:gearing is a workaround for T168973 and can hopefully be removed eventually |
| 190 | - $gearingHint = $this->config->get( 'WBQualityConstraintsSparqlHasWikibaseSupport' ) ? |
|
| 191 | - ' hint:Prior hint:gearing "forward".' : |
|
| 192 | - ''; |
|
| 190 | + $gearingHint = $this->config->get('WBQualityConstraintsSparqlHasWikibaseSupport') ? |
|
| 191 | + ' hint:Prior hint:gearing "forward".' : ''; |
|
| 193 | 192 | |
| 194 | 193 | $metadatas = []; |
| 195 | 194 | |
| 196 | - foreach ( array_chunk( $classes, 20 ) as $classesChunk ) { |
|
| 197 | - $classesValues = implode( ' ', array_map( |
|
| 198 | - function( $class ) { |
|
| 199 | - return 'wd:' . $class; |
|
| 195 | + foreach (array_chunk($classes, 20) as $classesChunk) { |
|
| 196 | + $classesValues = implode(' ', array_map( |
|
| 197 | + function($class) { |
|
| 198 | + return 'wd:'.$class; |
|
| 200 | 199 | }, |
| 201 | 200 | $classesChunk |
| 202 | - ) ); |
|
| 201 | + )); |
|
| 203 | 202 | |
| 204 | 203 | $query = <<<EOF |
| 205 | 204 | ASK { |
@@ -209,19 +208,19 @@ discard block |
||
| 209 | 208 | } |
| 210 | 209 | EOF; |
| 211 | 210 | |
| 212 | - $result = $this->runQuery( $query ); |
|
| 211 | + $result = $this->runQuery($query); |
|
| 213 | 212 | $metadatas[] = $result->getMetadata(); |
| 214 | - if ( $result->getArray()['boolean'] ) { |
|
| 213 | + if ($result->getArray()['boolean']) { |
|
| 215 | 214 | return new CachedBool( |
| 216 | 215 | true, |
| 217 | - Metadata::merge( $metadatas ) |
|
| 216 | + Metadata::merge($metadatas) |
|
| 218 | 217 | ); |
| 219 | 218 | } |
| 220 | 219 | } |
| 221 | 220 | |
| 222 | 221 | return new CachedBool( |
| 223 | 222 | false, |
| 224 | - Metadata::merge( $metadatas ) |
|
| 223 | + Metadata::merge($metadatas) |
|
| 225 | 224 | ); |
| 226 | 225 | } |
| 227 | 226 | |
@@ -237,10 +236,10 @@ discard block |
||
| 237 | 236 | $ignoreDeprecatedStatements |
| 238 | 237 | ) { |
| 239 | 238 | $pid = $statement->getPropertyId()->serialize(); |
| 240 | - $guid = str_replace( '$', '-', $statement->getGuid() ); |
|
| 239 | + $guid = str_replace('$', '-', $statement->getGuid()); |
|
| 241 | 240 | |
| 242 | 241 | $deprecatedFilter = ''; |
| 243 | - if ( $ignoreDeprecatedStatements ) { |
|
| 242 | + if ($ignoreDeprecatedStatements) { |
|
| 244 | 243 | $deprecatedFilter = 'MINUS { ?otherStatement wikibase:rank wikibase:DeprecatedRank. }'; |
| 245 | 244 | } |
| 246 | 245 | |
@@ -259,9 +258,9 @@ discard block |
||
| 259 | 258 | LIMIT 10 |
| 260 | 259 | EOF; |
| 261 | 260 | |
| 262 | - $result = $this->runQuery( $query ); |
|
| 261 | + $result = $this->runQuery($query); |
|
| 263 | 262 | |
| 264 | - return $this->getOtherEntities( $result ); |
|
| 263 | + return $this->getOtherEntities($result); |
|
| 265 | 264 | } |
| 266 | 265 | |
| 267 | 266 | /** |
@@ -286,16 +285,15 @@ discard block |
||
| 286 | 285 | $dataType = $this->propertyDataTypeLookup->getDataTypeIdForProperty( |
| 287 | 286 | $snak->getPropertyId() |
| 288 | 287 | ); |
| 289 | - list( $value, $isFullValue ) = $this->getRdfLiteral( $dataType, $dataValue ); |
|
| 290 | - if ( $isFullValue ) { |
|
| 288 | + list($value, $isFullValue) = $this->getRdfLiteral($dataType, $dataValue); |
|
| 289 | + if ($isFullValue) { |
|
| 291 | 290 | $prefix .= 'v'; |
| 292 | 291 | } |
| 293 | 292 | $path = $type === Context::TYPE_QUALIFIER ? |
| 294 | - "$prefix:$pid" : |
|
| 295 | - "prov:wasDerivedFrom/$prefix:$pid"; |
|
| 293 | + "$prefix:$pid" : "prov:wasDerivedFrom/$prefix:$pid"; |
|
| 296 | 294 | |
| 297 | 295 | $deprecatedFilter = ''; |
| 298 | - if ( $ignoreDeprecatedStatements ) { |
|
| 296 | + if ($ignoreDeprecatedStatements) { |
|
| 299 | 297 | $deprecatedFilter = <<< EOF |
| 300 | 298 | MINUS { ?otherStatement wikibase:rank wikibase:DeprecatedRank. } |
| 301 | 299 | EOF; |
@@ -315,9 +313,9 @@ discard block |
||
| 315 | 313 | LIMIT 10 |
| 316 | 314 | EOF; |
| 317 | 315 | |
| 318 | - $result = $this->runQuery( $query ); |
|
| 316 | + $result = $this->runQuery($query); |
|
| 319 | 317 | |
| 320 | - return $this->getOtherEntities( $result ); |
|
| 318 | + return $this->getOtherEntities($result); |
|
| 321 | 319 | } |
| 322 | 320 | |
| 323 | 321 | /** |
@@ -327,8 +325,8 @@ discard block |
||
| 327 | 325 | * |
| 328 | 326 | * @return string |
| 329 | 327 | */ |
| 330 | - private function stringLiteral( $text ) { |
|
| 331 | - return '"' . strtr( $text, [ '"' => '\\"', '\\' => '\\\\' ] ) . '"'; |
|
| 328 | + private function stringLiteral($text) { |
|
| 329 | + return '"'.strtr($text, ['"' => '\\"', '\\' => '\\\\']).'"'; |
|
| 332 | 330 | } |
| 333 | 331 | |
| 334 | 332 | /** |
@@ -338,17 +336,17 @@ discard block |
||
| 338 | 336 | * |
| 339 | 337 | * @return CachedEntityIds |
| 340 | 338 | */ |
| 341 | - private function getOtherEntities( CachedQueryResults $results ) { |
|
| 342 | - return new CachedEntityIds( array_map( |
|
| 343 | - function ( $resultBindings ) { |
|
| 339 | + private function getOtherEntities(CachedQueryResults $results) { |
|
| 340 | + return new CachedEntityIds(array_map( |
|
| 341 | + function($resultBindings) { |
|
| 344 | 342 | $entityIRI = $resultBindings['otherEntity']['value']; |
| 345 | - $entityPrefixLength = strlen( $this->entityPrefix ); |
|
| 346 | - if ( substr( $entityIRI, 0, $entityPrefixLength ) === $this->entityPrefix ) { |
|
| 343 | + $entityPrefixLength = strlen($this->entityPrefix); |
|
| 344 | + if (substr($entityIRI, 0, $entityPrefixLength) === $this->entityPrefix) { |
|
| 347 | 345 | try { |
| 348 | 346 | return $this->entityIdParser->parse( |
| 349 | - substr( $entityIRI, $entityPrefixLength ) |
|
| 347 | + substr($entityIRI, $entityPrefixLength) |
|
| 350 | 348 | ); |
| 351 | - } catch ( EntityIdParsingException $e ) { |
|
| 349 | + } catch (EntityIdParsingException $e) { |
|
| 352 | 350 | // fall through |
| 353 | 351 | } |
| 354 | 352 | } |
@@ -356,7 +354,7 @@ discard block |
||
| 356 | 354 | return null; |
| 357 | 355 | }, |
| 358 | 356 | $results->getArray()['results']['bindings'] |
| 359 | - ), $results->getMetadata() ); |
|
| 357 | + ), $results->getMetadata()); |
|
| 360 | 358 | } |
| 361 | 359 | |
| 362 | 360 | // @codingStandardsIgnoreStart cyclomatic complexity of this function is too high |
@@ -369,47 +367,47 @@ discard block |
||
| 369 | 367 | * @return array the literal or IRI as a string in SPARQL syntax, |
| 370 | 368 | * and a boolean indicating whether it refers to a full value node or not |
| 371 | 369 | */ |
| 372 | - private function getRdfLiteral( $dataType, DataValue $dataValue ) { |
|
| 373 | - switch ( $dataType ) { |
|
| 370 | + private function getRdfLiteral($dataType, DataValue $dataValue) { |
|
| 371 | + switch ($dataType) { |
|
| 374 | 372 | case 'string': |
| 375 | 373 | case 'external-id': |
| 376 | - return [ $this->stringLiteral( $dataValue->getValue() ), false ]; |
|
| 374 | + return [$this->stringLiteral($dataValue->getValue()), false]; |
|
| 377 | 375 | case 'commonsMedia': |
| 378 | - $url = $this->rdfVocabulary->getMediaFileURI( $dataValue->getValue() ); |
|
| 379 | - return [ '<' . $url . '>', false ]; |
|
| 376 | + $url = $this->rdfVocabulary->getMediaFileURI($dataValue->getValue()); |
|
| 377 | + return ['<'.$url.'>', false]; |
|
| 380 | 378 | case 'geo-shape': |
| 381 | - $url = $this->rdfVocabulary->getGeoShapeURI( $dataValue->getValue() ); |
|
| 382 | - return [ '<' . $url . '>', false ]; |
|
| 379 | + $url = $this->rdfVocabulary->getGeoShapeURI($dataValue->getValue()); |
|
| 380 | + return ['<'.$url.'>', false]; |
|
| 383 | 381 | case 'tabular-data': |
| 384 | - $url = $this->rdfVocabulary->getTabularDataURI( $dataValue->getValue() ); |
|
| 385 | - return [ '<' . $url . '>', false ]; |
|
| 382 | + $url = $this->rdfVocabulary->getTabularDataURI($dataValue->getValue()); |
|
| 383 | + return ['<'.$url.'>', false]; |
|
| 386 | 384 | case 'url': |
| 387 | 385 | $url = $dataValue->getValue(); |
| 388 | - if ( !preg_match( '/^[^<>"{}\\\\|^`\\x00-\\x20]*$/D', $url ) ) { |
|
| 386 | + if (!preg_match('/^[^<>"{}\\\\|^`\\x00-\\x20]*$/D', $url)) { |
|
| 389 | 387 | // not a valid URL for SPARQL (see SPARQL spec, production 139 IRIREF) |
| 390 | 388 | // such an URL should never reach us, so just throw |
| 391 | - throw new InvalidArgumentException( 'invalid URL: ' . $url ); |
|
| 389 | + throw new InvalidArgumentException('invalid URL: '.$url); |
|
| 392 | 390 | } |
| 393 | - return [ '<' . $url . '>', false ]; |
|
| 391 | + return ['<'.$url.'>', false]; |
|
| 394 | 392 | case 'wikibase-item': |
| 395 | 393 | case 'wikibase-property': |
| 396 | 394 | /** @var EntityIdValue $dataValue */ |
| 397 | - return [ 'wd:' . $dataValue->getEntityId()->getSerialization(), false ]; |
|
| 395 | + return ['wd:'.$dataValue->getEntityId()->getSerialization(), false]; |
|
| 398 | 396 | case 'monolingualtext': |
| 399 | 397 | /** @var MonolingualTextValue $dataValue */ |
| 400 | 398 | $lang = $dataValue->getLanguageCode(); |
| 401 | - if ( !preg_match( '/^[a-zA-Z]+(-[a-zA-Z0-9]+)*$/D', $lang ) ) { |
|
| 399 | + if (!preg_match('/^[a-zA-Z]+(-[a-zA-Z0-9]+)*$/D', $lang)) { |
|
| 402 | 400 | // not a valid language tag for SPARQL (see SPARQL spec, production 145 LANGTAG) |
| 403 | 401 | // such a language tag should never reach us, so just throw |
| 404 | - throw new InvalidArgumentException( 'invalid language tag: ' . $lang ); |
|
| 402 | + throw new InvalidArgumentException('invalid language tag: '.$lang); |
|
| 405 | 403 | } |
| 406 | - return [ $this->stringLiteral( $dataValue->getText() ) . '@' . $lang, false ]; |
|
| 404 | + return [$this->stringLiteral($dataValue->getText()).'@'.$lang, false]; |
|
| 407 | 405 | case 'globe-coordinate': |
| 408 | 406 | case 'quantity': |
| 409 | 407 | case 'time': |
| 410 | - return [ 'wdv:' . $dataValue->getHash(), true ]; |
|
| 408 | + return ['wdv:'.$dataValue->getHash(), true]; |
|
| 411 | 409 | default: |
| 412 | - throw new InvalidArgumentException( 'unknown data type: ' . $dataType ); |
|
| 410 | + throw new InvalidArgumentException('unknown data type: '.$dataType); |
|
| 413 | 411 | } |
| 414 | 412 | } |
| 415 | 413 | // @codingStandardsIgnoreEnd |
@@ -422,44 +420,44 @@ discard block |
||
| 422 | 420 | * @throws SparqlHelperException if the query times out or some other error occurs |
| 423 | 421 | * @throws ConstraintParameterException if the $regex is invalid |
| 424 | 422 | */ |
| 425 | - public function matchesRegularExpression( $text, $regex ) { |
|
| 423 | + public function matchesRegularExpression($text, $regex) { |
|
| 426 | 424 | // caching wrapper around matchesRegularExpressionWithSparql |
| 427 | 425 | |
| 428 | - $textHash = hash( 'sha256', $text ); |
|
| 426 | + $textHash = hash('sha256', $text); |
|
| 429 | 427 | $cacheKey = $this->cache->makeKey( |
| 430 | 428 | 'WikibaseQualityConstraints', // extension |
| 431 | 429 | 'regex', // action |
| 432 | 430 | 'WDQS-Java', // regex flavor |
| 433 | - hash( 'sha256', $regex ) |
|
| 431 | + hash('sha256', $regex) |
|
| 434 | 432 | ); |
| 435 | - $cacheMapSize = $this->config->get( 'WBQualityConstraintsFormatCacheMapSize' ); |
|
| 433 | + $cacheMapSize = $this->config->get('WBQualityConstraintsFormatCacheMapSize'); |
|
| 436 | 434 | |
| 437 | 435 | $cacheMapArray = $this->cache->getWithSetCallback( |
| 438 | 436 | $cacheKey, |
| 439 | 437 | WANObjectCache::TTL_DAY, |
| 440 | - function( $cacheMapArray ) use ( $text, $regex, $textHash, $cacheMapSize ) { |
|
| 438 | + function($cacheMapArray) use ($text, $regex, $textHash, $cacheMapSize) { |
|
| 441 | 439 | // Initialize the cache map if not set |
| 442 | - if ( $cacheMapArray === false ) { |
|
| 440 | + if ($cacheMapArray === false) { |
|
| 443 | 441 | $key = 'wikibase.quality.constraints.regex.cache.refresh.init'; |
| 444 | - $this->dataFactory->increment( $key ); |
|
| 442 | + $this->dataFactory->increment($key); |
|
| 445 | 443 | return []; |
| 446 | 444 | } |
| 447 | 445 | |
| 448 | 446 | $key = 'wikibase.quality.constraints.regex.cache.refresh'; |
| 449 | - $this->dataFactory->increment( $key ); |
|
| 450 | - $cacheMap = MapCacheLRU::newFromArray( $cacheMapArray, $cacheMapSize ); |
|
| 451 | - if ( $cacheMap->has( $textHash ) ) { |
|
| 447 | + $this->dataFactory->increment($key); |
|
| 448 | + $cacheMap = MapCacheLRU::newFromArray($cacheMapArray, $cacheMapSize); |
|
| 449 | + if ($cacheMap->has($textHash)) { |
|
| 452 | 450 | $key = 'wikibase.quality.constraints.regex.cache.refresh.hit'; |
| 453 | - $this->dataFactory->increment( $key ); |
|
| 454 | - $cacheMap->get( $textHash ); // ping cache |
|
| 451 | + $this->dataFactory->increment($key); |
|
| 452 | + $cacheMap->get($textHash); // ping cache |
|
| 455 | 453 | } else { |
| 456 | 454 | $key = 'wikibase.quality.constraints.regex.cache.refresh.miss'; |
| 457 | - $this->dataFactory->increment( $key ); |
|
| 455 | + $this->dataFactory->increment($key); |
|
| 458 | 456 | try { |
| 459 | - $matches = $this->matchesRegularExpressionWithSparql( $text, $regex ); |
|
| 460 | - } catch ( ConstraintParameterException $e ) { |
|
| 461 | - $matches = $this->serializeConstraintParameterException( $e ); |
|
| 462 | - } catch ( SparqlHelperException $e ) { |
|
| 457 | + $matches = $this->matchesRegularExpressionWithSparql($text, $regex); |
|
| 458 | + } catch (ConstraintParameterException $e) { |
|
| 459 | + $matches = $this->serializeConstraintParameterException($e); |
|
| 460 | + } catch (SparqlHelperException $e) { |
|
| 463 | 461 | // don’t cache this |
| 464 | 462 | return $cacheMap->toArray(); |
| 465 | 463 | } |
@@ -483,42 +481,42 @@ discard block |
||
| 483 | 481 | ] |
| 484 | 482 | ); |
| 485 | 483 | |
| 486 | - if ( isset( $cacheMapArray[$textHash] ) ) { |
|
| 484 | + if (isset($cacheMapArray[$textHash])) { |
|
| 487 | 485 | $key = 'wikibase.quality.constraints.regex.cache.hit'; |
| 488 | - $this->dataFactory->increment( $key ); |
|
| 486 | + $this->dataFactory->increment($key); |
|
| 489 | 487 | $matches = $cacheMapArray[$textHash]; |
| 490 | - if ( is_bool( $matches ) ) { |
|
| 488 | + if (is_bool($matches)) { |
|
| 491 | 489 | return $matches; |
| 492 | - } elseif ( is_array( $matches ) && |
|
| 493 | - $matches['type'] == ConstraintParameterException::class ) { |
|
| 494 | - throw $this->deserializeConstraintParameterException( $matches ); |
|
| 490 | + } elseif (is_array($matches) && |
|
| 491 | + $matches['type'] == ConstraintParameterException::class) { |
|
| 492 | + throw $this->deserializeConstraintParameterException($matches); |
|
| 495 | 493 | } else { |
| 496 | 494 | throw new MWException( |
| 497 | - 'Value of unknown type in object cache (' . |
|
| 498 | - 'cache key: ' . $cacheKey . ', ' . |
|
| 499 | - 'cache map key: ' . $textHash . ', ' . |
|
| 500 | - 'value type: ' . gettype( $matches ) . ')' |
|
| 495 | + 'Value of unknown type in object cache ('. |
|
| 496 | + 'cache key: '.$cacheKey.', '. |
|
| 497 | + 'cache map key: '.$textHash.', '. |
|
| 498 | + 'value type: '.gettype($matches).')' |
|
| 501 | 499 | ); |
| 502 | 500 | } |
| 503 | 501 | } else { |
| 504 | 502 | $key = 'wikibase.quality.constraints.regex.cache.miss'; |
| 505 | - $this->dataFactory->increment( $key ); |
|
| 506 | - return $this->matchesRegularExpressionWithSparql( $text, $regex ); |
|
| 503 | + $this->dataFactory->increment($key); |
|
| 504 | + return $this->matchesRegularExpressionWithSparql($text, $regex); |
|
| 507 | 505 | } |
| 508 | 506 | } |
| 509 | 507 | |
| 510 | - private function serializeConstraintParameterException( ConstraintParameterException $cpe ) { |
|
| 508 | + private function serializeConstraintParameterException(ConstraintParameterException $cpe) { |
|
| 511 | 509 | return [ |
| 512 | 510 | 'type' => ConstraintParameterException::class, |
| 513 | - 'violationMessage' => $this->violationMessageSerializer->serialize( $cpe->getViolationMessage() ), |
|
| 511 | + 'violationMessage' => $this->violationMessageSerializer->serialize($cpe->getViolationMessage()), |
|
| 514 | 512 | ]; |
| 515 | 513 | } |
| 516 | 514 | |
| 517 | - private function deserializeConstraintParameterException( array $serialization ) { |
|
| 515 | + private function deserializeConstraintParameterException(array $serialization) { |
|
| 518 | 516 | $message = $this->violationMessageDeserializer->deserialize( |
| 519 | 517 | $serialization['violationMessage'] |
| 520 | 518 | ); |
| 521 | - return new ConstraintParameterException( $message ); |
|
| 519 | + return new ConstraintParameterException($message); |
|
| 522 | 520 | } |
| 523 | 521 | |
| 524 | 522 | /** |
@@ -532,25 +530,25 @@ discard block |
||
| 532 | 530 | * @throws SparqlHelperException if the query times out or some other error occurs |
| 533 | 531 | * @throws ConstraintParameterException if the $regex is invalid |
| 534 | 532 | */ |
| 535 | - public function matchesRegularExpressionWithSparql( $text, $regex ) { |
|
| 536 | - $textStringLiteral = $this->stringLiteral( $text ); |
|
| 537 | - $regexStringLiteral = $this->stringLiteral( '^(?:' . $regex . ')$' ); |
|
| 533 | + public function matchesRegularExpressionWithSparql($text, $regex) { |
|
| 534 | + $textStringLiteral = $this->stringLiteral($text); |
|
| 535 | + $regexStringLiteral = $this->stringLiteral('^(?:'.$regex.')$'); |
|
| 538 | 536 | |
| 539 | 537 | $query = <<<EOF |
| 540 | 538 | SELECT (REGEX($textStringLiteral, $regexStringLiteral) AS ?matches) {} |
| 541 | 539 | EOF; |
| 542 | 540 | |
| 543 | - $result = $this->runQuery( $query, false ); |
|
| 541 | + $result = $this->runQuery($query, false); |
|
| 544 | 542 | |
| 545 | 543 | $vars = $result->getArray()['results']['bindings'][0]; |
| 546 | - if ( array_key_exists( 'matches', $vars ) ) { |
|
| 544 | + if (array_key_exists('matches', $vars)) { |
|
| 547 | 545 | // true or false ⇒ regex okay, text matches or not |
| 548 | 546 | return $vars['matches']['value'] === 'true'; |
| 549 | 547 | } else { |
| 550 | 548 | // empty result: regex broken |
| 551 | 549 | throw new ConstraintParameterException( |
| 552 | - ( new ViolationMessage( 'wbqc-violation-message-parameter-regex' ) ) |
|
| 553 | - ->withInlineCode( $regex, Role::CONSTRAINT_PARAMETER_VALUE ) |
|
| 550 | + (new ViolationMessage('wbqc-violation-message-parameter-regex')) |
|
| 551 | + ->withInlineCode($regex, Role::CONSTRAINT_PARAMETER_VALUE) |
|
| 554 | 552 | ); |
| 555 | 553 | } |
| 556 | 554 | } |
@@ -562,14 +560,14 @@ discard block |
||
| 562 | 560 | * |
| 563 | 561 | * @return boolean |
| 564 | 562 | */ |
| 565 | - public function isTimeout( $responseContent ) { |
|
| 566 | - $timeoutRegex = implode( '|', array_map( |
|
| 567 | - function ( $fqn ) { |
|
| 568 | - return preg_quote( $fqn, '/' ); |
|
| 563 | + public function isTimeout($responseContent) { |
|
| 564 | + $timeoutRegex = implode('|', array_map( |
|
| 565 | + function($fqn) { |
|
| 566 | + return preg_quote($fqn, '/'); |
|
| 569 | 567 | }, |
| 570 | - $this->config->get( 'WBQualityConstraintsSparqlTimeoutExceptionClasses' ) |
|
| 571 | - ) ); |
|
| 572 | - return (bool)preg_match( '/' . $timeoutRegex . '/', $responseContent ); |
|
| 568 | + $this->config->get('WBQualityConstraintsSparqlTimeoutExceptionClasses') |
|
| 569 | + )); |
|
| 570 | + return (bool) preg_match('/'.$timeoutRegex.'/', $responseContent); |
|
| 573 | 571 | } |
| 574 | 572 | |
| 575 | 573 | /** |
@@ -581,17 +579,17 @@ discard block |
||
| 581 | 579 | * @return int|boolean the max-age (in seconds) |
| 582 | 580 | * or a plain boolean if no max-age can be determined |
| 583 | 581 | */ |
| 584 | - public function getCacheMaxAge( $responseHeaders ) { |
|
| 582 | + public function getCacheMaxAge($responseHeaders) { |
|
| 585 | 583 | if ( |
| 586 | - array_key_exists( 'x-cache-status', $responseHeaders ) && |
|
| 587 | - preg_match( '/^hit(?:-.*)?$/', $responseHeaders['x-cache-status'][0] ) |
|
| 584 | + array_key_exists('x-cache-status', $responseHeaders) && |
|
| 585 | + preg_match('/^hit(?:-.*)?$/', $responseHeaders['x-cache-status'][0]) |
|
| 588 | 586 | ) { |
| 589 | 587 | $maxage = []; |
| 590 | 588 | if ( |
| 591 | - array_key_exists( 'cache-control', $responseHeaders ) && |
|
| 592 | - preg_match( '/\bmax-age=(\d+)\b/', $responseHeaders['cache-control'][0], $maxage ) |
|
| 589 | + array_key_exists('cache-control', $responseHeaders) && |
|
| 590 | + preg_match('/\bmax-age=(\d+)\b/', $responseHeaders['cache-control'][0], $maxage) |
|
| 593 | 591 | ) { |
| 594 | - return intval( $maxage[1] ); |
|
| 592 | + return intval($maxage[1]); |
|
| 595 | 593 | } else { |
| 596 | 594 | return true; |
| 597 | 595 | } |
@@ -613,33 +611,33 @@ discard block |
||
| 613 | 611 | * or SparlHelper::INVALID_RETRY_AFTER if there is something wrong with the format |
| 614 | 612 | * |
| 615 | 613 | */ |
| 616 | - public function getThrottling( array $responseHeaders ) { |
|
| 617 | - if ( !array_key_exists( 'Retry-After', $responseHeaders ) ) { |
|
| 614 | + public function getThrottling(array $responseHeaders) { |
|
| 615 | + if (!array_key_exists('Retry-After', $responseHeaders)) { |
|
| 618 | 616 | return self::NO_RETRY_AFTER; |
| 619 | 617 | } |
| 620 | 618 | |
| 621 | - $trimmedRetryAfterValue = trim( $responseHeaders[ 'Retry-After' ] ); |
|
| 622 | - if ( empty( $trimmedRetryAfterValue ) ) { |
|
| 619 | + $trimmedRetryAfterValue = trim($responseHeaders['Retry-After']); |
|
| 620 | + if (empty($trimmedRetryAfterValue)) { |
|
| 623 | 621 | return self::EMPTY_RETRY_AFTER; |
| 624 | 622 | } |
| 625 | 623 | |
| 626 | - if ( is_numeric( $trimmedRetryAfterValue ) ) { |
|
| 627 | - $delaySeconds = (int)$trimmedRetryAfterValue; |
|
| 628 | - if ( $delaySeconds >= 0 ) { |
|
| 629 | - return $this->getTimestampInFuture( new DateInterval( 'PT' . $delaySeconds . 'S' ) ); |
|
| 624 | + if (is_numeric($trimmedRetryAfterValue)) { |
|
| 625 | + $delaySeconds = (int) $trimmedRetryAfterValue; |
|
| 626 | + if ($delaySeconds >= 0) { |
|
| 627 | + return $this->getTimestampInFuture(new DateInterval('PT'.$delaySeconds.'S')); |
|
| 630 | 628 | } |
| 631 | 629 | } else { |
| 632 | - $return = strtotime( $responseHeaders[ 'Retry-After' ] ); |
|
| 633 | - if ( !empty( $return ) ) { |
|
| 634 | - return new ConvertibleTimestamp( $return ); |
|
| 630 | + $return = strtotime($responseHeaders['Retry-After']); |
|
| 631 | + if (!empty($return)) { |
|
| 632 | + return new ConvertibleTimestamp($return); |
|
| 635 | 633 | } |
| 636 | 634 | } |
| 637 | 635 | return self::INVALID_RETRY_AFTER; |
| 638 | 636 | } |
| 639 | 637 | |
| 640 | - private function getTimestampInFuture( DateInterval $delta ) { |
|
| 638 | + private function getTimestampInFuture(DateInterval $delta) { |
|
| 641 | 639 | $now = new ConvertibleTimestamp(); |
| 642 | - return new ConvertibleTimestamp( $now->timestamp->add( $delta ) ); |
|
| 640 | + return new ConvertibleTimestamp($now->timestamp->add($delta)); |
|
| 643 | 641 | } |
| 644 | 642 | |
| 645 | 643 | /** |
@@ -653,97 +651,96 @@ discard block |
||
| 653 | 651 | * |
| 654 | 652 | * @throws SparqlHelperException if the query times out or some other error occurs |
| 655 | 653 | */ |
| 656 | - public function runQuery( $query, $needsPrefixes = true ) { |
|
| 654 | + public function runQuery($query, $needsPrefixes = true) { |
|
| 657 | 655 | |
| 658 | - if ( $this->throttlingLock->isLocked( self::EXPIRY_LOCK_ID ) ) { |
|
| 659 | - $this->dataFactory->increment( 'wikibase.quality.constraints.sparql.throttling' ); |
|
| 656 | + if ($this->throttlingLock->isLocked(self::EXPIRY_LOCK_ID)) { |
|
| 657 | + $this->dataFactory->increment('wikibase.quality.constraints.sparql.throttling'); |
|
| 660 | 658 | throw new TooManySparqlRequestsException(); |
| 661 | 659 | } |
| 662 | 660 | |
| 663 | - $endpoint = $this->config->get( 'WBQualityConstraintsSparqlEndpoint' ); |
|
| 664 | - $maxQueryTimeMillis = $this->config->get( 'WBQualityConstraintsSparqlMaxMillis' ); |
|
| 665 | - $fallbackBlockDuration = (int)$this->config->get( 'WBQualityConstraintsSparqlThrottlingFallbackDuration' ); |
|
| 661 | + $endpoint = $this->config->get('WBQualityConstraintsSparqlEndpoint'); |
|
| 662 | + $maxQueryTimeMillis = $this->config->get('WBQualityConstraintsSparqlMaxMillis'); |
|
| 663 | + $fallbackBlockDuration = (int) $this->config->get('WBQualityConstraintsSparqlThrottlingFallbackDuration'); |
|
| 666 | 664 | |
| 667 | - if ( $fallbackBlockDuration < 0 ) { |
|
| 668 | - throw new InvalidArgumentException( 'Fallback duration must be positive int but is: '. |
|
| 669 | - $fallbackBlockDuration ); |
|
| 665 | + if ($fallbackBlockDuration < 0) { |
|
| 666 | + throw new InvalidArgumentException('Fallback duration must be positive int but is: '. |
|
| 667 | + $fallbackBlockDuration); |
|
| 670 | 668 | } |
| 671 | 669 | |
| 672 | - if ( $this->config->get( 'WBQualityConstraintsSparqlHasWikibaseSupport' ) ) { |
|
| 670 | + if ($this->config->get('WBQualityConstraintsSparqlHasWikibaseSupport')) { |
|
| 673 | 671 | $needsPrefixes = false; |
| 674 | 672 | } |
| 675 | 673 | |
| 676 | - if ( $needsPrefixes ) { |
|
| 677 | - $query = $this->prefixes . $query; |
|
| 674 | + if ($needsPrefixes) { |
|
| 675 | + $query = $this->prefixes.$query; |
|
| 678 | 676 | } |
| 679 | - $query = "#wbqc\n" . $query; |
|
| 677 | + $query = "#wbqc\n".$query; |
|
| 680 | 678 | |
| 681 | - $url = $endpoint . '?' . http_build_query( |
|
| 679 | + $url = $endpoint.'?'.http_build_query( |
|
| 682 | 680 | [ |
| 683 | 681 | 'query' => $query, |
| 684 | 682 | 'format' => 'json', |
| 685 | 683 | 'maxQueryTimeMillis' => $maxQueryTimeMillis, |
| 686 | 684 | ], |
| 687 | - null, ini_get( 'arg_separator.output' ), |
|
| 685 | + null, ini_get('arg_separator.output'), |
|
| 688 | 686 | // encode spaces with %20, not + |
| 689 | 687 | PHP_QUERY_RFC3986 |
| 690 | 688 | ); |
| 691 | 689 | |
| 692 | 690 | $options = [ |
| 693 | 691 | 'method' => 'GET', |
| 694 | - 'timeout' => (int)round( ( $maxQueryTimeMillis + 1000 ) / 1000 ), |
|
| 692 | + 'timeout' => (int) round(($maxQueryTimeMillis + 1000) / 1000), |
|
| 695 | 693 | 'connectTimeout' => 'default', |
| 696 | 694 | 'userAgent' => $this->defaultUserAgent, |
| 697 | 695 | ]; |
| 698 | - $request = $this->requestFactory->create( $url, $options ); |
|
| 699 | - $startTime = microtime( true ); |
|
| 696 | + $request = $this->requestFactory->create($url, $options); |
|
| 697 | + $startTime = microtime(true); |
|
| 700 | 698 | $status = $request->execute(); |
| 701 | - $endTime = microtime( true ); |
|
| 699 | + $endTime = microtime(true); |
|
| 702 | 700 | $this->dataFactory->timing( |
| 703 | 701 | 'wikibase.quality.constraints.sparql.timing', |
| 704 | - ( $endTime - $startTime ) * 1000 |
|
| 702 | + ($endTime - $startTime) * 1000 |
|
| 705 | 703 | ); |
| 706 | 704 | |
| 707 | - if ( $request->getStatus() === self::HTTP_TOO_MANY_REQUESTS ) { |
|
| 708 | - $this->dataFactory->increment( 'wikibase.quality.constraints.sparql.throttling' ); |
|
| 709 | - $throttlingUntil = $this->getThrottling( $request->getResponseHeaders() ); |
|
| 710 | - if ( !( $throttlingUntil instanceof ConvertibleTimestamp ) ) { |
|
| 711 | - $this->loggingHelper->logSparqlHelperTooManyRequestsRetryAfterInvalid( $request ); |
|
| 705 | + if ($request->getStatus() === self::HTTP_TOO_MANY_REQUESTS) { |
|
| 706 | + $this->dataFactory->increment('wikibase.quality.constraints.sparql.throttling'); |
|
| 707 | + $throttlingUntil = $this->getThrottling($request->getResponseHeaders()); |
|
| 708 | + if (!($throttlingUntil instanceof ConvertibleTimestamp)) { |
|
| 709 | + $this->loggingHelper->logSparqlHelperTooManyRequestsRetryAfterInvalid($request); |
|
| 712 | 710 | $this->throttlingLock->lock( |
| 713 | 711 | self::EXPIRY_LOCK_ID, |
| 714 | - $this->getTimestampInFuture( new DateInterval( 'PT' . $fallbackBlockDuration . 'S' ) ) |
|
| 712 | + $this->getTimestampInFuture(new DateInterval('PT'.$fallbackBlockDuration.'S')) |
|
| 715 | 713 | ); |
| 716 | 714 | } else { |
| 717 | - $this->loggingHelper->logSparqlHelperTooManyRequestsRetryAfterPresent( $throttlingUntil, $request ); |
|
| 718 | - $this->throttlingLock->lock( self::EXPIRY_LOCK_ID, $throttlingUntil ); |
|
| 715 | + $this->loggingHelper->logSparqlHelperTooManyRequestsRetryAfterPresent($throttlingUntil, $request); |
|
| 716 | + $this->throttlingLock->lock(self::EXPIRY_LOCK_ID, $throttlingUntil); |
|
| 719 | 717 | } |
| 720 | 718 | throw new TooManySparqlRequestsException(); |
| 721 | 719 | } |
| 722 | 720 | |
| 723 | - $maxAge = $this->getCacheMaxAge( $request->getResponseHeaders() ); |
|
| 724 | - if ( $maxAge ) { |
|
| 725 | - $this->dataFactory->increment( 'wikibase.quality.constraints.sparql.cached' ); |
|
| 721 | + $maxAge = $this->getCacheMaxAge($request->getResponseHeaders()); |
|
| 722 | + if ($maxAge) { |
|
| 723 | + $this->dataFactory->increment('wikibase.quality.constraints.sparql.cached'); |
|
| 726 | 724 | } |
| 727 | 725 | |
| 728 | - if ( $status->isOK() ) { |
|
| 726 | + if ($status->isOK()) { |
|
| 729 | 727 | $json = $request->getContent(); |
| 730 | - $arr = json_decode( $json, true ); |
|
| 728 | + $arr = json_decode($json, true); |
|
| 731 | 729 | return new CachedQueryResults( |
| 732 | 730 | $arr, |
| 733 | 731 | Metadata::ofCachingMetadata( |
| 734 | 732 | $maxAge ? |
| 735 | - CachingMetadata::ofMaximumAgeInSeconds( $maxAge ) : |
|
| 736 | - CachingMetadata::fresh() |
|
| 733 | + CachingMetadata::ofMaximumAgeInSeconds($maxAge) : CachingMetadata::fresh() |
|
| 737 | 734 | ) |
| 738 | 735 | ); |
| 739 | 736 | } else { |
| 740 | - $this->dataFactory->increment( 'wikibase.quality.constraints.sparql.error' ); |
|
| 737 | + $this->dataFactory->increment('wikibase.quality.constraints.sparql.error'); |
|
| 741 | 738 | |
| 742 | 739 | $this->dataFactory->increment( |
| 743 | 740 | "wikibase.quality.constraints.sparql.error.http.{$request->getStatus()}" |
| 744 | 741 | ); |
| 745 | 742 | |
| 746 | - if ( $this->isTimeout( $request->getContent() ) ) { |
|
| 743 | + if ($this->isTimeout($request->getContent())) { |
|
| 747 | 744 | $this->dataFactory->increment( |
| 748 | 745 | 'wikibase.quality.constraints.sparql.error.timeout' |
| 749 | 746 | ); |