jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/390581 )

Change subject: New Wikidata Build - 2017-11-11T10:00:02+0000
......................................................................


New Wikidata Build - 2017-11-11T10:00:02+0000

Change-Id: Icef106e1fe700e01bfc4b251cbd8a984b5e33a44
---
M composer.lock
M extensions/Wikibase/client/WikibaseClient.datatypes.php
M extensions/Wikibase/client/includes/Changes/AffectedPagesFinder.php
M extensions/Wikibase/client/includes/Changes/ChangeHandler.php
M extensions/Wikibase/client/includes/Changes/ChangeRunCoalescer.php
M 
extensions/Wikibase/client/tests/phpunit/includes/Changes/AffectedPagesFinderTest.php
M extensions/Wikibase/client/tests/phpunit/includes/Changes/MockPageUpdater.php
M extensions/Wikibase/lib/includes/Changes/ChangeRow.php
M extensions/Wikibase/lib/includes/Changes/EntityChangeFactory.php
M extensions/Wikibase/lib/includes/Formatters/MonolingualHtmlFormatter.php
M extensions/Wikibase/lib/includes/Formatters/MonolingualTextFormatter.php
M extensions/Wikibase/lib/includes/Formatters/WikibaseValueFormatterBuilders.php
M 
extensions/Wikibase/lib/tests/phpunit/Formatters/MonolingualHtmlFormatterTest.php
M 
extensions/Wikibase/lib/tests/phpunit/Formatters/MonolingualTextFormatterTest.php
M extensions/Wikibase/repo/WikibaseRepo.datatypes.php
M extensions/Wikibase/repo/i18n/be-tarask.json
M extensions/Wikibase/repo/includes/Store/Sql/SqlChangeStore.php
M vendor/composer/installed.json
18 files changed, 106 insertions(+), 49 deletions(-)

Approvals:
  Aude: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/composer.lock b/composer.lock
index c7554d7..0caa668 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1253,7 +1253,7 @@
             "source": {
                 "type": "git",
                 "url": 
"https://gerrit.wikimedia.org/r/mediawiki/extensions/Wikibase";,
-                "reference": "c05e2988bfb8a0837275258a5c63585e0902570e"
+                "reference": "0d95b4fd64880cb2ae803ce87dba0969d26f58b6"
             },
             "require": {
                 "composer/installers": ">=1.0.1",
@@ -1339,7 +1339,7 @@
                 "issues": "https://phabricator.wikimedia.org/";,
                 "irc": "irc://irc.freenode.net/wikidata"
             },
-            "time": "2017-11-10 04:56:55"
+            "time": "2017-11-10 22:23:24"
         },
         {
             "name": "wikibase/wikimedia-badges",
diff --git a/extensions/Wikibase/client/WikibaseClient.datatypes.php 
b/extensions/Wikibase/client/WikibaseClient.datatypes.php
index 1174c2f..1a3e143 100644
--- a/extensions/Wikibase/client/WikibaseClient.datatypes.php
+++ b/extensions/Wikibase/client/WikibaseClient.datatypes.php
@@ -51,7 +51,7 @@
                'VT:monolingualtext' => [
                        'formatter-factory-callback' => function( $format, 
FormatterOptions $options ) {
                                $factory = 
WikibaseClient::getDefaultValueFormatterBuilders();
-                               return $factory->newMonolingualFormatter( 
$format, $options );
+                               return $factory->newMonolingualFormatter( 
$format );
                        },
                ],
                'VT:quantity' => [
diff --git 
a/extensions/Wikibase/client/includes/Changes/AffectedPagesFinder.php 
b/extensions/Wikibase/client/includes/Changes/AffectedPagesFinder.php
index 8a3bdc8..fe66f77 100644
--- a/extensions/Wikibase/client/includes/Changes/AffectedPagesFinder.php
+++ b/extensions/Wikibase/client/includes/Changes/AffectedPagesFinder.php
@@ -161,6 +161,16 @@
                                $remainingDiffOps -= count( $labelAspects );
                        }
                }
