@@ -65,14 +65,14 @@ |
||
| 65 | 65 | * @param ReferenceResult $referenceResult |
| 66 | 66 | * @throws InvalidArgumentException |
| 67 | 67 | */ |
| 68 | - public function __construct( PropertyId $propertyId, |
|
| 68 | + public function __construct(PropertyId $propertyId, |
|
| 69 | 69 | $claimGuid, |
| 70 | 70 | $externalId, |
| 71 | 71 | DumpMetaInformation $dumpMetaInformation, |
| 72 | 72 | ComparisonResult $comparisonResult, |
| 73 | - ReferenceResult $referenceResult ) { |
|
| 74 | - Assert::parameterType( 'string', $claimGuid, '$claimGuid' ); |
|
| 75 | - Assert::parameterType( 'string', $externalId, '$externalId' ); |
|
| 73 | + ReferenceResult $referenceResult) { |
|
| 74 | + Assert::parameterType('string', $claimGuid, '$claimGuid'); |
|
| 75 | + Assert::parameterType('string', $externalId, '$externalId'); |
|
| 76 | 76 | |
| 77 | 77 | $this->propertyId = $propertyId; |
| 78 | 78 | $this->claimGuid = $claimGuid; |
@@ -36,10 +36,10 @@ discard block |
||
| 36 | 36 | * |
| 37 | 37 | * @throws InvalidArgumentException |
| 38 | 38 | */ |
| 39 | - public function __construct( $status, Reference $reference ) { |
|
| 39 | + public function __construct($status, Reference $reference) { |
|
| 40 | 40 | |
| 41 | 41 | $this->reference = $reference; |
| 42 | - $this->setStatus( $status ); |
|
| 42 | + $this->setStatus($status); |
|
| 43 | 43 | } |
| 44 | 44 | |
| 45 | 45 | /** |
@@ -61,14 +61,14 @@ discard block |
||
| 61 | 61 | * |
| 62 | 62 | * @throws InvalidArgumentException |
| 63 | 63 | */ |
| 64 | - private function setStatus( $status ) { |
|
| 65 | - Assert::parameterType( 'string', $status, '$status' ); |
|
| 66 | - if ( !in_array( |
|
| 64 | + private function setStatus($status) { |
|
| 65 | + Assert::parameterType('string', $status, '$status'); |
|
| 66 | + if (!in_array( |
|
| 67 | 67 | $status, |
| 68 | - array( self::STATUS_REFERENCES_MISSING, self::STATUS_REFERENCES_STATED ) |
|
| 68 | + array(self::STATUS_REFERENCES_MISSING, self::STATUS_REFERENCES_STATED) |
|
| 69 | 69 | ) |
| 70 | 70 | ) { |
| 71 | - throw new InvalidArgumentException( '$status must be one of the status constants.' ); |
|
| 71 | + throw new InvalidArgumentException('$status must be one of the status constants.'); |
|
| 72 | 72 | } |
| 73 | 73 | |
| 74 | 74 | $this->status = $status; |
@@ -38,7 +38,7 @@ discard block |
||
| 38 | 38 | ValueParserFactory $comparativeValueParserFactory, |
| 39 | 39 | $languageCode |
| 40 | 40 | ) { |
| 41 | - Assert::parameterType( 'string', $languageCode, '$languageCode' ); |
|
| 41 | + Assert::parameterType('string', $languageCode, '$languageCode'); |
|
| 42 | 42 | |
| 43 | 43 | $this->comparativeValueParserFactory = $comparativeValueParserFactory; |
| 44 | 44 | $this->languageCode = $languageCode; |
@@ -52,11 +52,11 @@ discard block |
||
| 52 | 52 | * |
| 53 | 53 | * @return DataValue |
| 54 | 54 | */ |
| 55 | - public function parse( $value, $propertyType ) { |
|
| 56 | - Assert::parameterType( 'string', $value, '$value' ); |
|
| 57 | - Assert::parameterType( 'string', $propertyType, '$propertyType' ); |
|
| 55 | + public function parse($value, $propertyType) { |
|
| 56 | + Assert::parameterType('string', $value, '$value'); |
|
| 57 | + Assert::parameterType('string', $propertyType, '$propertyType'); |
|
| 58 | 58 | |
| 59 | - return $this->getValueParser( $propertyType )->parse( $value ); |
|
| 59 | + return $this->getValueParser($propertyType)->parse($value); |
|
| 60 | 60 | } |
| 61 | 61 | |
| 62 | 62 | /** |
@@ -64,8 +64,8 @@ discard block |
||
| 64 | 64 | * |
| 65 | 65 | * @return ValueParser |
| 66 | 66 | */ |
| 67 | - private function getValueParser( $type ) { |
|
| 68 | - if( !array_key_exists( $type, $this->valueParsers ) ) { |
|
| 67 | + private function getValueParser($type) { |
|
| 68 | + if (!array_key_exists($type, $this->valueParsers)) { |
|
| 69 | 69 | $parserOptions = $this->getParserOptions(); |
| 70 | 70 | $this->valueParsers[$type] = $this->comparativeValueParserFactory->newParser( |
| 71 | 71 | $type, |
@@ -81,8 +81,8 @@ discard block |
||
| 81 | 81 | */ |
| 82 | 82 | private function getParserOptions() { |
| 83 | 83 | $options = new ParserOptions(); |
| 84 | - $options->setOption( 'valuelang', $this->languageCode ); |
|
| 85 | - $options->setOption( ValueParser::OPT_LANG, $this->languageCode ); |
|
| 84 | + $options->setOption('valuelang', $this->languageCode); |
|
| 85 | + $options->setOption(ValueParser::OPT_LANG, $this->languageCode); |
|
| 86 | 86 | |
| 87 | 87 | return $options; |
| 88 | 88 | } |
@@ -43,7 +43,7 @@ discard block |
||
| 43 | 43 | ) { |
| 44 | 44 | $dataTypeIds = $dataTypeDefinitions->getTypeIds(); |
| 45 | 45 | |
| 46 | - if ( !in_array( 'monolingualtext', $dataTypeIds ) ) { |
|
| 46 | + if (!in_array('monolingualtext', $dataTypeIds)) { |
|
| 47 | 47 | throw new InvalidArgumentException( |
| 48 | 48 | 'monolingualtext must be defined in the DataTypeDefinitions.' |
| 49 | 49 | ); |
@@ -58,21 +58,21 @@ discard block |
||
| 58 | 58 | * |
| 59 | 59 | * @return MultilingualTextValueParser |
| 60 | 60 | */ |
| 61 | - public function newMultilingualTextValueParser( ParserOptions $options = null ) { |
|
| 61 | + public function newMultilingualTextValueParser(ParserOptions $options = null) { |
|
| 62 | 62 | $options = $options ?: new ParserOptions(); |
| 63 | 63 | $monolingualTextValueParser = $this->getValueParserFactory()->newParser( |
| 64 | 64 | 'monolingualtext', |
| 65 | 65 | $options |
| 66 | 66 | ); |
| 67 | 67 | |
| 68 | - return new MultilingualTextValueParser( $monolingualTextValueParser ); |
|
| 68 | + return new MultilingualTextValueParser($monolingualTextValueParser); |
|
| 69 | 69 | } |
| 70 | 70 | |
| 71 | 71 | /** |
| 72 | 72 | * @return StringValueParser |
| 73 | 73 | */ |
| 74 | 74 | public function newStringValueParser() { |
| 75 | - return new StringValueParser( $this->stringNormalizer ); |
|
| 75 | + return new StringValueParser($this->stringNormalizer); |
|
| 76 | 76 | } |
| 77 | 77 | |
| 78 | 78 | /** |
@@ -80,8 +80,8 @@ discard block |
||
| 80 | 80 | * |
| 81 | 81 | * @return ComparativeValueParser |
| 82 | 82 | */ |
| 83 | - public function newComparativeValueParser( $languageCode ) { |
|
| 84 | - Assert::parameterType( 'string', $languageCode, '$languageCode' ); |
|
| 83 | + public function newComparativeValueParser($languageCode) { |
|
| 84 | + Assert::parameterType('string', $languageCode, '$languageCode'); |
|
| 85 | 85 | |
| 86 | 86 | return new ComparativeValueParser( |
| 87 | 87 | $this->getValueParserFactory(), |
@@ -100,14 +100,14 @@ discard block |
||
| 100 | 100 | * @return ValueParserFactory |
| 101 | 101 | */ |
| 102 | 102 | private function getValueParserFactory() { |
| 103 | - if ( $this->valueParserFactory === null ) { |
|
| 103 | + if ($this->valueParserFactory === null) { |
|
| 104 | 104 | $callbacks = $this->dataTypeDefinitions->getParserFactoryCallbacks(); |
| 105 | 105 | |
| 106 | - $callbacks['string'] = array( $this, 'newStringValueParser' ); |
|
| 107 | - $callbacks['multilingualtext'] = array( $this, 'newMultilingualTextValueParser' ); |
|
| 106 | + $callbacks['string'] = array($this, 'newStringValueParser'); |
|
| 107 | + $callbacks['multilingualtext'] = array($this, 'newMultilingualTextValueParser'); |
|
| 108 | 108 | $callbacks['wikibase-entityid'] = $callbacks['monolingualtext']; |
| 109 | 109 | |
| 110 | - $this->valueParserFactory = new ValueParserFactory( $callbacks ); |
|
| 110 | + $this->valueParserFactory = new ValueParserFactory($callbacks); |
|
| 111 | 111 | } |
| 112 | 112 | |
| 113 | 113 | return $this->valueParserFactory; |
@@ -21,7 +21,7 @@ discard block |
||
| 21 | 21 | /** |
| 22 | 22 | * @param ValueParser $monolingualTextValueParser |
| 23 | 23 | */ |
| 24 | - public function __construct( ValueParser $monolingualTextValueParser ) { |
|
| 24 | + public function __construct(ValueParser $monolingualTextValueParser) { |
|
| 25 | 25 | $this->monolingualTextValueParser = $monolingualTextValueParser; |
| 26 | 26 | } |
| 27 | 27 | |
@@ -32,11 +32,11 @@ discard block |
||
| 32 | 32 | * |
| 33 | 33 | * @return MultilingualTextValue |
| 34 | 34 | */ |
| 35 | - public function parse( $value ) { |
|
| 36 | - Assert::parameterType( 'string', $value, '$value' ); |
|
| 35 | + public function parse($value) { |
|
| 36 | + Assert::parameterType('string', $value, '$value'); |
|
| 37 | 37 | |
| 38 | 38 | return new MultilingualTextValue( |
| 39 | - array( $this->monolingualTextValueParser->parse( $value ) ) |
|
| 39 | + array($this->monolingualTextValueParser->parse($value)) |
|
| 40 | 40 | ); |
| 41 | 41 | } |
| 42 | 42 | |
@@ -17,7 +17,7 @@ discard block |
||
| 17 | 17 | /** |
| 18 | 18 | * @param StringNormalizer $stringNormalizer |
| 19 | 19 | */ |
| 20 | - public function __construct( StringNormalizer $stringNormalizer ) { |
|
| 20 | + public function __construct(StringNormalizer $stringNormalizer) { |
|
| 21 | 21 | $this->stringNormalizer = $stringNormalizer; |
| 22 | 22 | } |
| 23 | 23 | |
@@ -28,10 +28,10 @@ discard block |
||
| 28 | 28 | * |
| 29 | 29 | * @return StringValue |
| 30 | 30 | */ |
| 31 | - public function parse( $value ) { |
|
| 32 | - Assert::parameterType( 'string', $value, '$value' ); |
|
| 31 | + public function parse($value) { |
|
| 32 | + Assert::parameterType('string', $value, '$value'); |
|
| 33 | 33 | |
| 34 | - return new StringValue( $this->stringNormalizer->trimToNFC( $value ) ); |
|
| 34 | + return new StringValue($this->stringNormalizer->trimToNFC($value)); |
|
| 35 | 35 | } |
| 36 | 36 | |
| 37 | 37 | } |
@@ -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_REPLICA ); |
|
| 43 | + $db = wfGetDB(DB_REPLICA); |
|
| 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 %d', $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 %d', $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; |