@@ -15,6 +15,6 @@ |
||
| 15 | 15 | * |
| 16 | 16 | * @param DumpMetaInformation $dumpMetaInformation |
| 17 | 17 | */ |
| 18 | - public function save( DumpMetaInformation $dumpMetaInformation ); |
|
| 18 | + public function save(DumpMetaInformation $dumpMetaInformation); |
|
| 19 | 19 | |
| 20 | 20 | } |
@@ -102,8 +102,7 @@ |
||
| 102 | 102 | $db->begin(); |
| 103 | 103 | $result = $db->insert( self::TABLE_NAME, $accumulator ); |
| 104 | 104 | $db->commit(); |
| 105 | - } |
|
| 106 | - catch( DBError $ex ) { |
|
| 105 | + } catch( DBError $ex ) { |
|
| 107 | 106 | $db->rollback(); |
| 108 | 107 | throw $ex; |
| 109 | 108 | } |
@@ -24,23 +24,23 @@ discard block |
||
| 24 | 24 | * @param PropertyId[] $propertyIds |
| 25 | 25 | * @return array |
| 26 | 26 | */ |
| 27 | - public function getExternalData( array $dumpIds, array $externalIds, array $propertyIds ) { |
|
| 28 | - Assert::parameterElementType( 'string', $dumpIds, '$dumpIds' ); |
|
| 29 | - Assert::parameterElementType( 'string', $externalIds, '$externalIds' ); |
|
| 30 | - Assert::parameterElementType( PropertyId::class, $propertyIds, '$propertyIds' ); |
|
| 31 | - Assert::parameter( count( $dumpIds ) > 0, '$dumpIds', '$dumpIds has to contain at least one element.' ); |
|
| 32 | - Assert::parameter( count( $externalIds ) > 0, '$externalIds', '$externalIds has to contain at least one element.' ); |
|
| 27 | + public function getExternalData(array $dumpIds, array $externalIds, array $propertyIds) { |
|
| 28 | + Assert::parameterElementType('string', $dumpIds, '$dumpIds'); |
|
| 29 | + Assert::parameterElementType('string', $externalIds, '$externalIds'); |
|
| 30 | + Assert::parameterElementType(PropertyId::class, $propertyIds, '$propertyIds'); |
|
| 31 | + Assert::parameter(count($dumpIds) > 0, '$dumpIds', '$dumpIds has to contain at least one element.'); |
|
| 32 | + Assert::parameter(count($externalIds) > 0, '$externalIds', '$externalIds has to contain at least one element.'); |
|
| 33 | 33 | |
| 34 | 34 | $conditions = array( |
| 35 | 35 | 'dump_id' => $dumpIds, |
| 36 | 36 | 'external_id' => $externalIds |
| 37 | 37 | ); |
| 38 | - if ( $propertyIds ) { |
|
| 38 | + if ($propertyIds) { |
|
| 39 | 39 | $conditions['pid'] = $propertyIds; |
| 40 | 40 | } |
| 41 | 41 | |
| 42 | 42 | $externalData = array(); |
| 43 | - $db = wfGetDB( DB_SLAVE ); |
|
| 43 | + $db = wfGetDB(DB_SLAVE); |
|
| 44 | 44 | $result = $db->select( |
| 45 | 45 | self::TABLE_NAME, |
| 46 | 46 | array( |
@@ -52,7 +52,7 @@ discard block |
||
| 52 | 52 | $conditions |
| 53 | 53 | ); |
| 54 | 54 | |
| 55 | - foreach ( $result as $row ) { |
|
| 55 | + foreach ($result as $row) { |
|
| 56 | 56 | $externalData[$row->dump_id][$row->external_id][$row->pid][] = $row->external_value; |
| 57 | 57 | } |
| 58 | 58 | |
@@ -68,13 +68,13 @@ discard block |
||
| 68 | 68 | * @param string $externalValue |
| 69 | 69 | * @return bool |
| 70 | 70 | */ |
| 71 | - public function insert( $dumpId, $externalId, PropertyId $propertyId, $externalValue ) { |
|
| 72 | - Assert::parameterType( 'string', $dumpId, '$dumpId' ); |
|
| 73 | - Assert::parameterType( 'string', $externalId, '$externalId' ); |
|
| 74 | - Assert::parameterType( 'string', $externalValue, '$externalValue' ); |
|
| 71 | + public function insert($dumpId, $externalId, PropertyId $propertyId, $externalValue) { |
|
| 72 | + Assert::parameterType('string', $dumpId, '$dumpId'); |
|
| 73 | + Assert::parameterType('string', $externalId, '$externalId'); |
|
| 74 | + Assert::parameterType('string', $externalValue, '$externalValue'); |
|
| 75 | 75 | |
| 76 | - $externalDataBatch = array( func_get_args() ); |
|
| 77 | - return $this->insertBatch( $externalDataBatch ); |
|
| 76 | + $externalDataBatch = array(func_get_args()); |
|
| 77 | + return $this->insertBatch($externalDataBatch); |
|
| 78 | 78 | } |
| 79 | 79 | |
| 80 | 80 | /** |
@@ -84,10 +84,10 @@ discard block |
||
| 84 | 84 | * @throws DBError |
| 85 | 85 | * @return bool |
| 86 | 86 | */ |
| 87 | - public function insertBatch( array $externalDataBatch ) { |
|
| 88 | - $db = wfGetDB( DB_MASTER ); |
|
| 87 | + public function insertBatch(array $externalDataBatch) { |
|
| 88 | + $db = wfGetDB(DB_MASTER); |
|
| 89 | 89 | $accumulator = array_map( |
| 90 | - function ( $externalData ) use ( $db ) { |
|
| 90 | + function($externalData) use ($db) { |
|
| 91 | 91 | return array( |
| 92 | 92 | 'dump_id' => $externalData[0], |
| 93 | 93 | 'external_id' => $externalData[1], |
@@ -100,10 +100,10 @@ discard block |
||
| 100 | 100 | |
| 101 | 101 | try { |
| 102 | 102 | $db->begin(); |
| 103 | - $result = $db->insert( self::TABLE_NAME, $accumulator ); |
|
| 103 | + $result = $db->insert(self::TABLE_NAME, $accumulator); |
|
| 104 | 104 | $db->commit(); |
| 105 | 105 | } |
| 106 | - catch( DBError $ex ) { |
|
| 106 | + catch (DBError $ex) { |
|
| 107 | 107 | $db->rollback(); |
| 108 | 108 | throw $ex; |
| 109 | 109 | } |
@@ -118,21 +118,21 @@ discard block |
||
| 118 | 118 | * @param int $batchSize |
| 119 | 119 | * @throws \DBUnexpectedError |
| 120 | 120 | */ |
| 121 | - public function deleteOfDump( $dumpId, $batchSize = 1000 ) { |
|
| 122 | - Assert::parameterType( 'string', $dumpId, '$dumpId' ); |
|
| 123 | - Assert::parameterType( 'integer', $batchSize, 'batchSize' ); |
|
| 121 | + public function deleteOfDump($dumpId, $batchSize = 1000) { |
|
| 122 | + Assert::parameterType('string', $dumpId, '$dumpId'); |
|
| 123 | + Assert::parameterType('integer', $batchSize, 'batchSize'); |
|
| 124 | 124 | |
| 125 | - $db = wfGetDB( DB_MASTER ); |
|
| 126 | - if ( $db->getType() === 'sqlite' ) { |
|
| 127 | - $db->delete( self::TABLE_NAME, array( 'dump_id' => $dumpId ) ); |
|
| 125 | + $db = wfGetDB(DB_MASTER); |
|
| 126 | + if ($db->getType() === 'sqlite') { |
|
| 127 | + $db->delete(self::TABLE_NAME, array('dump_id' => $dumpId)); |
|
| 128 | 128 | } else { |
| 129 | 129 | do { |
| 130 | - $db->commit( __METHOD__, 'flush' ); |
|
| 130 | + $db->commit(__METHOD__, 'flush'); |
|
| 131 | 131 | wfGetLBFactory()->waitForReplication(); |
| 132 | - $table = $db->tableName( self::TABLE_NAME ); |
|
| 133 | - $condition = 'dump_id = ' . $db->addQuotes( $dumpId ); |
|
| 134 | - $db->query( sprintf( 'DELETE FROM %s WHERE %s LIMIT %s', $table, $condition, $batchSize ) ); |
|
| 135 | - } while ( $db->affectedRows() > 0 ); |
|
| 132 | + $table = $db->tableName(self::TABLE_NAME); |
|
| 133 | + $condition = 'dump_id = '.$db->addQuotes($dumpId); |
|
| 134 | + $db->query(sprintf('DELETE FROM %s WHERE %s LIMIT %s', $table, $condition, $batchSize)); |
|
| 135 | + } while ($db->affectedRows() > 0); |
|
| 136 | 136 | } |
| 137 | 137 | } |
| 138 | 138 | |
@@ -72,7 +72,7 @@ discard block |
||
| 72 | 72 | * |
| 73 | 73 | * @fixme inject specific things needed here instead of the WikibaseRepo factory. (T112105) |
| 74 | 74 | */ |
| 75 | - public function __construct( WikibaseRepo $wikibaseRepo ) { |
|
| 75 | + public function __construct(WikibaseRepo $wikibaseRepo) { |
|
| 76 | 76 | $this->wikibaseRepo = $wikibaseRepo; |
| 77 | 77 | } |
| 78 | 78 | |
@@ -88,7 +88,7 @@ discard block |
||
| 88 | 88 | if ($instance === null) { |
| 89 | 89 | $wikibaseRepo = WikibaseRepo::getDefaultInstance(); |
| 90 | 90 | |
| 91 | - $instance = new self( $wikibaseRepo ); |
|
| 91 | + $instance = new self($wikibaseRepo); |
|
| 92 | 92 | } |
| 93 | 93 | |
| 94 | 94 | return $instance; |
@@ -22,7 +22,7 @@ discard block |
||
| 22 | 22 | /** |
| 23 | 23 | * @param Serializer $dataValueSerializer |
| 24 | 24 | */ |
| 25 | - public function __construct( Serializer $dataValueSerializer ) { |
|
| 25 | + public function __construct(Serializer $dataValueSerializer) { |
|
| 26 | 26 | $this->dataValueSerializer = $dataValueSerializer; |
| 27 | 27 | } |
| 28 | 28 | |
@@ -33,7 +33,7 @@ discard block |
||
| 33 | 33 | * |
| 34 | 34 | * @return bool |
| 35 | 35 | */ |
| 36 | - public function isSerializerFor( $object ) { |
|
| 36 | + public function isSerializerFor($object) { |
|
| 37 | 37 | return $object instanceof ComparisonResult; |
| 38 | 38 | } |
| 39 | 39 | |
@@ -45,29 +45,29 @@ discard block |
||
| 45 | 45 | * @return array |
| 46 | 46 | * @throws UnsupportedObjectException |
| 47 | 47 | */ |
| 48 | - public function serialize( $object ) { |
|
| 49 | - if ( !$this->isSerializerFor( $object ) ) { |
|
| 48 | + public function serialize($object) { |
|
| 49 | + if (!$this->isSerializerFor($object)) { |
|
| 50 | 50 | throw new UnsupportedObjectException( |
| 51 | 51 | $object, |
| 52 | 52 | 'ComparisonResultSerializer can only serialize ComparisonResult objects.' |
| 53 | 53 | ); |
| 54 | 54 | } |
| 55 | 55 | |
| 56 | - return $this->getSerialized( $object ); |
|
| 56 | + return $this->getSerialized($object); |
|
| 57 | 57 | } |
| 58 | 58 | |
| 59 | - private function getSerialized( ComparisonResult $comparisonResult ) { |
|
| 59 | + private function getSerialized(ComparisonResult $comparisonResult) { |
|
| 60 | 60 | $dataValueSerializer = $this->dataValueSerializer; |
| 61 | 61 | $externalValues = array_map( |
| 62 | - function ( $dataValue ) use ( $dataValueSerializer ) { |
|
| 63 | - return $dataValueSerializer->serialize( $dataValue ); |
|
| 62 | + function($dataValue) use ($dataValueSerializer) { |
|
| 63 | + return $dataValueSerializer->serialize($dataValue); |
|
| 64 | 64 | }, |
| 65 | 65 | $comparisonResult->getExternalValues() |
| 66 | 66 | ); |
| 67 | - $this->setIndexedTagName( $externalValues, 'dataValue' ); |
|
| 67 | + $this->setIndexedTagName($externalValues, 'dataValue'); |
|
| 68 | 68 | |
| 69 | 69 | return array( |
| 70 | - 'localValue' => $this->dataValueSerializer->serialize( $comparisonResult->getLocalValue() ), |
|
| 70 | + 'localValue' => $this->dataValueSerializer->serialize($comparisonResult->getLocalValue()), |
|
| 71 | 71 | 'externalValues' => $externalValues, |
| 72 | 72 | 'result' => $comparisonResult->getStatus() |
| 73 | 73 | ); |
@@ -22,7 +22,7 @@ discard block |
||
| 22 | 22 | /** |
| 23 | 23 | * @param Serializer $crossCheckResultSerializer |
| 24 | 24 | */ |
| 25 | - public function __construct( Serializer $crossCheckResultSerializer ) { |
|
| 25 | + public function __construct(Serializer $crossCheckResultSerializer) { |
|
| 26 | 26 | $this->crossCheckResultSerializer = $crossCheckResultSerializer; |
| 27 | 27 | } |
| 28 | 28 | |
@@ -33,7 +33,7 @@ discard block |
||
| 33 | 33 | * |
| 34 | 34 | * @return bool |
| 35 | 35 | */ |
| 36 | - public function isSerializerFor( $object ) { |
|
| 36 | + public function isSerializerFor($object) { |
|
| 37 | 37 | return $object instanceof CrossCheckResultList; |
| 38 | 38 | } |
| 39 | 39 | |
@@ -45,29 +45,29 @@ discard block |
||
| 45 | 45 | * @return array |
| 46 | 46 | * @throws UnsupportedObjectException |
| 47 | 47 | */ |
| 48 | - public function serialize( $object ) { |
|
| 49 | - if ( !$this->isSerializerFor( $object ) ) { |
|
| 48 | + public function serialize($object) { |
|
| 49 | + if (!$this->isSerializerFor($object)) { |
|
| 50 | 50 | throw new UnsupportedObjectException( |
| 51 | 51 | $object, |
| 52 | 52 | 'CrossCheckResultListSerializer can only serialize CrossCheckResultList objects.' |
| 53 | 53 | ); |
| 54 | 54 | } |
| 55 | 55 | |
| 56 | - return $this->getSerialized( $object ); |
|
| 56 | + return $this->getSerialized($object); |
|
| 57 | 57 | } |
| 58 | 58 | |
| 59 | - private function getSerialized( CrossCheckResultList $resultList ) { |
|
| 59 | + private function getSerialized(CrossCheckResultList $resultList) { |
|
| 60 | 60 | $serialization = array(); |
| 61 | - $this->setKeyAttributeName( $serialization, 'property', 'id' ); |
|
| 61 | + $this->setKeyAttributeName($serialization, 'property', 'id'); |
|
| 62 | 62 | |
| 63 | - foreach ( $resultList->getPropertyIds() as $propertyId ) { |
|
| 63 | + foreach ($resultList->getPropertyIds() as $propertyId) { |
|
| 64 | 64 | $id = $propertyId->getSerialization(); |
| 65 | 65 | $resultSerialization = array(); |
| 66 | 66 | |
| 67 | - $this->setIndexedTagName( $resultSerialization, 'result' ); |
|
| 67 | + $this->setIndexedTagName($resultSerialization, 'result'); |
|
| 68 | 68 | |
| 69 | - foreach ( $resultList->getByPropertyId( $propertyId ) as $result ) { |
|
| 70 | - $resultSerialization[] = $this->crossCheckResultSerializer->serialize( $result ); |
|
| 69 | + foreach ($resultList->getByPropertyId($propertyId) as $result) { |
|
| 70 | + $resultSerialization[] = $this->crossCheckResultSerializer->serialize($result); |
|
| 71 | 71 | } |
| 72 | 72 | |
| 73 | 73 | $serialization[$id] = $resultSerialization; |
@@ -34,7 +34,7 @@ discard block |
||
| 34 | 34 | * @param Serializer $comparisonResultSerializer |
| 35 | 35 | * @param Serializer $referenceResultSerializer |
| 36 | 36 | */ |
| 37 | - public function __construct( Serializer $dumpMetaInformationSerializer, Serializer $comparisonResultSerializer, Serializer $referenceResultSerializer ) { |
|
| 37 | + public function __construct(Serializer $dumpMetaInformationSerializer, Serializer $comparisonResultSerializer, Serializer $referenceResultSerializer) { |
|
| 38 | 38 | $this->dumpMetaInformationSerializer = $dumpMetaInformationSerializer; |
| 39 | 39 | $this->comparisonResultSerializer = $comparisonResultSerializer; |
| 40 | 40 | $this->referenceResultSerializer = $referenceResultSerializer; |
@@ -47,7 +47,7 @@ discard block |
||
| 47 | 47 | * |
| 48 | 48 | * @return bool |
| 49 | 49 | */ |
| 50 | - public function isSerializerFor( $object ) { |
|
| 50 | + public function isSerializerFor($object) { |
|
| 51 | 51 | return $object instanceof CrossCheckResult; |
| 52 | 52 | } |
| 53 | 53 | |
@@ -59,25 +59,25 @@ discard block |
||
| 59 | 59 | * @return array |
| 60 | 60 | * @throws UnsupportedObjectException |
| 61 | 61 | */ |
| 62 | - public function serialize( $object ) { |
|
| 63 | - if ( !$this->isSerializerFor( $object ) ) { |
|
| 62 | + public function serialize($object) { |
|
| 63 | + if (!$this->isSerializerFor($object)) { |
|
| 64 | 64 | throw new UnsupportedObjectException( |
| 65 | 65 | $object, |
| 66 | 66 | 'CrossCheckResultSerializer can only serialize CrossCheckResult objects.' |
| 67 | 67 | ); |
| 68 | 68 | } |
| 69 | 69 | |
| 70 | - return $this->getSerialized( $object ); |
|
| 70 | + return $this->getSerialized($object); |
|
| 71 | 71 | } |
| 72 | 72 | |
| 73 | - private function getSerialized( CrossCheckResult $crossCheckResult ) { |
|
| 73 | + private function getSerialized(CrossCheckResult $crossCheckResult) { |
|
| 74 | 74 | return array( |
| 75 | 75 | 'propertyId' => $crossCheckResult->getPropertyId()->getSerialization(), |
| 76 | 76 | 'claimGuid' => $crossCheckResult->getClaimGuid(), |
| 77 | 77 | 'externalId' => $crossCheckResult->getExternalId(), |
| 78 | - 'dataSource' => $this->dumpMetaInformationSerializer->serialize( $crossCheckResult->getDumpMetaInformation() ), |
|
| 79 | - 'comparisonResult' => $this->comparisonResultSerializer->serialize( $crossCheckResult->getComparisonResult() ), |
|
| 80 | - 'referenceResult' => $this->referenceResultSerializer->serialize( $crossCheckResult->getReferenceResult() ) |
|
| 78 | + 'dataSource' => $this->dumpMetaInformationSerializer->serialize($crossCheckResult->getDumpMetaInformation()), |
|
| 79 | + 'comparisonResult' => $this->comparisonResultSerializer->serialize($crossCheckResult->getComparisonResult()), |
|
| 80 | + 'referenceResult' => $this->referenceResultSerializer->serialize($crossCheckResult->getReferenceResult()) |
|
| 81 | 81 | ); |
| 82 | 82 | } |
| 83 | 83 | |
@@ -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 | } |
@@ -22,7 +22,7 @@ discard block |
||
| 22 | 22 | /** |
| 23 | 23 | * @param Serializer $referenceSerializer |
| 24 | 24 | */ |
| 25 | - public function __construct( Serializer $referenceSerializer ) { |
|
| 25 | + public function __construct(Serializer $referenceSerializer) { |
|
| 26 | 26 | $this->referenceSerializer = $referenceSerializer; |
| 27 | 27 | } |
| 28 | 28 | |
@@ -33,7 +33,7 @@ discard block |
||
| 33 | 33 | * |
| 34 | 34 | * @return bool |
| 35 | 35 | */ |
| 36 | - public function isSerializerFor( $object ) { |
|
| 36 | + public function isSerializerFor($object) { |
|
| 37 | 37 | return $object instanceof ReferenceResult; |
| 38 | 38 | } |
| 39 | 39 | |
@@ -45,20 +45,20 @@ discard block |
||
| 45 | 45 | * @return array |
| 46 | 46 | * @throws UnsupportedObjectException |
| 47 | 47 | */ |
| 48 | - public function serialize( $object ) { |
|
| 49 | - if ( !$this->isSerializerFor( $object ) ) { |
|
| 48 | + public function serialize($object) { |
|
| 49 | + if (!$this->isSerializerFor($object)) { |
|
| 50 | 50 | throw new UnsupportedObjectException( |
| 51 | 51 | $object, |
| 52 | 52 | 'ReferenceResultSerializer can only serialize ReferenceResult objects.' |
| 53 | 53 | ); |
| 54 | 54 | } |
| 55 | 55 | |
| 56 | - return $this->getSerialized( $object ); |
|
| 56 | + return $this->getSerialized($object); |
|
| 57 | 57 | } |
| 58 | 58 | |
| 59 | - private function getSerialized( ReferenceResult $referenceResult ) { |
|
| 59 | + private function getSerialized(ReferenceResult $referenceResult) { |
|
| 60 | 60 | return array( |
| 61 | - 'reference' => $this->referenceSerializer->serialize( $referenceResult->getReference() ), |
|
| 61 | + 'reference' => $this->referenceSerializer->serialize($referenceResult->getReference()), |
|
| 62 | 62 | 'status' => $referenceResult->getStatus() |
| 63 | 63 | ); |
| 64 | 64 | } |
@@ -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 | } |