@@ -20,8 +20,8 @@ discard block |
||
| 20 | 20 | * @param array &$arr |
| 21 | 21 | * @param string $tag |
| 22 | 22 | */ |
| 23 | - protected function setIndexedTagName( array &$arr, $tag ) { |
|
| 24 | - ApiResult::setIndexedTagName( $arr, $tag ); |
|
| 23 | + protected function setIndexedTagName(array &$arr, $tag) { |
|
| 24 | + ApiResult::setIndexedTagName($arr, $tag); |
|
| 25 | 25 | } |
| 26 | 26 | |
| 27 | 27 | /** |
@@ -33,9 +33,9 @@ discard block |
||
| 33 | 33 | * @param string $tagName |
| 34 | 34 | * @param string $idAttribute |
| 35 | 35 | */ |
| 36 | - protected function setKeyAttributeName( array &$arr, $tagName, $idAttribute ) { |
|
| 37 | - ApiResult::setArrayType( $arr, 'kvp', $idAttribute ); |
|
| 38 | - ApiResult::setIndexedTagName( $arr, $tagName ); |
|
| 36 | + protected function setKeyAttributeName(array &$arr, $tagName, $idAttribute) { |
|
| 37 | + ApiResult::setArrayType($arr, 'kvp', $idAttribute); |
|
| 38 | + ApiResult::setIndexedTagName($arr, $tagName); |
|
| 39 | 39 | } |
| 40 | 40 | |
| 41 | 41 | } |
@@ -25,7 +25,7 @@ discard block |
||
| 25 | 25 | * @param Serializer $dataValueSerializer |
| 26 | 26 | * @param Serializer $referenceSerializer |
| 27 | 27 | */ |
| 28 | - public function __construct( Serializer $dataValueSerializer, Serializer $referenceSerializer ) { |
|
| 28 | + public function __construct(Serializer $dataValueSerializer, Serializer $referenceSerializer) { |
|
| 29 | 29 | $this->dataValueSerializer = $dataValueSerializer; |
| 30 | 30 | $this->referenceSerializer = $referenceSerializer; |
| 31 | 31 | } |
@@ -47,7 +47,7 @@ discard block |
||
| 47 | 47 | * @return Serializer |
| 48 | 48 | */ |
| 49 | 49 | public function newComparisonResultSerializer() { |
| 50 | - return new ComparisonResultSerializer( $this->dataValueSerializer ); |
|
| 50 | + return new ComparisonResultSerializer($this->dataValueSerializer); |
|
| 51 | 51 | } |
| 52 | 52 | |
| 53 | 53 | /** |
@@ -78,7 +78,7 @@ discard block |
||
| 78 | 78 | * @return Serializer |
| 79 | 79 | */ |
| 80 | 80 | public function newReferenceResultSerializer() { |
| 81 | - return new ReferenceResultSerializer( $this->referenceSerializer ); |
|
| 81 | + return new ReferenceResultSerializer($this->referenceSerializer); |
|
| 82 | 82 | } |
| 83 | 83 | |
| 84 | 84 | } |
@@ -43,11 +43,11 @@ |
||
| 43 | 43 | * @param int $batchSize |
| 44 | 44 | * @param bool $quiet |
| 45 | 45 | */ |
| 46 | - public function __construct( $externalValuesFilePath, $dumpInformationFilePath, $batchSize, $quiet = false ) { |
|
| 47 | - Assert::parameterType( 'string', $externalValuesFilePath, '$externalValuesFilePath' ); |
|
| 48 | - Assert::parameterType( 'string', $dumpInformationFilePath, '$dumpInformationFilePath' ); |
|
| 49 | - Assert::parameterType( 'integer', $batchSize, '$batchSize' ); |
|
| 50 | - Assert::parameterType( 'boolean', $quiet, '$quiet' ); |
|
| 46 | + public function __construct($externalValuesFilePath, $dumpInformationFilePath, $batchSize, $quiet = false) { |
|
| 47 | + Assert::parameterType('string', $externalValuesFilePath, '$externalValuesFilePath'); |
|
| 48 | + Assert::parameterType('string', $dumpInformationFilePath, '$dumpInformationFilePath'); |
|
| 49 | + Assert::parameterType('integer', $batchSize, '$batchSize'); |
|
| 50 | + Assert::parameterType('boolean', $quiet, '$quiet'); |
|
| 51 | 51 | |
| 52 | 52 | $this->externalValuesFilePath = $externalValuesFilePath; |
| 53 | 53 | $this->dumpInformationFilePath = $dumpInformationFilePath; |
@@ -306,7 +306,7 @@ discard block |
||
| 306 | 306 | /** |
| 307 | 307 | * Builds summary from given results |
| 308 | 308 | * |
| 309 | - * @param CrossCheckResult[]|CrossCheckResultList $results |
|
| 309 | + * @param CrossCheckResultList $results |
|
| 310 | 310 | * |
| 311 | 311 | * @return string HTML |
| 312 | 312 | */ |
@@ -396,7 +396,7 @@ discard block |
||
| 396 | 396 | } |
| 397 | 397 | |
| 398 | 398 | /** |
| 399 | - * @param CrossCheckResult[]|CrossCheckResultList $results |
|
| 399 | + * @param CrossCheckResultList $results |
|
| 400 | 400 | * |
| 401 | 401 | * @return string HTML |
| 402 | 402 | */ |
@@ -103,18 +103,18 @@ discard block |
||
| 103 | 103 | OutputFormatValueFormatterFactory $valueFormatterFactory, |
| 104 | 104 | CrossCheckInteractor $crossCheckInteractor |
| 105 | 105 | ) { |
| 106 | - parent::__construct( 'CrossCheck' ); |
|
| 106 | + parent::__construct('CrossCheck'); |
|
| 107 | 107 | |
| 108 | 108 | $this->entityLookup = $entityLookup; |
| 109 | 109 | $this->entityIdParser = $entityIdParser; |
| 110 | 110 | |
| 111 | 111 | $formatterOptions = new FormatterOptions(); |
| 112 | - $formatterOptions->setOption( SnakFormatter::OPT_LANG, $this->getLanguage()->getCode() ); |
|
| 113 | - $this->dataValueFormatter = $valueFormatterFactory->getValueFormatter( SnakFormatter::FORMAT_HTML, $formatterOptions ); |
|
| 112 | + $formatterOptions->setOption(SnakFormatter::OPT_LANG, $this->getLanguage()->getCode()); |
|
| 113 | + $this->dataValueFormatter = $valueFormatterFactory->getValueFormatter(SnakFormatter::FORMAT_HTML, $formatterOptions); |
|
| 114 | 114 | |
| 115 | - $labelLookup = new LanguageLabelDescriptionLookup( $termLookup, $this->getLanguage()->getCode() ); |
|
| 116 | - $this->entityIdLabelFormatter = $entityIdLabelFormatterFactory->getEntityIdFormatter( $labelLookup ); |
|
| 117 | - $this->entityIdLinkFormatter = $entityIdHtmlLinkFormatterFactory->getEntityIdFormatter( $labelLookup ); |
|
| 115 | + $labelLookup = new LanguageLabelDescriptionLookup($termLookup, $this->getLanguage()->getCode()); |
|
| 116 | + $this->entityIdLabelFormatter = $entityIdLabelFormatterFactory->getEntityIdFormatter($labelLookup); |
|
| 117 | + $this->entityIdLinkFormatter = $entityIdHtmlLinkFormatterFactory->getEntityIdFormatter($labelLookup); |
|
| 118 | 118 | |
| 119 | 119 | $this->crossCheckInteractor = $crossCheckInteractor; |
| 120 | 120 | } |
@@ -134,7 +134,7 @@ discard block |
||
| 134 | 134 | * @return string (plain text) |
| 135 | 135 | */ |
| 136 | 136 | public function getDescription() { |
| 137 | - return $this->msg( 'wbqev-crosscheck' )->text(); |
|
| 137 | + return $this->msg('wbqev-crosscheck')->text(); |
|
| 138 | 138 | } |
| 139 | 139 | |
| 140 | 140 | /** |
@@ -146,55 +146,55 @@ discard block |
||
| 146 | 146 | * @throws EntityIdParsingException |
| 147 | 147 | * @throws UnexpectedValueException |
| 148 | 148 | */ |
| 149 | - public function execute( $subPage ) { |
|
| 149 | + public function execute($subPage) { |
|
| 150 | 150 | $out = $this->getOutput(); |
| 151 | - $postRequest = $this->getContext()->getRequest()->getVal( 'entityid' ); |
|
| 152 | - if ( $postRequest ) { |
|
| 153 | - $out->redirect( $this->getPageTitle( strtoupper( $postRequest ) )->getLocalURL() ); |
|
| 151 | + $postRequest = $this->getContext()->getRequest()->getVal('entityid'); |
|
| 152 | + if ($postRequest) { |
|
| 153 | + $out->redirect($this->getPageTitle(strtoupper($postRequest))->getLocalURL()); |
|
| 154 | 154 | return; |
| 155 | 155 | } |
| 156 | 156 | |
| 157 | - $out->addModules( 'SpecialCrossCheckPage' ); |
|
| 157 | + $out->addModules('SpecialCrossCheckPage'); |
|
| 158 | 158 | |
| 159 | 159 | $this->setHeaders(); |
| 160 | 160 | |
| 161 | - $out->addHTML( $this->buildInfoBox() ); |
|
| 161 | + $out->addHTML($this->buildInfoBox()); |
|
| 162 | 162 | $this->buildEntityIdForm(); |
| 163 | 163 | |
| 164 | - if ( $subPage ) { |
|
| 165 | - $this->buildResult( $subPage ); |
|
| 164 | + if ($subPage) { |
|
| 165 | + $this->buildResult($subPage); |
|
| 166 | 166 | } |
| 167 | 167 | } |
| 168 | 168 | |
| 169 | 169 | /** |
| 170 | 170 | * @param string $idSerialization |
| 171 | 171 | */ |
| 172 | - private function buildResult( $idSerialization ) { |
|
| 172 | + private function buildResult($idSerialization) { |
|
| 173 | 173 | $out = $this->getOutput(); |
| 174 | 174 | |
| 175 | 175 | try { |
| 176 | - $entityId = $this->entityIdParser->parse( $idSerialization ); |
|
| 177 | - } catch ( EntityIdParsingException $ex ) { |
|
| 178 | - $out->addHTML( $this->buildNotice( 'wbqev-crosscheck-invalid-entity-id', true ) ); |
|
| 176 | + $entityId = $this->entityIdParser->parse($idSerialization); |
|
| 177 | + } catch (EntityIdParsingException $ex) { |
|
| 178 | + $out->addHTML($this->buildNotice('wbqev-crosscheck-invalid-entity-id', true)); |
|
| 179 | 179 | return; |
| 180 | 180 | } |
| 181 | 181 | |
| 182 | - $out->addHTML( $this->buildResultHeader( $entityId ) ); |
|
| 182 | + $out->addHTML($this->buildResultHeader($entityId)); |
|
| 183 | 183 | |
| 184 | - $entity = $this->entityLookup->getEntity( $entityId ); |
|
| 185 | - if ( $entity === null ) { |
|
| 186 | - $out->addHTML( $this->buildNotice( 'wbqev-crosscheck-not-existent-entity', true ) ); |
|
| 184 | + $entity = $this->entityLookup->getEntity($entityId); |
|
| 185 | + if ($entity === null) { |
|
| 186 | + $out->addHTML($this->buildNotice('wbqev-crosscheck-not-existent-entity', true)); |
|
| 187 | 187 | return; |
| 188 | 188 | } |
| 189 | 189 | |
| 190 | - $results = $this->getCrossCheckResultsFromEntity( $entity ); |
|
| 190 | + $results = $this->getCrossCheckResultsFromEntity($entity); |
|
| 191 | 191 | |
| 192 | - if ( $results === null || $results->toArray() === [] ) { |
|
| 193 | - $out->addHTML( $this->buildNotice( 'wbqev-crosscheck-empty-result' ) ); |
|
| 192 | + if ($results === null || $results->toArray() === []) { |
|
| 193 | + $out->addHTML($this->buildNotice('wbqev-crosscheck-empty-result')); |
|
| 194 | 194 | } else { |
| 195 | 195 | $out->addHTML( |
| 196 | - $this->buildSummary( $results ) |
|
| 197 | - . $this->buildResultTable( $results ) |
|
| 196 | + $this->buildSummary($results) |
|
| 197 | + . $this->buildResultTable($results) |
|
| 198 | 198 | ); |
| 199 | 199 | } |
| 200 | 200 | } |
@@ -204,9 +204,9 @@ discard block |
||
| 204 | 204 | * |
| 205 | 205 | * @return CrossCheckResultList|null |
| 206 | 206 | */ |
| 207 | - private function getCrossCheckResultsFromEntity( EntityDocument $entity ) { |
|
| 208 | - if ( $entity instanceof StatementListProvider ) { |
|
| 209 | - return $this->crossCheckInteractor->crossCheckStatements( $entity->getStatements() ); |
|
| 207 | + private function getCrossCheckResultsFromEntity(EntityDocument $entity) { |
|
| 208 | + if ($entity instanceof StatementListProvider) { |
|
| 209 | + return $this->crossCheckInteractor->crossCheckStatements($entity->getStatements()); |
|
| 210 | 210 | } |
| 211 | 211 | |
| 212 | 212 | return null; |
@@ -223,15 +223,15 @@ discard block |
||
| 223 | 223 | 'name' => 'entityid', |
| 224 | 224 | 'label-message' => 'wbqev-crosscheck-form-entityid-label', |
| 225 | 225 | 'cssclass' => 'wbqev-crosscheck-form-entity-id', |
| 226 | - 'placeholder' => $this->msg( 'wbqev-crosscheck-form-entityid-placeholder' )->escaped() |
|
| 226 | + 'placeholder' => $this->msg('wbqev-crosscheck-form-entityid-placeholder')->escaped() |
|
| 227 | 227 | ] |
| 228 | 228 | ]; |
| 229 | - $htmlForm = new HTMLForm( $formDescriptor, $this->getContext(), 'wbqev-crosscheck-form' ); |
|
| 230 | - $htmlForm->setSubmitText( $this->msg( 'wbqev-crosscheck-form-submit-label' )->escaped() ); |
|
| 231 | - $htmlForm->setSubmitCallback( function() { |
|
| 229 | + $htmlForm = new HTMLForm($formDescriptor, $this->getContext(), 'wbqev-crosscheck-form'); |
|
| 230 | + $htmlForm->setSubmitText($this->msg('wbqev-crosscheck-form-submit-label')->escaped()); |
|
| 231 | + $htmlForm->setSubmitCallback(function() { |
|
| 232 | 232 | return false; |
| 233 | 233 | } ); |
| 234 | - $htmlForm->setMethod( 'post' ); |
|
| 234 | + $htmlForm->setMethod('post'); |
|
| 235 | 235 | $htmlForm->show(); |
| 236 | 236 | } |
| 237 | 237 | |
@@ -241,18 +241,18 @@ discard block |
||
| 241 | 241 | * @return string HTML |
| 242 | 242 | */ |
| 243 | 243 | private function buildInfoBox() { |
| 244 | - $externalDbLink = Linker::specialLink( 'ExternalDatabases', 'wbqev-externaldbs' ); |
|
| 244 | + $externalDbLink = Linker::specialLink('ExternalDatabases', 'wbqev-externaldbs'); |
|
| 245 | 245 | $infoBox = |
| 246 | 246 | Html::openElement( |
| 247 | 247 | 'div', |
| 248 | - [ 'class' => 'wbqev-infobox' ] |
|
| 248 | + ['class' => 'wbqev-infobox'] |
|
| 249 | 249 | ) |
| 250 | - . $this->msg( 'wbqev-crosscheck-explanation-general' )->parse() |
|
| 251 | - . sprintf( ' %s.', $externalDbLink ) |
|
| 252 | - . Html::element( 'br' ) |
|
| 253 | - . Html::element( 'br' ) |
|
| 254 | - . $this->msg( 'wbqev-crosscheck-explanation-detail' )->parse() |
|
| 255 | - . Html::closeElement( 'div' ); |
|
| 250 | + . $this->msg('wbqev-crosscheck-explanation-general')->parse() |
|
| 251 | + . sprintf(' %s.', $externalDbLink) |
|
| 252 | + . Html::element('br') |
|
| 253 | + . Html::element('br') |
|
| 254 | + . $this->msg('wbqev-crosscheck-explanation-detail')->parse() |
|
| 255 | + . Html::closeElement('div'); |
|
| 256 | 256 | |
| 257 | 257 | return $infoBox; |
| 258 | 258 | } |
@@ -267,17 +267,17 @@ discard block |
||
| 267 | 267 | * |
| 268 | 268 | * @return string HTML |
| 269 | 269 | */ |
| 270 | - private function buildNotice( $messageKey, $error = false ) { |
|
| 270 | + private function buildNotice($messageKey, $error = false) { |
|
| 271 | 271 | $cssClasses = 'wbqev-crosscheck-notice'; |
| 272 | - if ( $error ) { |
|
| 272 | + if ($error) { |
|
| 273 | 273 | $cssClasses .= ' wbqev-crosscheck-notice-error'; |
| 274 | 274 | } |
| 275 | 275 | |
| 276 | 276 | return |
| 277 | 277 | Html::element( |
| 278 | 278 | 'p', |
| 279 | - [ 'class' => $cssClasses ], |
|
| 280 | - $this->msg( $messageKey )->text() |
|
| 279 | + ['class' => $cssClasses], |
|
| 280 | + $this->msg($messageKey)->text() |
|
| 281 | 281 | ); |
| 282 | 282 | } |
| 283 | 283 | |
@@ -288,18 +288,18 @@ discard block |
||
| 288 | 288 | * |
| 289 | 289 | * @return string HTML |
| 290 | 290 | */ |
| 291 | - private function buildResultHeader( EntityId $entityId ) { |
|
| 291 | + private function buildResultHeader(EntityId $entityId) { |
|
| 292 | 292 | $entityLink = sprintf( |
| 293 | 293 | '%s (%s)', |
| 294 | - $this->entityIdLinkFormatter->formatEntityId( $entityId ), |
|
| 295 | - htmlspecialchars( $entityId->getSerialization() ) |
|
| 294 | + $this->entityIdLinkFormatter->formatEntityId($entityId), |
|
| 295 | + htmlspecialchars($entityId->getSerialization()) |
|
| 296 | 296 | ); |
| 297 | 297 | |
| 298 | 298 | return |
| 299 | 299 | Html::rawElement( |
| 300 | 300 | 'h3', |
| 301 | 301 | [], |
| 302 | - sprintf( '%s %s', $this->msg( 'wbqev-crosscheck-result-headline' )->escaped(), $entityLink ) |
|
| 302 | + sprintf('%s %s', $this->msg('wbqev-crosscheck-result-headline')->escaped(), $entityLink) |
|
| 303 | 303 | ); |
| 304 | 304 | } |
| 305 | 305 | |
@@ -310,11 +310,11 @@ discard block |
||
| 310 | 310 | * |
| 311 | 311 | * @return string HTML |
| 312 | 312 | */ |
| 313 | - private function buildSummary( $results ) { |
|
| 313 | + private function buildSummary($results) { |
|
| 314 | 314 | $statuses = []; |
| 315 | - foreach ( $results as $result ) { |
|
| 316 | - $status = strtolower( $result->getComparisonResult()->getStatus() ); |
|
| 317 | - if ( array_key_exists( $status, $statuses ) ) { |
|
| 315 | + foreach ($results as $result) { |
|
| 316 | + $status = strtolower($result->getComparisonResult()->getStatus()); |
|
| 317 | + if (array_key_exists($status, $statuses)) { |
|
| 318 | 318 | $statuses[$status]++; |
| 319 | 319 | } else { |
| 320 | 320 | $statuses[$status] = 1; |
@@ -322,15 +322,15 @@ discard block |
||
| 322 | 322 | } |
| 323 | 323 | |
| 324 | 324 | $statusElements = []; |
| 325 | - foreach ( $statuses as $status => $count ) { |
|
| 326 | - if ( $count > 0 ) { |
|
| 327 | - $statusElements[] = $this->formatStatus( $status ) . ': ' . $count; |
|
| 325 | + foreach ($statuses as $status => $count) { |
|
| 326 | + if ($count > 0) { |
|
| 327 | + $statusElements[] = $this->formatStatus($status).': '.$count; |
|
| 328 | 328 | } |
| 329 | 329 | } |
| 330 | 330 | $summary = |
| 331 | - Html::openElement( 'p' ) |
|
| 332 | - . implode( ', ', $statusElements ) |
|
| 333 | - . Html::closeElement( 'p' ); |
|
| 331 | + Html::openElement('p') |
|
| 332 | + . implode(', ', $statusElements) |
|
| 333 | + . Html::closeElement('p'); |
|
| 334 | 334 | |
| 335 | 335 | return $summary; |
| 336 | 336 | } |
@@ -344,16 +344,16 @@ discard block |
||
| 344 | 344 | * |
| 345 | 345 | * @return string HTML |
| 346 | 346 | */ |
| 347 | - private function formatStatus( $status ) { |
|
| 348 | - $messageKey = 'wbqev-crosscheck-status-' . strtolower( $status ); |
|
| 347 | + private function formatStatus($status) { |
|
| 348 | + $messageKey = 'wbqev-crosscheck-status-'.strtolower($status); |
|
| 349 | 349 | |
| 350 | 350 | $formattedStatus = |
| 351 | 351 | Html::element( |
| 352 | 352 | 'span', |
| 353 | 353 | [ |
| 354 | - 'class' => 'wbqev-status wbqev-status-' . htmlspecialchars( $status ) |
|
| 354 | + 'class' => 'wbqev-status wbqev-status-'.htmlspecialchars($status) |
|
| 355 | 355 | ], |
| 356 | - $this->msg( $messageKey )->text() |
|
| 356 | + $this->msg($messageKey)->text() |
|
| 357 | 357 | ); |
| 358 | 358 | |
| 359 | 359 | return $formattedStatus; |
@@ -370,29 +370,29 @@ discard block |
||
| 370 | 370 | * |
| 371 | 371 | * @return string HTML |
| 372 | 372 | */ |
| 373 | - private function formatDataValues( $dataValues, $linking = true, $separator = null ) { |
|
| 374 | - if ( $dataValues instanceof DataValue ) { |
|
| 375 | - $dataValues = [ $dataValues ]; |
|
| 373 | + private function formatDataValues($dataValues, $linking = true, $separator = null) { |
|
| 374 | + if ($dataValues instanceof DataValue) { |
|
| 375 | + $dataValues = [$dataValues]; |
|
| 376 | 376 | } |
| 377 | 377 | |
| 378 | 378 | $formattedDataValues = []; |
| 379 | - foreach ( $dataValues as $dataValue ) { |
|
| 380 | - if ( $dataValue instanceof EntityIdValue ) { |
|
| 381 | - if ( $linking ) { |
|
| 382 | - $formattedDataValues[] = $this->entityIdLinkFormatter->formatEntityId( $dataValue->getEntityId() ); |
|
| 379 | + foreach ($dataValues as $dataValue) { |
|
| 380 | + if ($dataValue instanceof EntityIdValue) { |
|
| 381 | + if ($linking) { |
|
| 382 | + $formattedDataValues[] = $this->entityIdLinkFormatter->formatEntityId($dataValue->getEntityId()); |
|
| 383 | 383 | } else { |
| 384 | - $formattedDataValues[] = $this->entityIdLabelFormatter->formatEntityId( $dataValue->getEntityId() ); |
|
| 384 | + $formattedDataValues[] = $this->entityIdLabelFormatter->formatEntityId($dataValue->getEntityId()); |
|
| 385 | 385 | } |
| 386 | 386 | } else { |
| 387 | - $formattedDataValues[] = $this->dataValueFormatter->format( $dataValue ); |
|
| 387 | + $formattedDataValues[] = $this->dataValueFormatter->format($dataValue); |
|
| 388 | 388 | } |
| 389 | 389 | } |
| 390 | 390 | |
| 391 | - if ( $separator ) { |
|
| 392 | - return implode( $separator, $formattedDataValues ); |
|
| 391 | + if ($separator) { |
|
| 392 | + return implode($separator, $formattedDataValues); |
|
| 393 | 393 | } |
| 394 | 394 | |
| 395 | - return $this->getLanguage()->commaList( $formattedDataValues ); |
|
| 395 | + return $this->getLanguage()->commaList($formattedDataValues); |
|
| 396 | 396 | } |
| 397 | 397 | |
| 398 | 398 | /** |
@@ -400,31 +400,31 @@ discard block |
||
| 400 | 400 | * |
| 401 | 401 | * @return string HTML |
| 402 | 402 | */ |
| 403 | - private function buildResultTable( $results ) { |
|
| 403 | + private function buildResultTable($results) { |
|
| 404 | 404 | $table = new HtmlTableBuilder( |
| 405 | 405 | [ |
| 406 | 406 | new HtmlTableHeaderBuilder( |
| 407 | - $this->msg( 'wbqev-crosscheck-result-table-header-status' )->escaped(), |
|
| 407 | + $this->msg('wbqev-crosscheck-result-table-header-status')->escaped(), |
|
| 408 | 408 | true |
| 409 | 409 | ), |
| 410 | 410 | new HtmlTableHeaderBuilder( |
| 411 | - $this->msg( 'datatypes-type-wikibase-property' )->escaped(), |
|
| 411 | + $this->msg('datatypes-type-wikibase-property')->escaped(), |
|
| 412 | 412 | true |
| 413 | 413 | ), |
| 414 | 414 | new HtmlTableHeaderBuilder( |
| 415 | - $this->msg( 'wbqev-crosscheck-result-table-header-local-value' )->escaped() |
|
| 415 | + $this->msg('wbqev-crosscheck-result-table-header-local-value')->escaped() |
|
| 416 | 416 | ), |
| 417 | 417 | new HtmlTableHeaderBuilder( |
| 418 | - $this->msg( 'wbqev-crosscheck-result-table-header-external-value' )->escaped() |
|
| 418 | + $this->msg('wbqev-crosscheck-result-table-header-external-value')->escaped() |
|
| 419 | 419 | ), |
| 420 | 420 | new HtmlTableHeaderBuilder( |
| 421 | - $this->msg( 'wbqev-crosscheck-result-table-header-references' )->escaped(), |
|
| 421 | + $this->msg('wbqev-crosscheck-result-table-header-references')->escaped(), |
|
| 422 | 422 | true |
| 423 | 423 | ), |
| 424 | 424 | new HtmlTableHeaderBuilder( |
| 425 | 425 | Linker::linkKnown( |
| 426 | - self::getTitleFor( 'ExternalDatabases' ), |
|
| 427 | - $this->msg( 'wbqev-crosscheck-result-table-header-external-source' )->escaped() |
|
| 426 | + self::getTitleFor('ExternalDatabases'), |
|
| 427 | + $this->msg('wbqev-crosscheck-result-table-header-external-source')->escaped() |
|
| 428 | 428 | ), |
| 429 | 429 | true, |
| 430 | 430 | true |
@@ -433,28 +433,28 @@ discard block |
||
| 433 | 433 | true |
| 434 | 434 | ); |
| 435 | 435 | |
| 436 | - foreach ( $results as $result ) { |
|
| 437 | - $status = $this->formatStatus( $result->getComparisonResult()->getStatus() ); |
|
| 438 | - $propertyId = $this->entityIdLinkFormatter->formatEntityId( $result->getPropertyId() ); |
|
| 439 | - $localValue = $this->formatDataValues( $result->getComparisonResult()->getLocalValue() ); |
|
| 436 | + foreach ($results as $result) { |
|
| 437 | + $status = $this->formatStatus($result->getComparisonResult()->getStatus()); |
|
| 438 | + $propertyId = $this->entityIdLinkFormatter->formatEntityId($result->getPropertyId()); |
|
| 439 | + $localValue = $this->formatDataValues($result->getComparisonResult()->getLocalValue()); |
|
| 440 | 440 | $externalValue = $this->formatDataValues( |
| 441 | 441 | $result->getComparisonResult()->getExternalValues(), |
| 442 | 442 | true, |
| 443 | - Html::element( 'br' ) |
|
| 443 | + Html::element('br') |
|
| 444 | 444 | ); |
| 445 | 445 | $referenceStatus = $this->msg( |
| 446 | - 'wbqev-crosscheck-status-' . $result->getReferenceResult()->getStatus() |
|
| 446 | + 'wbqev-crosscheck-status-'.$result->getReferenceResult()->getStatus() |
|
| 447 | 447 | )->text(); |
| 448 | - $dataSource = $this->entityIdLinkFormatter->formatEntityId( $result->getDumpMetaInformation()->getSourceItemId() ); |
|
| 448 | + $dataSource = $this->entityIdLinkFormatter->formatEntityId($result->getDumpMetaInformation()->getSourceItemId()); |
|
| 449 | 449 | |
| 450 | 450 | $table->appendRow( |
| 451 | 451 | [ |
| 452 | - new HtmlTableCellBuilder( $status, [], true ), |
|
| 453 | - new HtmlTableCellBuilder( $propertyId, [], true ), |
|
| 454 | - new HtmlTableCellBuilder( $localValue, [], true ), |
|
| 455 | - new HtmlTableCellBuilder( $externalValue, [], true ), |
|
| 456 | - new HtmlTableCellBuilder( $referenceStatus, [] ), |
|
| 457 | - new HtmlTableCellBuilder( $dataSource, [], true ) |
|
| 452 | + new HtmlTableCellBuilder($status, [], true), |
|
| 453 | + new HtmlTableCellBuilder($propertyId, [], true), |
|
| 454 | + new HtmlTableCellBuilder($localValue, [], true), |
|
| 455 | + new HtmlTableCellBuilder($externalValue, [], true), |
|
| 456 | + new HtmlTableCellBuilder($referenceStatus, []), |
|
| 457 | + new HtmlTableCellBuilder($dataSource, [], true) |
|
| 458 | 458 | ] |
| 459 | 459 | ); |
| 460 | 460 | } |
@@ -7,16 +7,16 @@ |
||
| 7 | 7 | * |
| 8 | 8 | * @return bool |
| 9 | 9 | */ |
| 10 | - public static function onCreateSchema( DatabaseUpdater $updater ) { |
|
| 11 | - $updater->addExtensionTable( 'wbqev_dump_information', __DIR__ . '/sql/create_wbqev_dump_information.sql' ); |
|
| 12 | - $updater->addExtensionTable( 'wbqev_external_data', __DIR__ . '/sql/create_wbqev_external_data.sql' ); |
|
| 13 | - $updater->addExtensionTable( 'wbqev_identifier_properties', __DIR__ . '/sql/create_wbqev_identifier_properties.sql' ); |
|
| 10 | + public static function onCreateSchema(DatabaseUpdater $updater) { |
|
| 11 | + $updater->addExtensionTable('wbqev_dump_information', __DIR__.'/sql/create_wbqev_dump_information.sql'); |
|
| 12 | + $updater->addExtensionTable('wbqev_external_data', __DIR__.'/sql/create_wbqev_external_data.sql'); |
|
| 13 | + $updater->addExtensionTable('wbqev_identifier_properties', __DIR__.'/sql/create_wbqev_identifier_properties.sql'); |
|
| 14 | 14 | |
| 15 | 15 | return true; |
| 16 | 16 | } |
| 17 | 17 | |
| 18 | - public static function onUnitTestsList( &$paths ) { |
|
| 19 | - $paths[] = __DIR__ . '/tests/phpunit'; |
|
| 18 | + public static function onUnitTestsList(&$paths) { |
|
| 19 | + $paths[] = __DIR__.'/tests/phpunit'; |
|
| 20 | 20 | return true; |
| 21 | 21 | } |
| 22 | 22 | |
@@ -30,9 +30,9 @@ discard block |
||
| 30 | 30 | * @throws InvalidArgumentException |
| 31 | 31 | * @return string One of the ComparisonResult::STATUS_... constants. |
| 32 | 32 | */ |
| 33 | - public function compare( DataValue $value, DataValue $comparativeValue ) { |
|
| 34 | - if ( !$this->canCompare( $value, $comparativeValue ) ) { |
|
| 35 | - throw new InvalidArgumentException( 'Given values can not be compared using this comparer.' ); |
|
| 33 | + public function compare(DataValue $value, DataValue $comparativeValue) { |
|
| 34 | + if (!$this->canCompare($value, $comparativeValue)) { |
|
| 35 | + throw new InvalidArgumentException('Given values can not be compared using this comparer.'); |
|
| 36 | 36 | } |
| 37 | 37 | |
| 38 | 38 | /** |
@@ -42,38 +42,38 @@ discard block |
||
| 42 | 42 | |
| 43 | 43 | $result = ComparisonResult::STATUS_MISMATCH; |
| 44 | 44 | |
| 45 | - if ( !preg_match( '/^([-+]?)(\d*)((\d{4}\b).*)/', $value->getTime(), $localMatches ) |
|
| 46 | - || !preg_match( '/^([-+]?)(\d*)((\d{4}\b).*)/', $comparativeValue->getTime(), $externalMatches ) |
|
| 45 | + if (!preg_match('/^([-+]?)(\d*)((\d{4}\b).*)/', $value->getTime(), $localMatches) |
|
| 46 | + || !preg_match('/^([-+]?)(\d*)((\d{4}\b).*)/', $comparativeValue->getTime(), $externalMatches) |
|
| 47 | 47 | ) { |
| 48 | 48 | return ComparisonResult::STATUS_MISMATCH; |
| 49 | 49 | } |
| 50 | - list( , $localSign, $localYearHigh, $localMwTime, $localYearLow ) = $localMatches; |
|
| 51 | - list( , $externalSign, $externalYearHigh, $externalMwTime, $externalYearLow ) = $externalMatches; |
|
| 52 | - if ( $localSign !== $externalSign && ( $localYearHigh . $localYearLow !== '0000' |
|
| 53 | - || $externalYearHigh . $externalYearLow !== '0000' ) |
|
| 50 | + list(, $localSign, $localYearHigh, $localMwTime, $localYearLow) = $localMatches; |
|
| 51 | + list(, $externalSign, $externalYearHigh, $externalMwTime, $externalYearLow) = $externalMatches; |
|
| 52 | + if ($localSign !== $externalSign && ($localYearHigh.$localYearLow !== '0000' |
|
| 53 | + || $externalYearHigh.$externalYearLow !== '0000') |
|
| 54 | 54 | ) { |
| 55 | 55 | return ComparisonResult::STATUS_MISMATCH; |
| 56 | 56 | } |
| 57 | 57 | |
| 58 | 58 | try { |
| 59 | - $localTimestamp = new MWTimestamp( $localMwTime ); |
|
| 60 | - $externalTimestamp = new MWTimestamp( $externalMwTime ); |
|
| 61 | - $diff = $localTimestamp->diff( $externalTimestamp ); |
|
| 62 | - $diff->y += abs( $localYearHigh - $externalYearHigh ) * 10000; |
|
| 59 | + $localTimestamp = new MWTimestamp($localMwTime); |
|
| 60 | + $externalTimestamp = new MWTimestamp($externalMwTime); |
|
| 61 | + $diff = $localTimestamp->diff($externalTimestamp); |
|
| 62 | + $diff->y += abs($localYearHigh - $externalYearHigh) * 10000; |
|
| 63 | 63 | |
| 64 | - if ( $value->getPrecision() === $comparativeValue->getPrecision() |
|
| 65 | - && $this->resultOfDiffWithPrecision( $diff, $value->getPrecision() ) |
|
| 64 | + if ($value->getPrecision() === $comparativeValue->getPrecision() |
|
| 65 | + && $this->resultOfDiffWithPrecision($diff, $value->getPrecision()) |
|
| 66 | 66 | ) { |
| 67 | 67 | $result = ComparisonResult::STATUS_MATCH; |
| 68 | 68 | } elseif ( |
| 69 | 69 | $this->resultOfDiffWithPrecision( |
| 70 | 70 | $diff, |
| 71 | - min( $value->getPrecision(), $comparativeValue->getPrecision() ) |
|
| 71 | + min($value->getPrecision(), $comparativeValue->getPrecision()) |
|
| 72 | 72 | ) |
| 73 | 73 | ) { |
| 74 | 74 | $result = ComparisonResult::STATUS_PARTIAL_MATCH; |
| 75 | 75 | } |
| 76 | - } catch ( TimestampException $ex ) { |
|
| 76 | + } catch (TimestampException $ex) { |
|
| 77 | 77 | } |
| 78 | 78 | |
| 79 | 79 | return $result; |
@@ -87,10 +87,10 @@ discard block |
||
| 87 | 87 | * |
| 88 | 88 | * @return bool |
| 89 | 89 | */ |
| 90 | - private function resultOfDiffWithPrecision( DateInterval $diff, $precision ) { |
|
| 90 | + private function resultOfDiffWithPrecision(DateInterval $diff, $precision) { |
|
| 91 | 91 | $result = true; |
| 92 | 92 | |
| 93 | - switch ( $precision ) { |
|
| 93 | + switch ($precision) { |
|
| 94 | 94 | case TimeValue::PRECISION_SECOND: |
| 95 | 95 | $result = $diff->s === 0; |
| 96 | 96 | // Fall through with no break/return. This is critical for this algorithm. |
@@ -134,10 +134,10 @@ discard block |
||
| 134 | 134 | * |
| 135 | 135 | * @return ValueParser |
| 136 | 136 | */ |
| 137 | - protected function getExternalValueParser( DumpMetaInformation $dumpMetaInformation ) { |
|
| 137 | + protected function getExternalValueParser(DumpMetaInformation $dumpMetaInformation) { |
|
| 138 | 138 | $parserOptions = new ParserOptions(); |
| 139 | - $parserOptions->setOption( ValueParser::OPT_LANG, $dumpMetaInformation->getLanguageCode() ); |
|
| 140 | - $timeParserFactory = new TimeParserFactory( $parserOptions ); |
|
| 139 | + $parserOptions->setOption(ValueParser::OPT_LANG, $dumpMetaInformation->getLanguageCode()); |
|
| 140 | + $timeParserFactory = new TimeParserFactory($parserOptions); |
|
| 141 | 141 | |
| 142 | 142 | return $timeParserFactory->getTimeParser(); |
| 143 | 143 | } |
@@ -150,7 +150,7 @@ discard block |
||
| 150 | 150 | * |
| 151 | 151 | * @return bool |
| 152 | 152 | */ |
| 153 | - public function canCompare( DataValue $value, DataValue $comparativeValue ) { |
|
| 153 | + public function canCompare(DataValue $value, DataValue $comparativeValue) { |
|
| 154 | 154 | return $value instanceof TimeValue && $comparativeValue instanceof TimeValue; |
| 155 | 155 | } |
| 156 | 156 | |
@@ -20,7 +20,7 @@ discard block |
||
| 20 | 20 | * @return DumpMetaInformation[] |
| 21 | 21 | * @throws \InvalidArgumentException |
| 22 | 22 | */ |
| 23 | - public function getWithIds( array $dumpIds ); |
|
| 23 | + public function getWithIds(array $dumpIds); |
|
| 24 | 24 | |
| 25 | 25 | /** |
| 26 | 26 | * Gets DumpMetaInformation for specific identifier properties from database |
@@ -30,7 +30,7 @@ discard block |
||
| 30 | 30 | * |
| 31 | 31 | * @return DumpMetaInformation[] |
| 32 | 32 | */ |
| 33 | - public function getWithIdentifierProperties( array $identifierPropertyIds ); |
|
| 33 | + public function getWithIdentifierProperties(array $identifierPropertyIds); |
|
| 34 | 34 | |
| 35 | 35 | /** |
| 36 | 36 | * Gets all DumpMetaInformation from database |
@@ -7,10 +7,10 @@ discard block |
||
| 7 | 7 | use WikibaseQuality\ExternalValidation\UpdateExternalData\CsvImportSettings; |
| 8 | 8 | use WikibaseQuality\ExternalValidation\UpdateExternalData\ExternalDataImporter; |
| 9 | 9 | |
| 10 | -$basePath = getenv( 'MW_INSTALL_PATH' ) !== false |
|
| 11 | - ? getenv( 'MW_INSTALL_PATH' ) |
|
| 12 | - : __DIR__ . '/../../..'; |
|
| 13 | -require_once $basePath . '/maintenance/Maintenance.php'; |
|
| 10 | +$basePath = getenv('MW_INSTALL_PATH') !== false |
|
| 11 | + ? getenv('MW_INSTALL_PATH') |
|
| 12 | + : __DIR__.'/../../..'; |
|
| 13 | +require_once $basePath.'/maintenance/Maintenance.php'; |
|
| 14 | 14 | |
| 15 | 15 | /** |
| 16 | 16 | * Maintenance script that evokes updates of wbqev_external_data, wbqev_dump_information, wbqev_identifier_properties |
@@ -25,17 +25,17 @@ discard block |
||
| 25 | 25 | public function __construct() { |
| 26 | 26 | parent::__construct(); |
| 27 | 27 | |
| 28 | - $this->addDescription( 'Imports external entities from given CSV files into the local ' |
|
| 29 | - . 'database. CSV files can be generated using the DumpConverter.' ); |
|
| 30 | - $this->addOption( 'external-values-file', 'CSV file containing external values for import.', true, true ); |
|
| 31 | - $this->addOption( 'dump-information-file', 'CSV file containing dump meta information for import.', true, true ); |
|
| 32 | - $this->setBatchSize( 1000 ); |
|
| 28 | + $this->addDescription('Imports external entities from given CSV files into the local ' |
|
| 29 | + . 'database. CSV files can be generated using the DumpConverter.'); |
|
| 30 | + $this->addOption('external-values-file', 'CSV file containing external values for import.', true, true); |
|
| 31 | + $this->addOption('dump-information-file', 'CSV file containing dump meta information for import.', true, true); |
|
| 32 | + $this->setBatchSize(1000); |
|
| 33 | 33 | } |
| 34 | 34 | |
| 35 | 35 | public function execute() { |
| 36 | 36 | $context = new CsvImportSettings( |
| 37 | - $this->getOption( 'external-values-file' ), |
|
| 38 | - $this->getOption( 'dump-information-file' ), |
|
| 37 | + $this->getOption('external-values-file'), |
|
| 38 | + $this->getOption('dump-information-file'), |
|
| 39 | 39 | $this->mBatchSize, |
| 40 | 40 | $this->isQuiet() |
| 41 | 41 | ); |
@@ -23,9 +23,9 @@ discard block |
||
| 23 | 23 | * @throws InvalidArgumentException |
| 24 | 24 | * @return string One of the ComparisonResult::STATUS_... constants. |
| 25 | 25 | */ |
| 26 | - public function compare( DataValue $value, DataValue $comparativeValue ) { |
|
| 27 | - if ( !$this->canCompare( $value, $comparativeValue ) ) { |
|
| 28 | - throw new InvalidArgumentException( 'Given values can not be compared using this comparer.' ); |
|
| 26 | + public function compare(DataValue $value, DataValue $comparativeValue) { |
|
| 27 | + if (!$this->canCompare($value, $comparativeValue)) { |
|
| 28 | + throw new InvalidArgumentException('Given values can not be compared using this comparer.'); |
|
| 29 | 29 | } |
| 30 | 30 | |
| 31 | 31 | /** |
@@ -33,8 +33,8 @@ discard block |
||
| 33 | 33 | * @var QuantityValue $comparativeValue |
| 34 | 34 | */ |
| 35 | 35 | |
| 36 | - if ( $comparativeValue->getLowerBound()->compare( $value->getUpperBound() ) <= 0 && |
|
| 37 | - $comparativeValue->getUpperBound()->compare( $value->getLowerBound() ) >= 0 |
|
| 36 | + if ($comparativeValue->getLowerBound()->compare($value->getUpperBound()) <= 0 && |
|
| 37 | + $comparativeValue->getUpperBound()->compare($value->getLowerBound()) >= 0 |
|
| 38 | 38 | ) { |
| 39 | 39 | return ComparisonResult::STATUS_MATCH; |
| 40 | 40 | } |
@@ -50,7 +50,7 @@ discard block |
||
| 50 | 50 | * |
| 51 | 51 | * @return bool |
| 52 | 52 | */ |
| 53 | - public function canCompare( DataValue $value, DataValue $comparativeValue ) { |
|
| 53 | + public function canCompare(DataValue $value, DataValue $comparativeValue) { |
|
| 54 | 54 | return $value instanceof QuantityValue && $comparativeValue instanceof QuantityValue; |
| 55 | 55 | } |
| 56 | 56 | |