+
+               if ( $diff instanceof EntityDiff && 
!$diff->getDescriptionsDiff()->isEmpty() ) {
+                       $descriptionsDiff = $diff->getDescriptionsDiff();
+
+                       if ( !empty( $descriptionsDiff ) ) {
+                               $descriptionsAspects = 
$this->getChangedDescriptionAspects( $descriptionsDiff );
+                               $aspects = array_merge( $aspects, 
$descriptionsAspects );
+                               $remainingDiffOps -= count( 
$descriptionsAspects );
+                       }
+               }
                // FIXME: EntityChange suppresses various kinds of diffs (see 
above). T113468.
 
                if ( $remainingDiffOps > 0 ) {
@@ -193,6 +203,28 @@
        }
 
        /**
+        * @param Diff $descriptionsDiff
+        *
+        * @return string[]
+        */
+       private function getChangedDescriptionAspects( Diff $descriptionsDiff ) 
{
+               $aspects = [];
+
+               foreach ( $descriptionsDiff as $lang => $diffOp ) {
+                       $aspects[] = EntityUsage::makeAspectKey( 
EntityUsage::DESCRIPTION_USAGE, $lang );
+               }
+
+               if ( $this->trackUsagesInAllLanguages ) {
+                       // On multi-lingual wikis where users can request pages 
in any language, we can not
+                       // optimize for one language fallback chain only. Since 
all possible language fallback
+                       // chains must cover all languages, we can simply track 
an "all languages" usage.
+                       $aspects[] = EntityUsage::makeAspectKey( 
EntityUsage::DESCRIPTION_USAGE );
+               }
+
+               return $aspects;
+       }
+
+       /**
         * Returns the page updates implied by the given the change.
         *
         * @param EntityChange $change
diff --git a/extensions/Wikibase/client/includes/Changes/ChangeHandler.php 
b/extensions/Wikibase/client/includes/Changes/ChangeHandler.php
index 662f575..e9c34ff 100644
--- a/extensions/Wikibase/client/includes/Changes/ChangeHandler.php
+++ b/extensions/Wikibase/client/includes/Changes/ChangeHandler.php
@@ -140,7 +140,7 @@
                        $titlesToUpdate,
                        $rootJobParams,
                        $change->getAction(),
-                       $change->hasField( 'user_id' ) ? 'uid:' . 
$change->getUserId() : 'uid:?'
+                       'uid:' . ( $change->getUserId() ?: '?' )
                );
 
                // NOTE: signature depends on change ID, effectively disabling 
deduplication
diff --git a/extensions/Wikibase/client/includes/Changes/ChangeRunCoalescer.php 
b/extensions/Wikibase/client/includes/Changes/ChangeRunCoalescer.php
index 1369684..043b782 100644
--- a/extensions/Wikibase/client/includes/Changes/ChangeRunCoalescer.php
+++ b/extensions/Wikibase/client/includes/Changes/ChangeRunCoalescer.php
@@ -173,8 +173,8 @@
                $change->setFields(
                        [
                                'revision_id' => $last->getField( 'revision_id' 
),
-                               'user_id' => $last->getField( 'user_id' ),
-                               'time' => $last->getField( 'time' ),
+                               'user_id' => $last->getUserId(),
+                               'time' => $last->getTime(),
                        ]
                );
 
diff --git 
a/extensions/Wikibase/client/tests/phpunit/includes/Changes/AffectedPagesFinderTest.php
 
b/extensions/Wikibase/client/tests/phpunit/includes/Changes/AffectedPagesFinderTest.php
index 2167b5a..7f07c52 100644
--- 
a/extensions/Wikibase/client/tests/phpunit/includes/Changes/AffectedPagesFinderTest.php
+++ 
b/extensions/Wikibase/client/tests/phpunit/includes/Changes/AffectedPagesFinderTest.php
@@ -189,6 +189,14 @@
                                $this->getItemWithSiteLinks( $q1, [ 'enwiki' => 
'1' ], $badges ) )
                ];
 
+               $cases['description only change on Q1'] = [
+                       [ EntityUsage::DESCRIPTION_USAGE . '.en' ],
+                       $changeFactory->newFromUpdate(
+                               EntityChange::UPDATE,
+                               $this->getItemWithDescriptions( $q1, [ 'en' => 
'Hello' ] ),
+                               $this->getItemWithDescriptions( $q1, [ 'en' => 
'Hallo' ] ) )
+               ];
+
                $cases['statement change on Q1'] = [
                        [ EntityUsage::OTHER_USAGE ],
                        $changeFactory->newFromUpdate(
@@ -236,6 +244,8 @@
                $q1TitleUsage = new EntityUsage( $q1, EntityUsage::TITLE_USAGE 
);
                $q2TitleUsage = new EntityUsage( $q2, EntityUsage::TITLE_USAGE 
);
 
+               $q2DescriptionUsage_en = new EntityUsage( $q2, 
EntityUsage::DESCRIPTION_USAGE, 'en' );
+
                // Page 1 is linked to Q1
                $page1Q1Usages = new PageEntityUsages( 1, [
                        $q1SitelinkUsage,
@@ -245,6 +255,7 @@
                $page2Q1Usages = new PageEntityUsages( 2, [
                        $q1LabelUsage_en,
                        $q1TitleUsage,
+                       $q2DescriptionUsage_en,
                ] );
 
                // Page 1 uses label and title to link to Q2, and shows the 
German label too.
@@ -448,6 +459,19 @@
                        )
                ];
 
+               $cases['local description change on Q2 (used by page 2)'] = [
+                       [
+                               new PageEntityUsages( 2, [ 
$q2DescriptionUsage_en ] ),
+                       ],
+                       [ EntityUsage::DESCRIPTION_USAGE . '.en' ],
+                       [ $page2Q2Usages ],
+                       $changeFactory->newFromUpdate(
+                               EntityChange::UPDATE,
+                               new Item( $q2 ),
+                               $this->getItemWithDescriptions( $q2, [ 'en' => 
'Wow' ] )
+                       )
+               ];
+
                return $cases;
        }
 
@@ -543,6 +567,21 @@
 
        /**
         * @param ItemId $id
+        * @param string[] $descriptions
+        *
+        * @return Item
+        */
+       private function getItemWithDescriptions( ItemId $id, $descriptions ) {
+               $item = new Item( $id );
+               foreach ( $descriptions as $language => $value ) {
+                       $item->setDescription( $language, $value );
+               }
+
+               return $item;
+       }
+
+       /**
+        * @param ItemId $id
         * @param string $languageCode
         * @param string[] $aliases
         *
diff --git 
a/extensions/Wikibase/client/tests/phpunit/includes/Changes/MockPageUpdater.php 
b/extensions/Wikibase/client/tests/phpunit/includes/Changes/MockPageUpdater.php
index 9224b79..99cfeac 100644
--- 
a/extensions/Wikibase/client/tests/phpunit/includes/Changes/MockPageUpdater.php
+++ 
b/extensions/Wikibase/client/tests/phpunit/includes/Changes/MockPageUpdater.php
@@ -55,7 +55,10 @@
         * @param string $causeAgent
         */
        public function scheduleRefreshLinks(
-               array $titles, array $rootJobParams = [], $causeAction, 
$causeAgent
+               array $titles,
+               array $rootJobParams = [],
+               $causeAction,
+               $causeAgent
        ) {
                foreach ( $titles as $title ) {
                        $key = $title->getPrefixedDBkey();
diff --git a/extensions/Wikibase/lib/includes/Changes/ChangeRow.php 
b/extensions/Wikibase/lib/includes/Changes/ChangeRow.php
index 970b4a8..941ac19 100644
--- a/extensions/Wikibase/lib/includes/Changes/ChangeRow.php
+++ b/extensions/Wikibase/lib/includes/Changes/ChangeRow.php
@@ -24,6 +24,7 @@
        /**
         * @see Change::getAge
         *
+        * @throws MWException if the "time" field is not set
         * @return int Seconds
         */
        public function getAge() {
@@ -33,6 +34,7 @@
        /**
         * @see Change::getTime
         *
+        * @throws MWException if the "time" field is not set
         * @return string TS_MW
         */
        public function getTime() {
@@ -45,7 +47,7 @@
         * @return int
         */
        public function getUserId() {
-               return $this->getField( 'user_id' );
+               return $this->hasField( 'user_id' ) ? $this->getField( 
'user_id' ) : 0;
        }
 
        public function __construct( array $fields = [] ) {
@@ -55,6 +57,7 @@
        /**
         * @see Change::getObjectId
         *
+        * @throws MWException if the "object_id" field is not set
         * @return string
         */
        public function getObjectId() {
@@ -64,7 +67,7 @@
        /**
         * @param string $name
         *
-        * @throws MWException
+        * @throws MWException if the requested field is not set
         * @return mixed
         */
        public function getField( $name ) {
@@ -174,6 +177,7 @@
        }
 
        /**
+        * @throws MWException if the "id" field is not set
         * @return int|null Number to be used as an identifier when persisting 
the change.
         */
        public function getId() {
diff --git a/extensions/Wikibase/lib/includes/Changes/EntityChangeFactory.php 
b/extensions/Wikibase/lib/includes/Changes/EntityChangeFactory.php
index e3e85a4..82c2aa9 100644
--- a/extensions/Wikibase/lib/includes/Changes/EntityChangeFactory.php
+++ b/extensions/Wikibase/lib/includes/Changes/EntityChangeFactory.php
@@ -11,7 +11,6 @@
 use Wikibase\DataModel\Statement\StatementListProvider;
 use Wikibase\DataModel\Term\AliasGroupList;
 use Wikibase\DataModel\Term\FingerprintProvider;
-use Wikibase\DataModel\Term\TermList;
 use Wikibase\EntityChange;
 use Wikimedia\Assert\Assert;
 
@@ -179,7 +178,6 @@
                if ( $entity instanceof FingerprintProvider ) {
                        $fingerprint = $entity->getFingerprint();
 
-                       $fingerprint->setDescriptions( new TermList() );
                        $fingerprint->setAliasGroups( new AliasGroupList() );
                }
        }
diff --git 
a/extensions/Wikibase/lib/includes/Formatters/MonolingualHtmlFormatter.php 
b/extensions/Wikibase/lib/includes/Formatters/MonolingualHtmlFormatter.php
index 90f18d4..3b87ac7 100644
--- a/extensions/Wikibase/lib/includes/Formatters/MonolingualHtmlFormatter.php
+++ b/extensions/Wikibase/lib/includes/Formatters/MonolingualHtmlFormatter.php
@@ -4,28 +4,21 @@
 
 use DataValues\MonolingualTextValue;
 use InvalidArgumentException;
-use ValueFormatters\FormatterOptions;
-use ValueFormatters\ValueFormatterBase;
+use ValueFormatters\ValueFormatter;
 use Wikibase\Lib\LanguageNameLookup;
 
 /**
  * @license GPL-2.0+
  * @author Daniel Kinzler
  */
-class MonolingualHtmlFormatter extends ValueFormatterBase {
+class MonolingualHtmlFormatter implements ValueFormatter {
 
        /**
         * @var LanguageNameLookup
         */
        private $languageNameLookup;
 
-       /**
-        * @param FormatterOptions|null $options
-        * @param LanguageNameLookup $languageNameLookup
-        */
-       public function __construct( FormatterOptions $options = null, 
LanguageNameLookup $languageNameLookup ) {
-               parent::__construct( $options );
-
+       public function __construct( LanguageNameLookup $languageNameLookup ) {
                $this->languageNameLookup = $languageNameLookup;
        }
 
diff --git 
a/extensions/Wikibase/lib/includes/Formatters/MonolingualTextFormatter.php 
b/extensions/Wikibase/lib/includes/Formatters/MonolingualTextFormatter.php
index 38cd290..a5f084c 100644
--- a/extensions/Wikibase/lib/includes/Formatters/MonolingualTextFormatter.php
+++ b/extensions/Wikibase/lib/includes/Formatters/MonolingualTextFormatter.php
@@ -4,13 +4,13 @@
 
 use DataValues\MonolingualTextValue;
 use InvalidArgumentException;
-use ValueFormatters\ValueFormatterBase;
+use ValueFormatters\ValueFormatter;
 
 /**
  * @license GPL-2.0+
  * @author Daniel Kinzler
  */
-class MonolingualTextFormatter extends ValueFormatterBase {
+class MonolingualTextFormatter implements ValueFormatter {
 
        /**
         * @see ValueFormatter::format
diff --git 
a/extensions/Wikibase/lib/includes/Formatters/WikibaseValueFormatterBuilders.php
 
b/extensions/Wikibase/lib/includes/Formatters/WikibaseValueFormatterBuilders.php
index 6a6287a..7594ade 100644
--- 
a/extensions/Wikibase/lib/includes/Formatters/WikibaseValueFormatterBuilders.php
+++ 
b/extensions/Wikibase/lib/includes/Formatters/WikibaseValueFormatterBuilders.php
@@ -385,16 +385,15 @@
 
        /**
         * @param string $format The desired target format, see 
SnakFormatter::FORMAT_XXX
-        * @param FormatterOptions $options
         *
         * @return MonolingualHtmlFormatter
         */
-       public function newMonolingualFormatter( $format, FormatterOptions 
$options ) {
+       public function newMonolingualFormatter( $format ) {
                // TODO: Add a wikitext formatter that shows the language name
                if ( $this->isHtmlFormat( $format ) ) {
-                       return new MonolingualHtmlFormatter( $options, 
$this->languageNameLookup );
+                       return new MonolingualHtmlFormatter( 
$this->languageNameLookup );
                } else {
-                       return $this->escapeValueFormatter( $format, new 
MonolingualTextFormatter( $options ) );
+                       return $this->escapeValueFormatter( $format, new 
MonolingualTextFormatter() );
                }
        }
 
diff --git 
a/extensions/Wikibase/lib/tests/phpunit/Formatters/MonolingualHtmlFormatterTest.php
 
b/extensions/Wikibase/lib/tests/phpunit/Formatters/MonolingualHtmlFormatterTest.php
index 6f1acfc..f2100bf 100644
--- 
a/extensions/Wikibase/lib/tests/phpunit/Formatters/MonolingualHtmlFormatterTest.php
+++ 
b/extensions/Wikibase/lib/tests/phpunit/Formatters/MonolingualHtmlFormatterTest.php
@@ -3,8 +3,6 @@
 namespace Wikibase\Lib\Tests\Formatters;
 
 use DataValues\MonolingualTextValue;
-use ValueFormatters\FormatterOptions;
-use ValueFormatters\ValueFormatter;
 use Wikibase\Formatters\MonolingualHtmlFormatter;
 use Wikibase\Lib\LanguageNameLookup;
 
@@ -24,13 +22,13 @@
        /**
         * @dataProvider monolingualHtmlFormatProvider
         */
-       public function testFormat( $value, $options, $pattern, $not = '' ) {
+       public function testFormat( $value, $pattern, $not = '' ) {
                $languageNameLookup = $this->getMock( LanguageNameLookup::class 
);
                $languageNameLookup->expects( $this->any() )
                        ->method( 'getName' )
                        ->will( $this->returnValue( 'Deutsch' ) );
 
-               $formatter = new MonolingualHtmlFormatter( $options, 
$languageNameLookup );
+               $formatter = new MonolingualHtmlFormatter( $languageNameLookup 
);
 
                $text = $formatter->format( $value );
 
@@ -42,18 +40,13 @@
        }
 
        public function monolingualHtmlFormatProvider() {
-               $options = new FormatterOptions();
-               $options->setOption( ValueFormatter::OPT_LANG, 'en' );
-
                return [
                        'formatting' => [
                                new MonolingualTextValue( 'de', 'Hallo Welt' ),
-                               $options,
                                '@^<span lang="de".*?>Hallo 
Welt<\/span>.*\Deutsch.*$@'
                        ],
                        'html/wikitext escaping' => [
                                new MonolingualTextValue( 'de', 
'[[Hallo&Welt]]' ),
-                               $options,
                                '@^<span 
.*?>(\[\[|&#91;&#91;)Hallo(&amp;|&#38;)Welt(\]\]|&#93;&#93;)<\/span>.*$@'
                        ],
                        'evil html' => [
@@ -62,7 +55,6 @@
                                        
'Hallo<script>alert(\'gotcha!\')</script>Welt'
                                                .'<a 
href="javascript:alert(\'gotcha!\')">evil</a>'
                                ),
-                               $options,
                                '@ onclick="alert|<script|<a @',
                                'not'
                        ],
diff --git 
a/extensions/Wikibase/lib/tests/phpunit/Formatters/MonolingualTextFormatterTest.php
 
b/extensions/Wikibase/lib/tests/phpunit/Formatters/MonolingualTextFormatterTest.php
index b469216..3bf89eb 100644
--- 
a/extensions/Wikibase/lib/tests/phpunit/Formatters/MonolingualTextFormatterTest.php
+++ 
b/extensions/Wikibase/lib/tests/phpunit/Formatters/MonolingualTextFormatterTest.php
@@ -3,7 +3,6 @@
 namespace Wikibase\Lib\Tests\Formatters;
 
 use DataValues\MonolingualTextValue;
-use ValueFormatters\FormatterOptions;
 use Wikibase\Formatters\MonolingualTextFormatter;
 
 /**
@@ -21,25 +20,21 @@
        /**
         * @dataProvider monolingualTextFormatProvider
         */
-       public function testFormat( $value, $options, $pattern ) {
-               $formatter = new MonolingualTextFormatter( $options );
+       public function testFormat( $value, $pattern ) {
+               $formatter = new MonolingualTextFormatter();
 
                $text = $formatter->format( $value );
                $this->assertRegExp( $pattern, $text );
        }
 
        public function monolingualTextFormatProvider() {
-               $options = new FormatterOptions();
-
                return [
                        [
                                new MonolingualTextValue( 'de', 'Hallo Welt' ),
-                               $options,
                                '@^Hallo Welt$@'
                        ],
                        [
                                new MonolingualTextValue( 'de', 'Hallo&Welt' ),
-                               $options,
                                '@^Hallo&Welt$@'
                        ],
                ];
diff --git a/extensions/Wikibase/repo/WikibaseRepo.datatypes.php 
b/extensions/Wikibase/repo/WikibaseRepo.datatypes.php
index 512ab05..eff1db7 100644
--- a/extensions/Wikibase/repo/WikibaseRepo.datatypes.php
+++ b/extensions/Wikibase/repo/WikibaseRepo.datatypes.php
@@ -187,7 +187,7 @@
                        },
                        'formatter-factory-callback' => function( $format, 
FormatterOptions $options ) {
                                $factory = 
WikibaseRepo::getDefaultValueFormatterBuilders();
-                               return $factory->newMonolingualFormatter( 
$format, $options );
+                               return $factory->newMonolingualFormatter( 
$format );
                        },
                        'rdf-builder-factory-callback' => function (
                                $flags,
diff --git a/extensions/Wikibase/repo/i18n/be-tarask.json 
b/extensions/Wikibase/repo/i18n/be-tarask.json
index 1b220da..3e74c90 100644
--- a/extensions/Wikibase/repo/i18n/be-tarask.json
+++ b/extensions/Wikibase/repo/i18n/be-tarask.json
@@ -119,6 +119,8 @@
        "wikibase-validator-sitelink-conflict": "Спасылка $1 ужо 
выкарыстоўваецца элемэнтам $2. Вы можаце выдаліць яе з $2, калі яна да яго не 
адносіцца, ці злучыць абодва элемэнты, калі яны адносяцца да аднае тэмы.",
        "wikibase-validator-label-conflict": "Уласьцівасьць $3 ужо мае метку 
«$1» для моўнага коду $2.",
        "wikibase-validator-label-with-description-conflict": "Элемэнт $3 ужо 
мае метку «$1», злучаны з кодам мовы $2 і мае ў апісаньні той жа тэкст.",
+       "wikibase-validator-label-no-entityid": "Метка ня мусіць супадаць зь 
дзейным ідэнтыфікатарам элемэнту.",
+       "wikibase-validator-illegal-file-chars": "Назва файлу ня можа 
ўтрыліваць такія сымбалі, як двукроп’і ці нахіленыя рыскі. Калі ласка, устаўце 
толькі назву файлу пасьля «Файл:».",
        "wikibase-wikibaserepopage-invalid-langcode": "Невядомы код мовы «$1». 
Калі ласка, выкарыстоўвайце только вядомыя сыстэме моўныя коды, як то «en».",
        "wikibase-wikibaserepopage-unresolved-redirect": "$1 зьяўляецца 
перанакіраваньнем.",
        "wikibase-wikibaserepopage-storage-exception": "Адбылася памылка пры 
спробе загрузіць $1: $2.",
diff --git a/extensions/Wikibase/repo/includes/Store/Sql/SqlChangeStore.php 
b/extensions/Wikibase/repo/includes/Store/Sql/SqlChangeStore.php
index bf5c080..f43a347 100644
--- a/extensions/Wikibase/repo/includes/Store/Sql/SqlChangeStore.php
+++ b/extensions/Wikibase/repo/includes/Store/Sql/SqlChangeStore.php
@@ -79,9 +79,9 @@
                // TODO: Avoid depending on hasField here.
                $time = $change->hasField( 'time' ) ? $change->getTime() : 
wfTimestampNow();
                $objectId = $change->hasField( 'object_id' ) ? 
$change->getObjectId() : '';
-               // TODO: Introduce dedicated getters for revision and user IDs.
+               // TODO: Introduce dedicated getter for revision ID.
                $revisionId = $change->hasField( 'revision_id' ) ? 
$change->getField( 'revision_id' ) : '0';
-               $userId = $change->hasField( 'user_id' ) ? $change->getField( 
'user_id' ) : '0';
+               $userId = $change->getUserId();
                $serializedInfo = $change->getSerializedInfo();
 
                return [
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index 300a434..0b1ea7d 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -1303,7 +1303,7 @@
         "source": {
             "type": "git",
             "url": 
"https://gerrit.wikimedia.org/r/mediawiki/extensions/Wikibase";,
-            "reference": "c05e2988bfb8a0837275258a5c63585e0902570e"
+            "reference": "0d95b4fd64880cb2ae803ce87dba0969d26f58b6"
         },
         "require": {
             "composer/installers": ">=1.0.1",
@@ -1332,7 +1332,7 @@
             "mediawiki/minus-x": "0.1.0",
             "wikibase/wikibase-codesniffer": "^0.2.0"
         },
-        "time": "2017-11-10 04:50:26",
+        "time": "2017-11-10 22:23:24",
         "type": "mediawiki-extension",
         "installation-source": "source",
         "autoload": {

-- 
To view, visit https://gerrit.wikimedia.org/r/390581
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Icef106e1fe700e01bfc4b251cbd8a984b5e33a44
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikidata
Gerrit-Branch: master
Gerrit-Owner: WikidataBuilder <[email protected]>
Gerrit-Reviewer: Addshore <[email protected]>
Gerrit-Reviewer: Aude <[email protected]>
Gerrit-Reviewer: Jonas Kress (WMDE) <[email protected]>
Gerrit-Reviewer: Ladsgroup <[email protected]>
Gerrit-Reviewer: Siebrand <[email protected]>
Gerrit-Reviewer: Tobias Gritschacher <[email protected]>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to