Hello WikidataBuilder, jenkins-bot,

I'd like you to do a code review.  Please visit

    https://gerrit.wikimedia.org/r/370325

to review the following change.


Change subject: Revert "New Wikidata Build - 2017-08-05T10:00:01+0000"
......................................................................

Revert "New Wikidata Build - 2017-08-05T10:00:01+0000"

This reverts commit e1fed35b658072bd77c1a98974bd029c4f605398.

Change-Id: I5ac0072a77245887287213031508fcec5ffea390
---
M composer.lock
M extensions/ArticlePlaceholder/includes/ItemNotabilityFilter.php
M extensions/ArticlePlaceholder/includes/SearchHookHandler.php
M extensions/ArticlePlaceholder/includes/specials/SpecialAboutTopic.php
M 
extensions/ArticlePlaceholder/tests/phpunit/includes/AboutTopicRendererTest.php
M 
extensions/ArticlePlaceholder/tests/phpunit/includes/BaseTemplateToolboxHookHandlerTest.php
M 
extensions/ArticlePlaceholder/tests/phpunit/includes/specials/SpecialAboutTopicTest.php
M extensions/Constraints/tests/phpunit/Api/CheckConstraintsTest.php
M extensions/Constraints/tests/phpunit/DelegatingConstraintCheckerTest.php
M extensions/Wikibase/.mailmap
M 
extensions/Wikibase/client/includes/DataAccess/Scribunto/Scribunto_LuaWikibaseLibrary.php
M 
extensions/Wikibase/client/tests/phpunit/includes/ChangeNotificationJobTest.php
M 
extensions/Wikibase/client/tests/phpunit/includes/DataAccess/Scribunto/Scribunto_LuaWikibaseLibraryTest.php
M 
extensions/Wikibase/client/tests/phpunit/includes/DataAccess/StatementTransclusionInteractorTest.php
M extensions/Wikibase/data-access/src/DispatchingServiceFactory.php
M extensions/Wikibase/data-access/src/RepositoryServiceContainer.php
M 
extensions/Wikibase/data-access/tests/phpunit/DispatchingServiceFactoryTest.php
M 
extensions/Wikibase/data-access/tests/phpunit/RepositoryServiceContainerTest.php
M extensions/Wikibase/lib/includes/Store/CachingEntityRevisionLookup.php
M extensions/Wikibase/lib/includes/Store/DispatchingEntityRevisionLookup.php
M extensions/Wikibase/lib/includes/Store/EntityRevision.php
M extensions/Wikibase/lib/includes/Store/EntityRevisionLookup.php
M extensions/Wikibase/lib/includes/Store/EntityStore.php
M extensions/Wikibase/lib/includes/Store/EntityStoreWatcher.php
M 
extensions/Wikibase/lib/includes/Store/Sql/PrefetchingWikiPageEntityMetaDataAccessor.php
M extensions/Wikibase/lib/includes/Store/Sql/WikiPageEntityMetaDataLookup.php
M extensions/Wikibase/lib/includes/Store/Sql/WikiPageEntityRevisionLookup.php
M extensions/Wikibase/lib/tests/phpunit/EntityRevisionLookupTest.php
M extensions/Wikibase/lib/tests/phpunit/MockRepository.php
M extensions/Wikibase/lib/tests/phpunit/MockRepositoryTest.php
M 
extensions/Wikibase/lib/tests/phpunit/Store/CachingEntityRevisionLookupTest.php
M 
extensions/Wikibase/lib/tests/phpunit/Store/DispatchingEntityRevisionLookupTest.php
M extensions/Wikibase/lib/tests/phpunit/Store/DispatchingTermBufferTest.php
M extensions/Wikibase/lib/tests/phpunit/Store/EntityRevisionTest.php
M 
extensions/Wikibase/lib/tests/phpunit/Store/PrefetchingWikiPageEntityMetaDataAccessorTest.php
M extensions/Wikibase/lib/tests/phpunit/Store/Sql/SqlEntityInfoBuilderTest.php
M extensions/Wikibase/repo/Wikibase.hooks.php
M extensions/Wikibase/repo/i18n/ca.json
M extensions/Wikibase/repo/i18n/cs.json
M extensions/Wikibase/repo/i18n/lb.json
M extensions/Wikibase/repo/includes/Api/EntityLoadingHelper.php
M extensions/Wikibase/repo/includes/Api/GetEntities.php
M extensions/Wikibase/repo/includes/Api/MergeItems.php
M extensions/Wikibase/repo/includes/Api/ResultBuilder.php
M extensions/Wikibase/repo/includes/Content/EntityContent.php
M extensions/Wikibase/repo/includes/EditEntity.php
M extensions/Wikibase/repo/includes/Hooks/OutputPageBeforeHTMLHookHandler.php
M extensions/Wikibase/repo/includes/LinkedData/EntityDataRequestHandler.php
M 
extensions/Wikibase/repo/includes/LinkedData/EntityDataSerializationService.php
M extensions/Wikibase/repo/includes/Specials/SpecialMergeItems.php
M extensions/Wikibase/repo/includes/Specials/SpecialModifyEntity.php
M extensions/Wikibase/repo/includes/Store/DispatchingEntityStoreWatcher.php
M extensions/Wikibase/repo/includes/Store/Sql/WikiPageEntityStore.php
M extensions/Wikibase/repo/tests/phpunit/includes/Actions/ActionTestCase.php
M extensions/Wikibase/repo/tests/phpunit/includes/Api/ApiFormatTestCase.php
M 
extensions/Wikibase/repo/tests/phpunit/includes/Api/EntityLoadingHelperTest.php
M extensions/Wikibase/repo/tests/phpunit/includes/Api/ResultBuilderTest.php
M 
extensions/Wikibase/repo/tests/phpunit/includes/ChangeOp/SiteLinkChangeOpFactoryTest.php
M 
extensions/Wikibase/repo/tests/phpunit/includes/Dumpers/RdfDumpGeneratorTest.php
M 
extensions/Wikibase/repo/tests/phpunit/includes/Hooks/OutputPageBeforeHTMLHookHandlerTest.php
M extensions/Wikibase/repo/tests/phpunit/includes/ItemMoveTest.php
M 
extensions/Wikibase/repo/tests/phpunit/includes/LinkedData/EntityDataSerializationServiceTest.php
M 
extensions/Wikibase/repo/tests/phpunit/includes/LinkedData/EntityDataTestProvider.php
M 
extensions/Wikibase/repo/tests/phpunit/includes/ParserOutput/PageImagesDataUpdaterTest.php
M 
extensions/Wikibase/repo/tests/phpunit/includes/PropertyDataTypeChangerTest.php
M 
extensions/Wikibase/repo/tests/phpunit/includes/Store/Sql/WikiPageEntityMetaDataLookupTest.php
M 
extensions/Wikibase/repo/tests/phpunit/includes/Store/WikiPageEntityRevisionLookupTest.php
M vendor/composer/autoload_classmap.php
M vendor/composer/autoload_static.php
M vendor/composer/installed.json
70 files changed, 111 insertions(+), 145 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikidata 
refs/changes/25/370325/1

diff --git a/composer.lock b/composer.lock
index 005575c..e272140 100644
--- a/composer.lock
+++ b/composer.lock
@@ -760,12 +760,12 @@
             "source": {
                 "type": "git",
                 "url": 
"https://github.com/wikimedia/mediawiki-extensions-ArticlePlaceholder.git";,
-                "reference": "3e9f9c473f9f6d187a2acfe1234a40e0161dd859"
+                "reference": "9fde45a4bb0c062e9004c38a34f99f1c8dcab012"
             },
             "dist": {
                 "type": "zip",
-                "url": 
"https://api.github.com/repos/wikimedia/mediawiki-extensions-ArticlePlaceholder/zipball/3e9f9c473f9f6d187a2acfe1234a40e0161dd859";,
-                "reference": "3e9f9c473f9f6d187a2acfe1234a40e0161dd859",
+                "url": 
"https://api.github.com/repos/wikimedia/mediawiki-extensions-ArticlePlaceholder/zipball/9fde45a4bb0c062e9004c38a34f99f1c8dcab012";,
+                "reference": "9fde45a4bb0c062e9004c38a34f99f1c8dcab012",
                 "shasum": ""
             },
             "require": {
@@ -794,7 +794,7 @@
             ],
             "description": "Provides a special page with Wikibase information 
about a certain topic, with invitation to create an article for the topic",
             "homepage": 
"https://www.mediawiki.org/wiki/Extension:ArticlePlaceholder";,
-            "time": "2017-08-04 11:48:54"
+            "time": "2017-08-01 20:36:04"
         },
         {
             "name": "propertysuggester/property-suggester",
@@ -970,7 +970,7 @@
             "source": {
                 "type": "git",
                 "url": 
"https://gerrit.wikimedia.org/r/mediawiki/extensions/WikibaseQualityConstraints";,
-                "reference": "41e7d847e504629836007b0dbd757fbad8a575d8"
+                "reference": "919a8f2ae55228c27042b2a76c4e47ba67997601"
             },
             "require": {
                 "php": ">=5.5.9",
@@ -1031,7 +1031,7 @@
             "support": {
                 "issues": 
"https://phabricator.wikimedia.org/project/profile/1202/";
             },
-            "time": "2017-08-04 10:55:20"
+            "time": "2017-08-03 21:23:39"
         },
         {
             "name": "wikibase/data-model",
@@ -1544,12 +1544,12 @@
             "source": {
                 "type": "git",
                 "url": 
"https://github.com/wikimedia/mediawiki-extensions-Wikibase.git";,
-                "reference": "dfc49b34843037ab9a97cbc1b16c03dbab7c50a7"
+                "reference": "dce98b4e0fe433f3219ef8d6e199b922df8c66dc"
             },
             "dist": {
                 "type": "zip",
-                "url": 
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/dfc49b34843037ab9a97cbc1b16c03dbab7c50a7";,
-                "reference": "dfc49b34843037ab9a97cbc1b16c03dbab7c50a7",
+                "url": 
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/dce98b4e0fe433f3219ef8d6e199b922df8c66dc";,
+                "reference": "dce98b4e0fe433f3219ef8d6e199b922df8c66dc",
                 "shasum": ""
             },
             "require": {
@@ -1626,7 +1626,7 @@
                 "wikibaserepo",
                 "wikidata"
             ],
-            "time": "2017-08-05 00:05:29"
+            "time": "2017-08-04 09:58:14"
         },
         {
             "name": "wikibase/wikimedia-badges",
diff --git a/extensions/ArticlePlaceholder/includes/ItemNotabilityFilter.php 
b/extensions/ArticlePlaceholder/includes/ItemNotabilityFilter.php
index d9f858b..822618a 100644
--- a/extensions/ArticlePlaceholder/includes/ItemNotabilityFilter.php
+++ b/extensions/ArticlePlaceholder/includes/ItemNotabilityFilter.php
@@ -2,11 +2,11 @@
 
 namespace ArticlePlaceholder;
 
+use Database;
+use ResultWrapper;
 use Wikibase\DataModel\Entity\ItemId;
 use Wikibase\Lib\Store\EntityNamespaceLookup;
 use Wikibase\Lib\Store\SiteLinkLookup;
-use Wikimedia\Rdbms\Database;
-use Wikimedia\Rdbms\ResultWrapper;
 use Wikimedia\Rdbms\SessionConsistentConnectionManager;
 
 /**
@@ -151,7 +151,7 @@
         *
         * @return ItemId[]
         */
-       private function getItemsWithoutArticle( array $numericItemIds ) {
+       private function getItemsWithoutArticle( $numericItemIds ) {
                $itemIds = [];
                $links = $this->siteLinkLookup->getLinks( $numericItemIds, [ 
$this->siteGlobalId ] );
 
diff --git a/extensions/ArticlePlaceholder/includes/SearchHookHandler.php 
b/extensions/ArticlePlaceholder/includes/SearchHookHandler.php
index 968ed3f..4932dab 100644
--- a/extensions/ArticlePlaceholder/includes/SearchHookHandler.php
+++ b/extensions/ArticlePlaceholder/includes/SearchHookHandler.php
@@ -2,10 +2,10 @@
 
 namespace ArticlePlaceholder;
 
-use Liuggio\StatsdClient\Factory\StatsdDataFactoryInterface;
 use OutputPage;
 use SpecialSearch;
 use SpecialPage;
+use Liuggio\StatsdClient\Factory\StatsdDataFactory;
 use MediaWiki\MediaWikiServices;
 use Wikibase\Client\WikibaseClient;
 use Wikibase\Lib\Interactors\TermSearchInteractor;
@@ -53,7 +53,7 @@
        private $itemNotabilityFilter;
 
        /**
-        * @var StatsdDataFactoryInterface
+        * @var StatsdDataFactory
         */
        private $statsdDataFactory;
 
@@ -91,7 +91,7 @@
         * @param string $repoScriptPath
         * @param string $repoUrl
         * @param ItemNotabilityFilter $itemNotabilityFilter
-        * @param StatsdDataFactoryInterface $statsdDataFactory
+        * @param StatsdDataFactory $statsdDataFactory
         */
        public function __construct(
                TermIndex $termIndex,
@@ -100,7 +100,7 @@
                $repoScriptPath,
                $repoUrl,
                ItemNotabilityFilter $itemNotabilityFilter,
-               StatsdDataFactoryInterface $statsdDataFactory
+               StatsdDataFactory $statsdDataFactory
        ) {
                $this->termIndex = $termIndex;
                $this->termSearchInteractor = $termSearchInteractor;
diff --git 
a/extensions/ArticlePlaceholder/includes/specials/SpecialAboutTopic.php 
b/extensions/ArticlePlaceholder/includes/specials/SpecialAboutTopic.php
index ded0068..a1b264e 100644
--- a/extensions/ArticlePlaceholder/includes/specials/SpecialAboutTopic.php
+++ b/extensions/ArticlePlaceholder/includes/specials/SpecialAboutTopic.php
@@ -14,7 +14,6 @@
 use Wikibase\DataModel\Services\Lookup\EntityLookup;
 use Wikibase\Lib\Store\SiteLinkLookup;
 use Wikimedia\Assert\Assert;
-use Wikimedia\Assert\ParameterTypeException;
 
 /**
  * The AboutTopic SpecialPage for the ArticlePlaceholder extension
@@ -94,8 +93,7 @@
         * @param string $siteGlobalID
         * @param EntityLookup $entityLookup
         * @param bool|string $searchEngineIndexed
-        *
-        * @throws ParameterTypeException
+        * @throws InvalidArgumentException
         */
        public function __construct(
                AboutTopicRenderer $aboutTopicRenderer,
diff --git 
a/extensions/ArticlePlaceholder/tests/phpunit/includes/AboutTopicRendererTest.php
 
b/extensions/ArticlePlaceholder/tests/phpunit/includes/AboutTopicRendererTest.php
index cb51ffb..4dd533f 100644
--- 
a/extensions/ArticlePlaceholder/tests/phpunit/includes/AboutTopicRendererTest.php
+++ 
b/extensions/ArticlePlaceholder/tests/phpunit/includes/AboutTopicRendererTest.php
@@ -42,7 +42,6 @@
 
        /**
         * @param ItemId $itemId
-        * @param TitleFactory|null $titleFactory
         *
         * @return OutputPage
         */
diff --git 
a/extensions/ArticlePlaceholder/tests/phpunit/includes/BaseTemplateToolboxHookHandlerTest.php
 
b/extensions/ArticlePlaceholder/tests/phpunit/includes/BaseTemplateToolboxHookHandlerTest.php
index 5b97348..c07792d 100644
--- 
a/extensions/ArticlePlaceholder/tests/phpunit/includes/BaseTemplateToolboxHookHandlerTest.php
+++ 
b/extensions/ArticlePlaceholder/tests/phpunit/includes/BaseTemplateToolboxHookHandlerTest.php
@@ -165,11 +165,6 @@
                );
        }
 
-       /**
-        * @param string|null $subPage
-        *
-        * @return Title
-        */
        private function getAboutTopicTitle( $subPage = null ) {
                $titleText = 'AboutTopic';
 
@@ -189,12 +184,6 @@
                return $title;
        }
 
-       /**
-        * @param Title $title
-        * @param string|null $itemIdParam
-        *
-        * @return BaseTemplate
-        */
        private function getBaseTemplate( Title $title, $itemIdParam = null ) {
                $request = $this->getMock( WebRequest::class );
                $request->expects( $this->any() )
diff --git 
a/extensions/ArticlePlaceholder/tests/phpunit/includes/specials/SpecialAboutTopicTest.php
 
b/extensions/ArticlePlaceholder/tests/phpunit/includes/specials/SpecialAboutTopicTest.php
index 8f97842..06cca06 100644
--- 
a/extensions/ArticlePlaceholder/tests/phpunit/includes/specials/SpecialAboutTopicTest.php
+++ 
b/extensions/ArticlePlaceholder/tests/phpunit/includes/specials/SpecialAboutTopicTest.php
@@ -83,7 +83,6 @@
 
        /**
         * @param string $itemIdSerialization
-        * @param bool $searchEngineIndexed
         *
         * @return OutputPage
         */
@@ -113,9 +112,6 @@
                return $instance->getOutput();
        }
 
-       /**
-        * @return SiteLinkLookup
-        */
        private function getSiteLinkLookup() {
                $siteLinkLookup = $this->getMock( SiteLinkLookup::class );
 
@@ -127,9 +123,6 @@
                return $siteLinkLookup;
        }
 
-       /**
-        * @return EntityIdParser
-        */
        private function getEntityIdParser() {
                $idParser = $this->getMock( EntityIdParser::class );
 
diff --git a/extensions/Constraints/tests/phpunit/Api/CheckConstraintsTest.php 
b/extensions/Constraints/tests/phpunit/Api/CheckConstraintsTest.php
index ac8b104..be77be6 100644
--- a/extensions/Constraints/tests/phpunit/Api/CheckConstraintsTest.php
+++ b/extensions/Constraints/tests/phpunit/Api/CheckConstraintsTest.php
@@ -188,7 +188,7 @@
                $this->assertCount( 1, $result['wbcheckconstraints'] );
                $resultsForItem = 
$result['wbcheckconstraints']['Q1']['P1']['Q1$46fc8ec9-4903-4592-9a0e-afdd1fa03183'];
                $this->assertCount( 1, $resultsForItem );
-               $this->assertEquals( CheckResult::STATUS_WARNING, 
$resultsForItem[0]['status'] );
+               $this->assertEquals( CheckResult::STATUS_VIOLATION, 
$resultsForItem[0]['status'] );
                $this->assertEquals( 'P1', $resultsForItem[0]['property'] );
        }
 
@@ -205,7 +205,7 @@
                $this->assertCount( 1, $result['wbcheckconstraints'] );
                $resultsForItem = 
$result['wbcheckconstraints']['Q1']['P1']['Q1$46fc8ec9-4903-4592-9a0e-afdd1fa03183'];
                $this->assertCount( 1, $resultsForItem );
-               $this->assertEquals( CheckResult::STATUS_WARNING, 
$resultsForItem[0]['status'] );
+               $this->assertEquals( CheckResult::STATUS_VIOLATION, 
$resultsForItem[0]['status'] );
                $this->assertEquals( 'P1', $resultsForItem[0]['property'] );
        }
 
@@ -225,7 +225,7 @@
                $this->assertCount( 1, $result['wbcheckconstraints'] );
                $resultsForItem = 
$result['wbcheckconstraints'][$itemId][$propertyId][$guid];
                $this->assertCount( 1, $resultsForItem );
-               $this->assertEquals( CheckResult::STATUS_WARNING, 
$resultsForItem[0]['status'] );
+               $this->assertEquals( CheckResult::STATUS_VIOLATION, 
$resultsForItem[0]['status'] );
                $this->assertEquals( $propertyId, 
$resultsForItem[0]['property'] );
        }
 
@@ -244,7 +244,7 @@
                        'some guid',
                        $propertyId,
                        'violationConstraint',
-                       []
+                       [ 'constraint_status' => 'mandatory' ]
                );
        }
 
diff --git 
a/extensions/Constraints/tests/phpunit/DelegatingConstraintCheckerTest.php 
b/extensions/Constraints/tests/phpunit/DelegatingConstraintCheckerTest.php
index a8780b1..c8d18f9 100644
--- a/extensions/Constraints/tests/phpunit/DelegatingConstraintCheckerTest.php
+++ b/extensions/Constraints/tests/phpunit/DelegatingConstraintCheckerTest.php
@@ -310,9 +310,6 @@
                $entity = $this->lookup->getEntity( new ItemId( 'Q1' ) );
                $result = $this->constraintChecker->checkAgainstConstraints( 
$entity );
                $this->assertEquals( 18, count( $result ), 'Every constraint 
should be represented by one result' );
-               foreach ( $result as $checkResult ) {
-                       $this->assertNotSame( 'todo', 
$checkResult->getStatus(), 'Constraints should not be unimplemented' );
-               }
        }
 
        public function testCheckAgainstConstraintsWithoutEntity() {
diff --git a/extensions/Wikibase/.mailmap b/extensions/Wikibase/.mailmap
index f5d9718..a002661 100644
--- a/extensions/Wikibase/.mailmap
+++ b/extensions/Wikibase/.mailmap
@@ -1,8 +1,6 @@
-Aleksey Bekh-Ivanov <aleksey.bekh-iva...@wikimedia.de>
 Amir Sarabadani <ladsgr...@gmail.com>
 Jonas Kress <jonas.kr...@wikimedia.de>
 Katie Filbert <katie.filb...@wikimedia.de>
 Katie Filbert <katie.filb...@wikimedia.de> <aude.w...@gmail.com>
-Leszek Manicki <leszek.mani...@wikimedia.de>
 Thiemo Mättig <thiemo.maet...@wikimedia.de>
 Thiemo Mättig <thiemo.maet...@wikimedia.de> <mr.h...@gmx.de>
diff --git 
a/extensions/Wikibase/client/includes/DataAccess/Scribunto/Scribunto_LuaWikibaseLibrary.php
 
b/extensions/Wikibase/client/includes/DataAccess/Scribunto/Scribunto_LuaWikibaseLibrary.php
index f74fbaa..29e7189 100644
--- 
a/extensions/Wikibase/client/includes/DataAccess/Scribunto/Scribunto_LuaWikibaseLibrary.php
+++ 
b/extensions/Wikibase/client/includes/DataAccess/Scribunto/Scribunto_LuaWikibaseLibrary.php
@@ -543,7 +543,7 @@
         *
         * @return array[]
         */
-       public function orderProperties( array $propertyIds ) {
+       public function orderProperties( $propertyIds ) {
                if ( $propertyIds === [] ) {
                        return [ [] ];
                }
diff --git 
a/extensions/Wikibase/client/tests/phpunit/includes/ChangeNotificationJobTest.php
 
b/extensions/Wikibase/client/tests/phpunit/includes/ChangeNotificationJobTest.php
index 815f692..220f4cb 100644
--- 
a/extensions/Wikibase/client/tests/phpunit/includes/ChangeNotificationJobTest.php
+++ 
b/extensions/Wikibase/client/tests/phpunit/includes/ChangeNotificationJobTest.php
@@ -38,7 +38,7 @@
        /**
         * @dataProvider provideToString
         */
-       public function testToString( array $changeIds, $regex ) {
+       public function testToString( $changeIds, $regex ) {
                $job = new ChangeNotificationJob(
                        Title::newMainPage(),
                        [ 'repo' => 'repo-db', 'changeIds' => $changeIds ]
diff --git 
a/extensions/Wikibase/client/tests/phpunit/includes/DataAccess/Scribunto/Scribunto_LuaWikibaseLibraryTest.php
 
b/extensions/Wikibase/client/tests/phpunit/includes/DataAccess/Scribunto/Scribunto_LuaWikibaseLibraryTest.php
index 7cfc1ff..284f277 100644
--- 
a/extensions/Wikibase/client/tests/phpunit/includes/DataAccess/Scribunto/Scribunto_LuaWikibaseLibraryTest.php
+++ 
b/extensions/Wikibase/client/tests/phpunit/includes/DataAccess/Scribunto/Scribunto_LuaWikibaseLibraryTest.php
@@ -193,7 +193,7 @@
        /**
         * @dataProvider getEntityUrlProvider
         */
-       public function testGetEntityUrl( array $expected, 
$entityIdSerialization ) {
+       public function testGetEntityUrl( $expected, $entityIdSerialization ) {
                $cacheSplit = false;
                $luaWikibaseLibrary = $this->newScribuntoLuaWikibaseLibrary( 
$cacheSplit );
                $luaWikibaseLibrary->setRepoLinker( $this->getRepoLinker() );
@@ -427,7 +427,7 @@
        /**
         * @dataProvider provideOrderProperties
         */
-       public function testOrderProperties( array $propertyIds, array 
$providedPropertyOrder, array $expected ) {
+       public function testOrderProperties( $propertyIds, 
$providedPropertyOrder, $expected ) {
                $luaWikibaseLibrary = $this->newScribuntoLuaWikibaseLibrary();
 
                $luaWikibaseLibrary->setPropertyOrderProvider(
@@ -441,7 +441,7 @@
        /**
         * @dataProvider provideGetPropertyOrder
         */
-       public function testGetPropertyOrder( array $providedPropertyOrder, 
array $expected ) {
+       public function testGetPropertyOrder( $providedPropertyOrder, $expected 
) {
                $luaWikibaseLibrary = $this->newScribuntoLuaWikibaseLibrary();
 
                $luaWikibaseLibrary->setPropertyOrderProvider(
@@ -456,7 +456,7 @@
         * @param string[] $propertyOrder
         * @return PropertyOrderProvider $propertyOrderProvider
         */
-       private function getPropertyOrderProvider( array $propertyOrder ) {
+       private function getPropertyOrderProvider( $propertyOrder ) {
                $propertyOrderProvider = $this->getMock( 
PropertyOrderProvider::class );
 
                $propertyOrderProvider->method( 'getPropertyOrder' )
diff --git 
a/extensions/Wikibase/client/tests/phpunit/includes/DataAccess/StatementTransclusionInteractorTest.php
 
b/extensions/Wikibase/client/tests/phpunit/includes/DataAccess/StatementTransclusionInteractorTest.php
index 5a1f857..c224a60 100644
--- 
a/extensions/Wikibase/client/tests/phpunit/includes/DataAccess/StatementTransclusionInteractorTest.php
+++ 
b/extensions/Wikibase/client/tests/phpunit/includes/DataAccess/StatementTransclusionInteractorTest.php
@@ -17,7 +17,7 @@
 use Wikibase\DataModel\Entity\PropertyId;
 use Wikibase\DataModel\Snak\PropertyValueSnak;
 use Wikibase\DataModel\Snak\Snak;
-use Wikibase\Lib\Store\EntityRevision;
+use Wikibase\EntityRevision;
 use Wikibase\Lib\SnakFormatter;
 use Wikibase\Lib\Store\EntityRevisionLookup;
 use Wikibase\Lib\Store\RevisionBasedEntityLookup;
diff --git a/extensions/Wikibase/data-access/src/DispatchingServiceFactory.php 
b/extensions/Wikibase/data-access/src/DispatchingServiceFactory.php
index c3ef487..fdeb6db 100644
--- a/extensions/Wikibase/data-access/src/DispatchingServiceFactory.php
+++ b/extensions/Wikibase/data-access/src/DispatchingServiceFactory.php
@@ -8,7 +8,7 @@
 use Wikibase\DataModel\Entity\EntityId;
 use Wikibase\DataModel\Entity\EntityRedirect;
 use Wikibase\DataModel\Services\Term\TermBuffer;
-use Wikibase\Lib\Store\EntityRevision;
+use Wikibase\EntityRevision;
 use Wikibase\Lib\Interactors\TermSearchInteractorFactory;
 use Wikibase\Lib\RepositoryDefinitions;
 use Wikibase\Lib\Store\EntityInfoBuilderFactory;
diff --git a/extensions/Wikibase/data-access/src/RepositoryServiceContainer.php 
b/extensions/Wikibase/data-access/src/RepositoryServiceContainer.php
index 1db0ac2..fdda01c 100644
--- a/extensions/Wikibase/data-access/src/RepositoryServiceContainer.php
+++ b/extensions/Wikibase/data-access/src/RepositoryServiceContainer.php
@@ -11,7 +11,7 @@
 use Wikibase\DataModel\Entity\EntityId;
 use Wikibase\DataModel\Entity\EntityIdParser;
 use Wikibase\DataModel\Entity\EntityRedirect;
-use Wikibase\Lib\Store\EntityRevision;
+use Wikibase\EntityRevision;
 use Wikibase\InternalSerialization\DeserializerFactory as 
InternalDeserializerFactory;
 use Wikibase\Lib\Store\EntityStoreWatcher;
 
diff --git 
a/extensions/Wikibase/data-access/tests/phpunit/DispatchingServiceFactoryTest.php
 
b/extensions/Wikibase/data-access/tests/phpunit/DispatchingServiceFactoryTest.php
index b09f95e..6ee2941 100644
--- 
a/extensions/Wikibase/data-access/tests/phpunit/DispatchingServiceFactoryTest.php
+++ 
b/extensions/Wikibase/data-access/tests/phpunit/DispatchingServiceFactoryTest.php
@@ -10,7 +10,7 @@
 use Wikibase\DataModel\Entity\Item;
 use Wikibase\DataModel\Entity\ItemId;
 use Wikibase\DataModel\Entity\Property;
-use Wikibase\Lib\Store\EntityRevision;
+use Wikibase\EntityRevision;
 use Wikibase\Lib\RepositoryDefinitions;
 
 /**
diff --git 
a/extensions/Wikibase/data-access/tests/phpunit/RepositoryServiceContainerTest.php
 
b/extensions/Wikibase/data-access/tests/phpunit/RepositoryServiceContainerTest.php
index b6f6fcb..8b9e426 100644
--- 
a/extensions/Wikibase/data-access/tests/phpunit/RepositoryServiceContainerTest.php
+++ 
b/extensions/Wikibase/data-access/tests/phpunit/RepositoryServiceContainerTest.php
@@ -12,7 +12,7 @@
 use Wikibase\DataModel\Entity\Item;
 use Wikibase\DataModel\Entity\ItemId;
 use Wikibase\DataModel\Services\EntityId\PrefixMappingEntityIdParser;
-use Wikibase\Lib\Store\EntityRevision;
+use Wikibase\EntityRevision;
 use Wikibase\Lib\DataTypeDefinitions;
 use Wikibase\Lib\EntityTypeDefinitions;
 use Wikibase\Lib\RepositoryDefinitions;
diff --git 
a/extensions/Wikibase/lib/includes/Store/CachingEntityRevisionLookup.php 
b/extensions/Wikibase/lib/includes/Store/CachingEntityRevisionLookup.php
index f7cace3..254bef0 100644
--- a/extensions/Wikibase/lib/includes/Store/CachingEntityRevisionLookup.php
+++ b/extensions/Wikibase/lib/includes/Store/CachingEntityRevisionLookup.php
@@ -5,6 +5,7 @@
 use BagOStuff;
 use Wikibase\DataModel\Entity\EntityId;
 use Wikibase\DataModel\Entity\EntityRedirect;
+use Wikibase\EntityRevision;
 use Wikimedia\Assert\Assert;
 
 /**
diff --git 
a/extensions/Wikibase/lib/includes/Store/DispatchingEntityRevisionLookup.php 
b/extensions/Wikibase/lib/includes/Store/DispatchingEntityRevisionLookup.php
index 34b98a7..6727a5f 100644
--- a/extensions/Wikibase/lib/includes/Store/DispatchingEntityRevisionLookup.php
+++ b/extensions/Wikibase/lib/includes/Store/DispatchingEntityRevisionLookup.php
@@ -4,6 +4,7 @@
 
 use Wikibase\DataModel\Assert\RepositoryNameAssert;
 use Wikibase\DataModel\Entity\EntityId;
+use Wikibase\EntityRevision;
 use Wikimedia\Assert\Assert;
 use Wikimedia\Assert\ParameterAssertionException;
 
diff --git a/extensions/Wikibase/lib/includes/Store/EntityRevision.php 
b/extensions/Wikibase/lib/includes/Store/EntityRevision.php
index fdc3950..ef0e9a0 100644
--- a/extensions/Wikibase/lib/includes/Store/EntityRevision.php
+++ b/extensions/Wikibase/lib/includes/Store/EntityRevision.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Wikibase\Lib\Store;
+namespace Wikibase;
 
 use InvalidArgumentException;
 use Wikibase\DataModel\Entity\EntityDocument;
diff --git a/extensions/Wikibase/lib/includes/Store/EntityRevisionLookup.php 
b/extensions/Wikibase/lib/includes/Store/EntityRevisionLookup.php
index 6a5278e..ed978f7 100644
--- a/extensions/Wikibase/lib/includes/Store/EntityRevisionLookup.php
+++ b/extensions/Wikibase/lib/includes/Store/EntityRevisionLookup.php
@@ -3,6 +3,7 @@
 namespace Wikibase\Lib\Store;
 
 use Wikibase\DataModel\Entity\EntityId;
+use Wikibase\EntityRevision;
 
 /**
  * Service interface for retrieving EntityRevisions from storage.
diff --git a/extensions/Wikibase/lib/includes/Store/EntityStore.php 
b/extensions/Wikibase/lib/includes/Store/EntityStore.php
index 689584a..4242420 100644
--- a/extensions/Wikibase/lib/includes/Store/EntityStore.php
+++ b/extensions/Wikibase/lib/includes/Store/EntityStore.php
@@ -8,6 +8,7 @@
 use Wikibase\DataModel\Entity\EntityDocument;
 use Wikibase\DataModel\Entity\EntityId;
 use Wikibase\DataModel\Entity\EntityRedirect;
+use Wikibase\EntityRevision;
 
 /**
  * Storage interface for Entities.
diff --git a/extensions/Wikibase/lib/includes/Store/EntityStoreWatcher.php 
b/extensions/Wikibase/lib/includes/Store/EntityStoreWatcher.php
index 64db777..49eeebf 100644
--- a/extensions/Wikibase/lib/includes/Store/EntityStoreWatcher.php
+++ b/extensions/Wikibase/lib/includes/Store/EntityStoreWatcher.php
@@ -4,6 +4,7 @@
 
 use Wikibase\DataModel\Entity\EntityId;
 use Wikibase\DataModel\Entity\EntityRedirect;
+use Wikibase\EntityRevision;
 
 /**
  * Watcher interface for watching an EntityStore.
diff --git 
a/extensions/Wikibase/lib/includes/Store/Sql/PrefetchingWikiPageEntityMetaDataAccessor.php
 
b/extensions/Wikibase/lib/includes/Store/Sql/PrefetchingWikiPageEntityMetaDataAccessor.php
index ae9c0c4..ee9d0ea 100644
--- 
a/extensions/Wikibase/lib/includes/Store/Sql/PrefetchingWikiPageEntityMetaDataAccessor.php
+++ 
b/extensions/Wikibase/lib/includes/Store/Sql/PrefetchingWikiPageEntityMetaDataAccessor.php
@@ -8,7 +8,7 @@
 use Wikibase\DataModel\Entity\EntityId;
 use Wikibase\DataModel\Entity\EntityRedirect;
 use Wikibase\DataModel\Services\Entity\EntityPrefetcher;
-use Wikibase\Lib\Store\EntityRevision;
+use Wikibase\EntityRevision;
 use Wikibase\Lib\Store\EntityRevisionLookup;
 use Wikibase\Lib\Store\EntityStoreWatcher;
 
diff --git 
a/extensions/Wikibase/lib/includes/Store/Sql/WikiPageEntityMetaDataLookup.php 
b/extensions/Wikibase/lib/includes/Store/Sql/WikiPageEntityMetaDataLookup.php
index 62017ad..8aca094 100644
--- 
a/extensions/Wikibase/lib/includes/Store/Sql/WikiPageEntityMetaDataLookup.php
+++ 
b/extensions/Wikibase/lib/includes/Store/Sql/WikiPageEntityMetaDataLookup.php
@@ -59,10 +59,12 @@
         * @throws DBQueryError
         * @throws InvalidArgumentException When some of $entityIds does not 
belong the repository of this lookup
         *
-        * @return array Array mapping entity ID serializations to either 
objects or false if an entity
-        *  could not be found.
+        * @return array Array of entity id serialization => object or false if 
entity id is not found.
         */
-       public function loadRevisionInformation( array $entityIds, $mode ) {
+       public function loadRevisionInformation(
+               array $entityIds,
+               $mode
+       ) {
                $rows = [];
 
                foreach ( $entityIds as $entityId ) {
@@ -204,8 +206,7 @@
         * @param int $connType DB_REPLICA or DB_MASTER
         *
         * @throws DBQueryError If the query fails.
-        * @return array Array mapping entity ID serializations to either 
objects or false if an entity
-        *  could not be found.
+        * @return array Array of entity id serialization => object or false 
(if not found).
         */
        private function selectRevisionInformationMultiple( array $entityIds, 
$connType ) {
                $db = $this->getConnection( $connType );
@@ -237,8 +238,8 @@
         * @param EntityId[] $entityIds
         * @param ResultWrapper $res
         *
-        * @return array Array mapping entity ID serializations to either 
objects or false if an entity
-        *  is not present in $res.
+        * @return array Array of entity id serialization => object or false if 
entity id
+        *               serialization is not present in $res.
         */
        private function indexResultByEntityId( array $entityIds, ResultWrapper 
$res ) {
                $rows = [];
diff --git 
a/extensions/Wikibase/lib/includes/Store/Sql/WikiPageEntityRevisionLookup.php 
b/extensions/Wikibase/lib/includes/Store/Sql/WikiPageEntityRevisionLookup.php
index b14f67e..7fb754f 100644
--- 
a/extensions/Wikibase/lib/includes/Store/Sql/WikiPageEntityRevisionLookup.php
+++ 
b/extensions/Wikibase/lib/includes/Store/Sql/WikiPageEntityRevisionLookup.php
@@ -12,7 +12,7 @@
 use Wikibase\Lib\Store\EntityContentDataCodec;
 use Wikibase\Lib\Store\EntityRevisionLookup;
 use Wikibase\Lib\Store\RevisionedUnresolvedRedirectException;
-use Wikibase\Lib\Store\EntityRevision;
+use Wikibase\EntityRevision;
 use Wikibase\Lib\Store\StorageException;
 use Wikimedia\Assert\Assert;
 
diff --git a/extensions/Wikibase/lib/tests/phpunit/EntityRevisionLookupTest.php 
b/extensions/Wikibase/lib/tests/phpunit/EntityRevisionLookupTest.php
index ecf2692..07eed9c 100644
--- a/extensions/Wikibase/lib/tests/phpunit/EntityRevisionLookupTest.php
+++ b/extensions/Wikibase/lib/tests/phpunit/EntityRevisionLookupTest.php
@@ -8,7 +8,7 @@
 use Wikibase\DataModel\Entity\ItemId;
 use Wikibase\DataModel\Entity\Property;
 use Wikibase\DataModel\Entity\PropertyId;
-use Wikibase\Lib\Store\EntityRevision;
+use Wikibase\EntityRevision;
 use Wikibase\Lib\Store\EntityRevisionLookup;
 use Wikibase\Lib\Store\RevisionedUnresolvedRedirectException;
 use Wikibase\Lib\Store\StorageException;
diff --git a/extensions/Wikibase/lib/tests/phpunit/MockRepository.php 
b/extensions/Wikibase/lib/tests/phpunit/MockRepository.php
index 15b338b..3522120 100644
--- a/extensions/Wikibase/lib/tests/phpunit/MockRepository.php
+++ b/extensions/Wikibase/lib/tests/phpunit/MockRepository.php
@@ -21,7 +21,7 @@
 use Wikibase\DataModel\Services\Lookup\PropertyDataTypeLookupException;
 use Wikibase\DataModel\SiteLink;
 use Wikibase\DataModel\Term\LabelsProvider;
-use Wikibase\Lib\Store\EntityRevision;
+use Wikibase\EntityRevision;
 use Wikibase\Lib\Store\EntityInfoBuilderFactory;
 use Wikibase\Lib\Store\EntityRevisionLookup;
 use Wikibase\Lib\Store\EntityStore;
diff --git a/extensions/Wikibase/lib/tests/phpunit/MockRepositoryTest.php 
b/extensions/Wikibase/lib/tests/phpunit/MockRepositoryTest.php
index 759d567..35fcc74 100644
--- a/extensions/Wikibase/lib/tests/phpunit/MockRepositoryTest.php
+++ b/extensions/Wikibase/lib/tests/phpunit/MockRepositoryTest.php
@@ -10,7 +10,7 @@
 use Wikibase\DataModel\Entity\PropertyId;
 use Wikibase\DataModel\Services\Lookup\EntityRedirectLookupException;
 use Wikibase\DataModel\SiteLink;
-use Wikibase\Lib\Store\EntityRevision;
+use Wikibase\EntityRevision;
 use Wikibase\Lib\Store\RevisionedUnresolvedRedirectException;
 use Wikibase\Lib\Store\StorageException;
 
diff --git 
a/extensions/Wikibase/lib/tests/phpunit/Store/CachingEntityRevisionLookupTest.php
 
b/extensions/Wikibase/lib/tests/phpunit/Store/CachingEntityRevisionLookupTest.php
index 93dd33f..a673007 100644
--- 
a/extensions/Wikibase/lib/tests/phpunit/Store/CachingEntityRevisionLookupTest.php
+++ 
b/extensions/Wikibase/lib/tests/phpunit/Store/CachingEntityRevisionLookupTest.php
@@ -7,7 +7,7 @@
 use Wikibase\DataModel\Entity\Item;
 use Wikibase\DataModel\Entity\ItemId;
 use Wikibase\DataModel\Services\Lookup\EntityLookup;
-use Wikibase\Lib\Store\EntityRevision;
+use Wikibase\EntityRevision;
 use Wikibase\Lib\Store\CachingEntityRevisionLookup;
 use Wikibase\Lib\Store\EntityRevisionLookup;
 use Wikibase\Lib\Store\RevisionedUnresolvedRedirectException;
diff --git 
a/extensions/Wikibase/lib/tests/phpunit/Store/DispatchingEntityRevisionLookupTest.php
 
b/extensions/Wikibase/lib/tests/phpunit/Store/DispatchingEntityRevisionLookupTest.php
index 0c8ebdb..8300e2c 100644
--- 
a/extensions/Wikibase/lib/tests/phpunit/Store/DispatchingEntityRevisionLookupTest.php
+++ 
b/extensions/Wikibase/lib/tests/phpunit/Store/DispatchingEntityRevisionLookupTest.php
@@ -4,7 +4,7 @@
 
 use Wikibase\DataModel\Entity\Item;
 use Wikibase\DataModel\Entity\ItemId;
-use Wikibase\Lib\Store\EntityRevision;
+use Wikibase\EntityRevision;
 use Wikibase\Lib\Store\DispatchingEntityRevisionLookup;
 use Wikibase\Lib\Store\EntityRevisionLookup;
 use Wikibase\Lib\Store\StorageException;
diff --git 
a/extensions/Wikibase/lib/tests/phpunit/Store/DispatchingTermBufferTest.php 
b/extensions/Wikibase/lib/tests/phpunit/Store/DispatchingTermBufferTest.php
index 6f70aa3..47f2d24 100644
--- a/extensions/Wikibase/lib/tests/phpunit/Store/DispatchingTermBufferTest.php
+++ b/extensions/Wikibase/lib/tests/phpunit/Store/DispatchingTermBufferTest.php
@@ -51,7 +51,7 @@
        /**
         * @dataProvider entityIdsFromDifferentReposProvider
         */
-       public function testPrefetchTermsGroupsEntityIdsByRepo( array $ids, 
array $callsPerRepo ) {
+       public function testPrefetchTermsGroupsEntityIdsByRepo( $ids, 
$callsPerRepo ) {
                $fooTermBuffer = $this->getMock( TermBuffer::class );
                $fooTermBuffer->expects( $this->exactly( $callsPerRepo['foo'] ) 
)
                        ->method( 'prefetchTerms' )
diff --git a/extensions/Wikibase/lib/tests/phpunit/Store/EntityRevisionTest.php 
b/extensions/Wikibase/lib/tests/phpunit/Store/EntityRevisionTest.php
index 8747ea4..6104bb4 100644
--- a/extensions/Wikibase/lib/tests/phpunit/Store/EntityRevisionTest.php
+++ b/extensions/Wikibase/lib/tests/phpunit/Store/EntityRevisionTest.php
@@ -5,10 +5,10 @@
 use InvalidArgumentException;
 use PHPUnit_Framework_TestCase;
 use Wikibase\DataModel\Entity\Item;
-use Wikibase\Lib\Store\EntityRevision;
+use Wikibase\EntityRevision;
 
 /**
- * @covers Wikibase\Lib\Store\EntityRevision
+ * @covers Wikibase\EntityRevision
  *
  * @group Wikibase
  * @group WikibaseStore
diff --git 
a/extensions/Wikibase/lib/tests/phpunit/Store/PrefetchingWikiPageEntityMetaDataAccessorTest.php
 
b/extensions/Wikibase/lib/tests/phpunit/Store/PrefetchingWikiPageEntityMetaDataAccessorTest.php
index 2059810..8927e3f 100644
--- 
a/extensions/Wikibase/lib/tests/phpunit/Store/PrefetchingWikiPageEntityMetaDataAccessorTest.php
+++ 
b/extensions/Wikibase/lib/tests/phpunit/Store/PrefetchingWikiPageEntityMetaDataAccessorTest.php
@@ -7,7 +7,7 @@
 use Wikibase\DataModel\Entity\EntityRedirect;
 use Wikibase\DataModel\Entity\Item;
 use Wikibase\DataModel\Entity\ItemId;
-use Wikibase\Lib\Store\EntityRevision;
+use Wikibase\EntityRevision;
 use Wikibase\Lib\Store\EntityRevisionLookup;
 use Wikibase\Lib\Store\Sql\PrefetchingWikiPageEntityMetaDataAccessor;
 use Wikibase\Lib\Store\Sql\WikiPageEntityMetaDataAccessor;
diff --git 
a/extensions/Wikibase/lib/tests/phpunit/Store/Sql/SqlEntityInfoBuilderTest.php 
b/extensions/Wikibase/lib/tests/phpunit/Store/Sql/SqlEntityInfoBuilderTest.php
index 03cdba7..189da42 100644
--- 
a/extensions/Wikibase/lib/tests/phpunit/Store/Sql/SqlEntityInfoBuilderTest.php
+++ 
b/extensions/Wikibase/lib/tests/phpunit/Store/Sql/SqlEntityInfoBuilderTest.php
@@ -604,7 +604,7 @@
         *
         * @return SqlEntityInfoBuilder
         */
-       private function newEntityInfoBuilderFullEntityId( array $ids ) {
+       private function newEntityInfoBuilderFullEntityId( $ids ) {
                $builder = $this->newEntityInfoBuilder( $ids );
                $builder->setReadFullEntityIdColumn( true );
 
diff --git a/extensions/Wikibase/repo/Wikibase.hooks.php 
b/extensions/Wikibase/repo/Wikibase.hooks.php
index f31a55c..00541a9 100644
--- a/extensions/Wikibase/repo/Wikibase.hooks.php
+++ b/extensions/Wikibase/repo/Wikibase.hooks.php
@@ -29,7 +29,6 @@
 use Title;
 use User;
 use Wikibase\Lib\AutoCommentFormatter;
-use Wikibase\Lib\Store\EntityRevision;
 use Wikibase\Lib\Store\Sql\EntityChangeLookup;
 use Wikibase\Repo\Content\EntityHandler;
 use Wikibase\Repo\Hooks\InfoActionHookHandler;
diff --git a/extensions/Wikibase/repo/i18n/ca.json 
b/extensions/Wikibase/repo/i18n/ca.json
index c9104fe..9672cf8 100644
--- a/extensions/Wikibase/repo/i18n/ca.json
+++ b/extensions/Wikibase/repo/i18n/ca.json
@@ -15,8 +15,7 @@
                        "Davidpar",
                        "Macofe",
                        "Joan manel",
-                       "F3RaN",
-                       "Ssola"
+                       "F3RaN"
                ]
        },
        "wikibase-desc": "Repositori de dades estructurades",
@@ -32,9 +31,9 @@
        "wikibase-addreference": "afegiu una referència",
        "wikibase-save-inprogress": "S'està desant…",
        "wikibase-remove-inprogress": "S'està suprimint…",
-       "wikibase-statementlistview-add": "afegeix valor",
+       "wikibase-statementlistview-add": "afegeix",
        "wikibase-statementlistview-add-tooltip": "Afegir un valor nou",
-       "wikibase-statementgrouplistview-add": "afegeix declaració",
+       "wikibase-statementgrouplistview-add": "afegeix",
        "wikibase-statementgrouplistview-add-tooltip": "Afegeix una declaració 
nova",
        "wikibase-entitytermsview-entitytermsforlanguagelistview-toggler": "En 
més idiomes",
        
"wikibase-entitytermsview-entitytermsforlanguagelistview-configure-link-label": 
"Configura",
@@ -54,9 +53,7 @@
        "wikibase-description-edit-placeholder-language-aware": "introduïu una 
descripció en $1",
        "wikibase-aliases-edit-placeholder": "introduïu uns àlies",
        "wikibase-aliases-edit-placeholder-language-aware": "introduïu uns 
àlies en $1",
-       "wikibase-aliases-edit-label": "Àlies, separats per barra vertical:",
        "wikibase-content-language-edit-label": "Llengua:",
-       "wikibase-content-language-edit-not-recognized-language": "El codi de 
llengua introduït no ha estat reconegut.",
        "wikibase-diffview-reference": "referència",
        "wikibase-diffview-rank": "rang",
        "wikibase-diffview-rank-preferred": "Rang preferit",
@@ -68,18 +65,15 @@
        "wikibase-diffview-description": "descripció",
        "wikibase-diffview-link": "enllaços",
        "wikibase-diffview-link-name": "nom",
-       "wikibase-diffview-link-badges": "distintius",
        "wikibase-sitelink-site-edit-placeholder": "wiki",
        "wikibase-sitelink-page-edit-placeholder": "pàgina",
        "wikibase-alias-edit-placeholder": "introduïu un àlies",
        "wikibase-label-input-help-message": "Introduïu l'etiqueta d'aquesta 
entitat en $1.",
-       "wikibase-entitytermsview-input-help-message": "Introduïu una etiqueta, 
una descripció breu i els àlies d'aquesta entitat per llengua.",
        "wikibase-statementsection-statements": "Declaracions",
        "wikibase-sitelinks": "Enllaços de llocs",
        "wikibase-sitelinks-counter": "$1{{PLURAL:$2|0=|$3+$2$4}} 
{{PLURAL:$1|entrada|entrades}}",
        "wikibase-sitelinks-empty": "Cap pàgina està enllaçada a aquest 
element.",
        "wikibase-sitelinks-special": "Altres llocs",
-       "wikibase-badgeselector-badge-placeholder-title": "Cliqueu per assignar 
un distintiu.",
        "wikibase-remove": "suprimeix",
        "wikibase-move-up": "mou amunt",
        "wikibase-move-down": "mou avall",
@@ -103,7 +97,6 @@
        "wikibase-statementview-rank-preferred": "Rang preferit",
        "wikibase-statementview-rank-normal": "Rang normal",
        "wikibase-statementview-rank-deprecated": "Rang obsolet",
-       "wikibase-statementview-rank-tooltip-deprecated": "Se sap que el valor 
és equivocat, però és o era suposat habitualment",
        "wikibase-statementview-references-counter": 
"$1{{PLURAL:$2|0=|$3+$2$4}} {{PLURAL:$1|referència|referències}}",
        "wikibase-statementview-referencesheading-pendingcountertooltip": 
"{{PLURAL:$1|Una referència no desada|$1 referències no desades}} encara",
        "wikibase-snakview-property-input-placeholder": "propietat",
@@ -121,8 +114,8 @@
        "wikibase-entityselector-more": "més",
        "wikibase-anonymouseditwarning": "Avís: no heu iniciat la sessió.\nLa 
vostra adreça IP quedarà registrada en l'historial d'edició d'aquest element.",
        "wikibase-move-error": "No podeu desplaçar pàgines d'un espai de noms 
de dades, i tampoc no podeu desplaçar-hi pàgines.",
-       "wikibase-validator-label-conflict": "La propietat $3 ja té l'etiqueta 
«$1» associada amb el codi d'idioma $2.",
-       "wikibase-validator-label-with-description-conflict": "L'element $3 ja 
té l'etiqueta «$1» associada amb el codi d'idioma $2, amb la mateixa 
descripció.",
+       "wikibase-validator-label-conflict": "Una altra propietat ($3) ja té 
l'etiqueta \"$1\" associada amb el codi d'idioma $2.",
+       "wikibase-validator-label-with-description-conflict": "Una altre 
element ($3) ja té l'etiqueta \"$1\" i la descripció \"$4\" associada amb el 
codi d'idioma $2.",
        "wikibase-validator-page-not-exists": "La pàgina «$1» no existeix.",
        "wikibase-wikibaserepopage-invalid-langcode": "El codi de llengua «$1» 
és desconegut. Utilitzeu un codi de llengua conegut en el sistema, com «ca».",
        "wikibase-wikibaserepopage-invalid-id": "L'ID «$1» és desconeguda al 
sistema. Utilitzeu un ID d'entitat vàlid.",
@@ -169,11 +162,11 @@
        "wikibase-setlabeldescriptionaliases-label-label": "Etiqueta:",
        "wikibase-setlabeldescriptionaliases-description-label": "Descripció:",
        "wikibase-setlabeldescriptionaliases-aliases-label": "Àlies:",
-       "wikibase-setsitelink-introfull": "Esteu definint l'enllaç al lloc $2 a 
[[$1]].",
+       "wikibase-setsitelink-introfull": "Esteu definint l'enllaç de lloc en 
$2 de [[$1]].",
        "wikibase-modifyentity-id": "ID:",
        "wikibase-modifyterm-language": "Codi d'idioma:",
        "wikibase-mergeitems-submit": "Fusiona els elements",
-       "wikibase-mergeitems-success": "$1 ha sigut fusionat amb $3 i 
redirigit.",
+       "wikibase-mergeitems-success": "$1 ha sigut fusionat amb èxit amb $3 i 
redirigit.",
        "special-listdatatypes": "Llista de tipus de dades disponibles",
        "wikibase-history-title-with-label": "«$2» ($1): Historial de 
revisions",
        "wikibase-listproperties-datatype": "Tipus de dades:",
diff --git a/extensions/Wikibase/repo/i18n/cs.json 
b/extensions/Wikibase/repo/i18n/cs.json
index 08d43c8..9149b30 100644
--- a/extensions/Wikibase/repo/i18n/cs.json
+++ b/extensions/Wikibase/repo/i18n/cs.json
@@ -32,9 +32,9 @@
        "wikibase-addreference": "přidat referenci",
        "wikibase-save-inprogress": "Ukládám…",
        "wikibase-remove-inprogress": "Odstraňuji…",
-       "wikibase-statementlistview-add": "přidat hodnotu",
+       "wikibase-statementlistview-add": "přidat",
        "wikibase-statementlistview-add-tooltip": "Přidat novou hodnotu",
-       "wikibase-statementgrouplistview-add": "přidat tvrzení",
+       "wikibase-statementgrouplistview-add": "přidat",
        "wikibase-statementgrouplistview-add-tooltip": "Přidat nové tvrzení",
        "wikibase-entitytermsview-entitytermsforlanguagelistview-toggler": "V 
dalších jazycích",
        
"wikibase-entitytermsview-entitytermsforlanguagelistview-configure-link-label": 
"Konfigurovat",
diff --git a/extensions/Wikibase/repo/i18n/lb.json 
b/extensions/Wikibase/repo/i18n/lb.json
index 8f185ff..ee4e444 100644
--- a/extensions/Wikibase/repo/i18n/lb.json
+++ b/extensions/Wikibase/repo/i18n/lb.json
@@ -17,9 +17,9 @@
        "wikibase-addreference": "Referenz derbäisetzen",
        "wikibase-save-inprogress": "Späicheren...",
        "wikibase-remove-inprogress": "Ewechuelen...",
-       "wikibase-statementlistview-add": "Wäert derbäisetzen",
+       "wikibase-statementlistview-add": "derbäisetzen",
        "wikibase-statementlistview-add-tooltip": "En neie Wäert derbäisetzen",
-       "wikibase-statementgrouplistview-add": "Ausso derbäisetzen",
+       "wikibase-statementgrouplistview-add": "derbäisetzen",
        "wikibase-entitytermsview-entitytermsforlanguagelistview-toggler": "A 
méi Sproochen",
        
"wikibase-entitytermsview-entitytermsforlanguagelistview-configure-link-label": 
"Astellen",
        "wikibase-entitytermsforlanguagelistview-aliases": "Och bekannt als",
diff --git a/extensions/Wikibase/repo/includes/Api/EntityLoadingHelper.php 
b/extensions/Wikibase/repo/includes/Api/EntityLoadingHelper.php
index 43b8883..0170f5f 100644
--- a/extensions/Wikibase/repo/includes/Api/EntityLoadingHelper.php
+++ b/extensions/Wikibase/repo/includes/Api/EntityLoadingHelper.php
@@ -9,7 +9,7 @@
 use Wikibase\DataModel\Entity\EntityId;
 use Wikibase\DataModel\Entity\EntityIdParser;
 use Wikibase\DataModel\Entity\EntityIdParsingException;
-use Wikibase\Lib\Store\EntityRevision;
+use Wikibase\EntityRevision;
 use Wikibase\Lib\Store\BadRevisionException;
 use Wikibase\Lib\Store\EntityRevisionLookup;
 use Wikibase\Lib\Store\SiteLinkLookup;
diff --git a/extensions/Wikibase/repo/includes/Api/GetEntities.php 
b/extensions/Wikibase/repo/includes/Api/GetEntities.php
index c89a41d..a6e5805 100644
--- a/extensions/Wikibase/repo/includes/Api/GetEntities.php
+++ b/extensions/Wikibase/repo/includes/Api/GetEntities.php
@@ -10,7 +10,7 @@
 use Wikibase\DataModel\Services\Entity\EntityPrefetcher;
 use Wikibase\DataModel\Entity\EntityIdParser;
 use Wikibase\DataModel\Entity\EntityIdParsingException;
-use Wikibase\Lib\Store\EntityRevision;
+use Wikibase\EntityRevision;
 use Wikibase\LanguageFallbackChainFactory;
 use Wikibase\Lib\Store\EntityRevisionLookup;
 use Wikibase\Lib\Store\RevisionedUnresolvedRedirectException;
diff --git a/extensions/Wikibase/repo/includes/Api/MergeItems.php 
b/extensions/Wikibase/repo/includes/Api/MergeItems.php
index 96a55b9..5b13cdb 100644
--- a/extensions/Wikibase/repo/includes/Api/MergeItems.php
+++ b/extensions/Wikibase/repo/includes/Api/MergeItems.php
@@ -12,7 +12,7 @@
 use Wikibase\DataModel\Entity\ItemId;
 use Wikibase\DataModel\Entity\EntityIdParser;
 use Wikibase\DataModel\Entity\EntityIdParsingException;
-use Wikibase\Lib\Store\EntityRevision;
+use Wikibase\EntityRevision;
 use Wikibase\Repo\Interactors\ItemMergeException;
 use Wikibase\Repo\Interactors\ItemMergeInteractor;
 use Wikibase\Repo\Interactors\RedirectCreationException;
diff --git a/extensions/Wikibase/repo/includes/Api/ResultBuilder.php 
b/extensions/Wikibase/repo/includes/Api/ResultBuilder.php
index 9f5e86e..9d1a591 100644
--- a/extensions/Wikibase/repo/includes/Api/ResultBuilder.php
+++ b/extensions/Wikibase/repo/includes/Api/ResultBuilder.php
@@ -17,7 +17,7 @@
 use Wikibase\DataModel\Statement\StatementList;
 use Wikibase\DataModel\Term\AliasGroupList;
 use Wikibase\DataModel\Term\TermList;
-use Wikibase\Lib\Store\EntityRevision;
+use Wikibase\EntityRevision;
 use Wikibase\LanguageFallbackChain;
 use Wikibase\Lib\Serialization\CallbackFactory;
 use Wikibase\Lib\Serialization\SerializationModifier;
diff --git a/extensions/Wikibase/repo/includes/Content/EntityContent.php 
b/extensions/Wikibase/repo/includes/Content/EntityContent.php
index 7464ed2..1da4204 100644
--- a/extensions/Wikibase/repo/includes/Content/EntityContent.php
+++ b/extensions/Wikibase/repo/includes/Content/EntityContent.php
@@ -27,7 +27,6 @@
 use Wikibase\DataModel\Entity\EntityId;
 use Wikibase\DataModel\Entity\EntityRedirect;
 use Wikibase\DataModel\Term\DescriptionsProvider;
-use Wikibase\Lib\Store\EntityRevision;
 use Wikibase\Repo\Content\EntityContentDiff;
 use Wikibase\Repo\Content\EntityHandler;
 use Wikibase\Repo\FingerprintSearchTextGenerator;
diff --git a/extensions/Wikibase/repo/includes/EditEntity.php 
b/extensions/Wikibase/repo/includes/EditEntity.php
index 5b1306f..2566dc7 100644
--- a/extensions/Wikibase/repo/includes/EditEntity.php
+++ b/extensions/Wikibase/repo/includes/EditEntity.php
@@ -13,7 +13,6 @@
 use Wikibase\DataModel\Entity\EntityId;
 use Wikibase\DataModel\Services\Diff\EntityDiffer;
 use Wikibase\DataModel\Services\Diff\EntityPatcher;
-use Wikibase\Lib\Store\EntityRevision;
 use Wikibase\Lib\Store\EntityRevisionLookup;
 use Wikibase\Lib\Store\EntityStore;
 use Wikibase\Repo\Store\EntityTitleStoreLookup;
diff --git 
a/extensions/Wikibase/repo/includes/Hooks/OutputPageBeforeHTMLHookHandler.php 
b/extensions/Wikibase/repo/includes/Hooks/OutputPageBeforeHTMLHookHandler.php
index 9a3b192..2060dae 100644
--- 
a/extensions/Wikibase/repo/includes/Hooks/OutputPageBeforeHTMLHookHandler.php
+++ 
b/extensions/Wikibase/repo/includes/Hooks/OutputPageBeforeHTMLHookHandler.php
@@ -7,7 +7,7 @@
 use Wikibase\DataModel\Entity\EntityDocument;
 use Wikibase\DataModel\Entity\EntityId;
 use Wikibase\EntityFactory;
-use Wikibase\Lib\Store\EntityRevision;
+use Wikibase\EntityRevision;
 use Wikibase\Lib\ContentLanguages;
 use Wikibase\Lib\LanguageNameLookup;
 use Wikibase\Lib\Store\EntityRevisionLookup;
diff --git 
a/extensions/Wikibase/repo/includes/LinkedData/EntityDataRequestHandler.php 
b/extensions/Wikibase/repo/includes/LinkedData/EntityDataRequestHandler.php
index e9b3fb5..b110eea 100644
--- a/extensions/Wikibase/repo/includes/LinkedData/EntityDataRequestHandler.php
+++ b/extensions/Wikibase/repo/includes/LinkedData/EntityDataRequestHandler.php
@@ -13,7 +13,7 @@
 use Wikibase\DataModel\Entity\EntityIdParsingException;
 use Wikibase\DataModel\Services\Lookup\EntityRedirectLookup;
 use Wikibase\DataModel\Services\Lookup\EntityRedirectLookupException;
-use Wikibase\Lib\Store\EntityRevision;
+use Wikibase\EntityRevision;
 use Wikibase\Lib\Store\BadRevisionException;
 use Wikibase\Lib\Store\EntityRevisionLookup;
 use Wikibase\Lib\Store\EntityTitleLookup;
diff --git 
a/extensions/Wikibase/repo/includes/LinkedData/EntityDataSerializationService.php
 
b/extensions/Wikibase/repo/includes/LinkedData/EntityDataSerializationService.php
index 9d1598c..8b586cd 100644
--- 
a/extensions/Wikibase/repo/includes/LinkedData/EntityDataSerializationService.php
+++ 
b/extensions/Wikibase/repo/includes/LinkedData/EntityDataSerializationService.php
@@ -18,7 +18,7 @@
 use Wikibase\DataModel\SerializerFactory;
 use Wikibase\DataModel\Services\Lookup\EntityLookup;
 use Wikibase\DataModel\Services\Lookup\PropertyDataTypeLookup;
-use Wikibase\Lib\Store\EntityRevision;
+use Wikibase\EntityRevision;
 use Wikibase\Lib\Store\EntityTitleLookup;
 use Wikibase\Rdf\EntityRdfBuilderFactory;
 use Wikibase\Rdf\ValueSnakRdfBuilderFactory;
diff --git a/extensions/Wikibase/repo/includes/Specials/SpecialMergeItems.php 
b/extensions/Wikibase/repo/includes/Specials/SpecialMergeItems.php
index 600b94a..42de862 100644
--- a/extensions/Wikibase/repo/includes/Specials/SpecialMergeItems.php
+++ b/extensions/Wikibase/repo/includes/Specials/SpecialMergeItems.php
@@ -9,7 +9,7 @@
 use Wikibase\DataModel\Entity\ItemId;
 use Wikibase\DataModel\Entity\EntityIdParser;
 use Wikibase\DataModel\Entity\EntityIdParsingException;
-use Wikibase\Lib\Store\EntityRevision;
+use Wikibase\EntityRevision;
 use Wikibase\Lib\Store\EntityTitleLookup;
 use Wikibase\Lib\Store\RevisionedUnresolvedRedirectException;
 use Wikibase\Lib\UserInputException;
diff --git a/extensions/Wikibase/repo/includes/Specials/SpecialModifyEntity.php 
b/extensions/Wikibase/repo/includes/Specials/SpecialModifyEntity.php
index 84ddce5..00a30f6 100644
--- a/extensions/Wikibase/repo/includes/Specials/SpecialModifyEntity.php
+++ b/extensions/Wikibase/repo/includes/Specials/SpecialModifyEntity.php
@@ -11,7 +11,7 @@
 use Wikibase\Repo\ChangeOp\ChangeOpValidationException;
 use Wikibase\DataModel\Entity\EntityDocument;
 use Wikibase\EditEntityFactory;
-use Wikibase\Lib\Store\EntityRevision;
+use Wikibase\EntityRevision;
 use Wikibase\Lib\MessageException;
 use Wikibase\Lib\Store\EntityTitleLookup;
 use Wikibase\Lib\Store\RevisionedUnresolvedRedirectException;
diff --git 
a/extensions/Wikibase/repo/includes/Store/DispatchingEntityStoreWatcher.php 
b/extensions/Wikibase/repo/includes/Store/DispatchingEntityStoreWatcher.php
index a542e9f..804d2cd 100644
--- a/extensions/Wikibase/repo/includes/Store/DispatchingEntityStoreWatcher.php
+++ b/extensions/Wikibase/repo/includes/Store/DispatchingEntityStoreWatcher.php
@@ -4,7 +4,7 @@
 
 use Wikibase\DataModel\Entity\EntityId;
 use Wikibase\DataModel\Entity\EntityRedirect;
-use Wikibase\Lib\Store\EntityRevision;
+use Wikibase\EntityRevision;
 use Wikibase\Lib\Store\EntityStoreWatcher;
 use Wikibase\Repo\GenericEventDispatcher;
 
diff --git 
a/extensions/Wikibase/repo/includes/Store/Sql/WikiPageEntityStore.php 
b/extensions/Wikibase/repo/includes/Store/Sql/WikiPageEntityStore.php
index 4465678..5fbd30a 100644
--- a/extensions/Wikibase/repo/includes/Store/Sql/WikiPageEntityStore.php
+++ b/extensions/Wikibase/repo/includes/Store/Sql/WikiPageEntityStore.php
@@ -13,7 +13,7 @@
 use Wikibase\DataModel\Entity\EntityId;
 use Wikibase\DataModel\Entity\EntityRedirect;
 use Wikibase\EntityContent;
-use Wikibase\Lib\Store\EntityRevision;
+use Wikibase\EntityRevision;
 use Wikibase\IdGenerator;
 use Wikibase\Lib\EntityIdComposer;
 use Wikibase\Lib\Store\EntityStore;
diff --git 
a/extensions/Wikibase/repo/tests/phpunit/includes/Actions/ActionTestCase.php 
b/extensions/Wikibase/repo/tests/phpunit/includes/Actions/ActionTestCase.php
index 19ccd39..2f205db 100644
--- a/extensions/Wikibase/repo/tests/phpunit/includes/Actions/ActionTestCase.php
+++ b/extensions/Wikibase/repo/tests/phpunit/includes/Actions/ActionTestCase.php
@@ -16,7 +16,7 @@
 use Wikibase\DataModel\Entity\EntityId;
 use Wikibase\DataModel\Entity\EntityRedirect;
 use Wikibase\DataModel\Entity\Item;
-use Wikibase\Lib\Store\EntityRevision;
+use Wikibase\EntityRevision;
 use Wikibase\ItemContent;
 use Wikibase\Repo\WikibaseRepo;
 use WikiPage;
diff --git 
a/extensions/Wikibase/repo/tests/phpunit/includes/Api/ApiFormatTestCase.php 
b/extensions/Wikibase/repo/tests/phpunit/includes/Api/ApiFormatTestCase.php
index 320279f..98cdbd7 100644
--- a/extensions/Wikibase/repo/tests/phpunit/includes/Api/ApiFormatTestCase.php
+++ b/extensions/Wikibase/repo/tests/phpunit/includes/Api/ApiFormatTestCase.php
@@ -8,7 +8,7 @@
 use Wikibase\DataModel\Entity\Property;
 use Wikibase\DataModel\Entity\PropertyId;
 use Wikibase\DataModel\Snak\PropertyNoValueSnak;
-use Wikibase\Lib\Store\EntityRevision;
+use Wikibase\EntityRevision;
 use Wikibase\Repo\WikibaseRepo;
 
 /**
diff --git 
a/extensions/Wikibase/repo/tests/phpunit/includes/Api/EntityLoadingHelperTest.php
 
b/extensions/Wikibase/repo/tests/phpunit/includes/Api/EntityLoadingHelperTest.php
index b53cdf9..a95b1bc 100644
--- 
a/extensions/Wikibase/repo/tests/phpunit/includes/Api/EntityLoadingHelperTest.php
+++ 
b/extensions/Wikibase/repo/tests/phpunit/includes/Api/EntityLoadingHelperTest.php
@@ -10,7 +10,7 @@
 use Wikibase\DataModel\Entity\EntityId;
 use Wikibase\DataModel\Entity\ItemId;
 use Wikibase\DataModel\Entity\ItemIdParser;
-use Wikibase\Lib\Store\EntityRevision;
+use Wikibase\EntityRevision;
 use Wikibase\Lib\Store\BadRevisionException;
 use Wikibase\Lib\Store\EntityRevisionLookup;
 use Wikibase\Lib\Store\SiteLinkLookup;
diff --git 
a/extensions/Wikibase/repo/tests/phpunit/includes/Api/ResultBuilderTest.php 
b/extensions/Wikibase/repo/tests/phpunit/includes/Api/ResultBuilderTest.php
index f79e7be..b7fe06a 100644
--- a/extensions/Wikibase/repo/tests/phpunit/includes/Api/ResultBuilderTest.php
+++ b/extensions/Wikibase/repo/tests/phpunit/includes/Api/ResultBuilderTest.php
@@ -28,7 +28,7 @@
 use Wikibase\DataModel\Term\AliasGroupList;
 use Wikibase\DataModel\Term\Term;
 use Wikibase\DataModel\Term\TermList;
-use Wikibase\Lib\Store\EntityRevision;
+use Wikibase\EntityRevision;
 use Wikibase\LanguageFallbackChainFactory;
 use Wikibase\Lib\Store\EntityTitleLookup;
 use Wikibase\Repo\Api\ResultBuilder;
diff --git 
a/extensions/Wikibase/repo/tests/phpunit/includes/ChangeOp/SiteLinkChangeOpFactoryTest.php
 
b/extensions/Wikibase/repo/tests/phpunit/includes/ChangeOp/SiteLinkChangeOpFactoryTest.php
index 4907a9a..b347313 100644
--- 
a/extensions/Wikibase/repo/tests/phpunit/includes/ChangeOp/SiteLinkChangeOpFactoryTest.php
+++ 
b/extensions/Wikibase/repo/tests/phpunit/includes/ChangeOp/SiteLinkChangeOpFactoryTest.php
@@ -36,10 +36,12 @@
        }
 
        /**
+        * @param string[] $allowedBadgeItemIds
+        *
         * @return SiteLinkChangeOpFactory
         */
-       private function newChangeOpFactory() {
-               return new SiteLinkChangeOpFactory( [] );
+       private function newChangeOpFactory( $allowedBadgeItemIds = [] ) {
+               return new SiteLinkChangeOpFactory( $allowedBadgeItemIds );
        }
 
        public function testNewSetSiteLinkOpReturnsChangeOpInstance() {
diff --git 
a/extensions/Wikibase/repo/tests/phpunit/includes/Dumpers/RdfDumpGeneratorTest.php
 
b/extensions/Wikibase/repo/tests/phpunit/includes/Dumpers/RdfDumpGeneratorTest.php
index 58a8114..58d8511 100644
--- 
a/extensions/Wikibase/repo/tests/phpunit/includes/Dumpers/RdfDumpGeneratorTest.php
+++ 
b/extensions/Wikibase/repo/tests/phpunit/includes/Dumpers/RdfDumpGeneratorTest.php
@@ -15,7 +15,7 @@
 use Wikibase\DataModel\Services\Entity\NullEntityPrefetcher;
 use Wikibase\DataModel\Services\Lookup\EntityLookup;
 use Wikibase\Dumpers\RdfDumpGenerator;
-use Wikibase\Lib\Store\EntityRevision;
+use Wikibase\EntityRevision;
 use Wikibase\Lib\Store\EntityRevisionLookup;
 use Wikibase\Lib\Store\EntityTitleLookup;
 use Wikibase\Lib\Store\RevisionedUnresolvedRedirectException;
diff --git 
a/extensions/Wikibase/repo/tests/phpunit/includes/Hooks/OutputPageBeforeHTMLHookHandlerTest.php
 
b/extensions/Wikibase/repo/tests/phpunit/includes/Hooks/OutputPageBeforeHTMLHookHandlerTest.php
index b113ff5..1b324a5 100644
--- 
a/extensions/Wikibase/repo/tests/phpunit/includes/Hooks/OutputPageBeforeHTMLHookHandlerTest.php
+++ 
b/extensions/Wikibase/repo/tests/phpunit/includes/Hooks/OutputPageBeforeHTMLHookHandlerTest.php
@@ -10,7 +10,7 @@
 use Wikibase\DataModel\Entity\ItemId;
 use Wikibase\DataModel\Entity\Item;
 use Wikibase\EntityFactory;
-use Wikibase\Lib\Store\EntityRevision;
+use Wikibase\EntityRevision;
 use Wikibase\Lib\LanguageNameLookup;
 use Wikibase\Lib\StaticContentLanguages;
 use Wikibase\Lib\Store\EntityRevisionLookup;
diff --git a/extensions/Wikibase/repo/tests/phpunit/includes/ItemMoveTest.php 
b/extensions/Wikibase/repo/tests/phpunit/includes/ItemMoveTest.php
index a2199cd..f101e09 100644
--- a/extensions/Wikibase/repo/tests/phpunit/includes/ItemMoveTest.php
+++ b/extensions/Wikibase/repo/tests/phpunit/includes/ItemMoveTest.php
@@ -7,7 +7,7 @@
 use Title;
 use Wikibase\DataModel\Entity\Item;
 use Wikibase\DataModel\Entity\ItemId;
-use Wikibase\Lib\Store\EntityRevision;
+use Wikibase\EntityRevision;
 use Wikibase\Repo\WikibaseRepo;
 use WikiPage;
 use WikitextContent;
diff --git 
a/extensions/Wikibase/repo/tests/phpunit/includes/LinkedData/EntityDataSerializationServiceTest.php
 
b/extensions/Wikibase/repo/tests/phpunit/includes/LinkedData/EntityDataSerializationServiceTest.php
index 2de0537..1b79054 100644
--- 
a/extensions/Wikibase/repo/tests/phpunit/includes/LinkedData/EntityDataSerializationServiceTest.php
+++ 
b/extensions/Wikibase/repo/tests/phpunit/includes/LinkedData/EntityDataSerializationServiceTest.php
@@ -16,7 +16,7 @@
 use Wikibase\DataModel\SerializerFactory;
 use Wikibase\DataModel\Services\Lookup\PropertyDataTypeLookup;
 use Wikibase\DataModel\Snak\PropertyValueSnak;
-use Wikibase\Lib\Store\EntityRevision;
+use Wikibase\EntityRevision;
 use Wikibase\Lib\Store\EntityTitleLookup;
 use Wikibase\Lib\Tests\MockRepository;
 use Wikibase\Rdf\RdfVocabulary;
diff --git 
a/extensions/Wikibase/repo/tests/phpunit/includes/LinkedData/EntityDataTestProvider.php
 
b/extensions/Wikibase/repo/tests/phpunit/includes/LinkedData/EntityDataTestProvider.php
index f335d46..18fefd7 100644
--- 
a/extensions/Wikibase/repo/tests/phpunit/includes/LinkedData/EntityDataTestProvider.php
+++ 
b/extensions/Wikibase/repo/tests/phpunit/includes/LinkedData/EntityDataTestProvider.php
@@ -5,7 +5,7 @@
 use Wikibase\DataModel\Entity\EntityRedirect;
 use Wikibase\DataModel\Entity\Item;
 use Wikibase\DataModel\Entity\ItemId;
-use Wikibase\Lib\Store\EntityRevision;
+use Wikibase\EntityRevision;
 use Wikibase\Lib\Tests\MockRepository;
 
 /**
diff --git 
a/extensions/Wikibase/repo/tests/phpunit/includes/ParserOutput/PageImagesDataUpdaterTest.php
 
b/extensions/Wikibase/repo/tests/phpunit/includes/ParserOutput/PageImagesDataUpdaterTest.php
index 1f5a206..b68a8e1 100644
--- 
a/extensions/Wikibase/repo/tests/phpunit/includes/ParserOutput/PageImagesDataUpdaterTest.php
+++ 
b/extensions/Wikibase/repo/tests/phpunit/includes/ParserOutput/PageImagesDataUpdaterTest.php
@@ -54,7 +54,7 @@
        /**
         * @dataProvider constructorArgumentsProvider
         */
-       public function testConstructor( array $propertyIds ) {
+       public function testConstructor( $propertyIds ) {
                $instance = $this->newInstance( $propertyIds );
                $this->assertInstanceOf( PageImagesDataUpdater::class, 
$instance );
        }
diff --git 
a/extensions/Wikibase/repo/tests/phpunit/includes/PropertyDataTypeChangerTest.php
 
b/extensions/Wikibase/repo/tests/phpunit/includes/PropertyDataTypeChangerTest.php
index bd5444b..2e25080 100644
--- 
a/extensions/Wikibase/repo/tests/phpunit/includes/PropertyDataTypeChangerTest.php
+++ 
b/extensions/Wikibase/repo/tests/phpunit/includes/PropertyDataTypeChangerTest.php
@@ -9,7 +9,7 @@
 use User;
 use Wikibase\DataModel\Entity\Property;
 use Wikibase\DataModel\Entity\PropertyId;
-use Wikibase\Lib\Store\EntityRevision;
+use Wikibase\EntityRevision;
 use Wikibase\Lib\Store\EntityRevisionLookup;
 use Wikibase\Lib\Store\EntityStore;
 use Wikibase\Lib\Store\StorageException;
diff --git 
a/extensions/Wikibase/repo/tests/phpunit/includes/Store/Sql/WikiPageEntityMetaDataLookupTest.php
 
b/extensions/Wikibase/repo/tests/phpunit/includes/Store/Sql/WikiPageEntityMetaDataLookupTest.php
index cbbf448..01839c4 100644
--- 
a/extensions/Wikibase/repo/tests/phpunit/includes/Store/Sql/WikiPageEntityMetaDataLookupTest.php
+++ 
b/extensions/Wikibase/repo/tests/phpunit/includes/Store/Sql/WikiPageEntityMetaDataLookupTest.php
@@ -5,10 +5,9 @@
 use InvalidArgumentException;
 use MediaWikiTestCase;
 use stdClass;
-use Wikibase\DataModel\Entity\EntityId;
 use Wikibase\DataModel\Entity\Item;
 use Wikibase\DataModel\Entity\ItemId;
-use Wikibase\Lib\Store\EntityRevision;
+use Wikibase\EntityRevision;
 use Wikibase\Lib\Store\EntityNamespaceLookup;
 use Wikibase\Lib\Store\EntityRevisionLookup;
 use Wikibase\Lib\Store\Sql\WikiPageEntityMetaDataLookup;
@@ -47,7 +46,6 @@
                                $this->data[] = $store->saveEntity( new Item(), 
'WikiPageEntityMetaDataLookupTest', $wgUser, EDIT_NEW );
                        }
 
-                       /** @var Item $entity */
                        $entity = $this->data[2]->getEntity();
                        $entity->getFingerprint()->setLabel( 'en', 'Updated' );
                        $this->data[2] = $store->saveEntity( $entity, 
'WikiPageEntityMetaDataLookupTest', $wgUser );
@@ -215,11 +213,7 @@
                $this->assertFalse( $result );
        }
 
-       /**
-        * @param EntityId[] $entityIds
-        * @param stdClass[] $result
-        */
-       private function assertRevisionInformation( array $entityIds, array 
$result ) {
+       private function assertRevisionInformation( $entityIds, $result ) {
                $serializedEntityIds = [];
                foreach ( $entityIds as $entityId ) {
                        $serializedEntityIds[] = $entityId->getSerialization();
diff --git 
a/extensions/Wikibase/repo/tests/phpunit/includes/Store/WikiPageEntityRevisionLookupTest.php
 
b/extensions/Wikibase/repo/tests/phpunit/includes/Store/WikiPageEntityRevisionLookupTest.php
index f8c6783..12395d2 100644
--- 
a/extensions/Wikibase/repo/tests/phpunit/includes/Store/WikiPageEntityRevisionLookupTest.php
+++ 
b/extensions/Wikibase/repo/tests/phpunit/includes/Store/WikiPageEntityRevisionLookupTest.php
@@ -6,7 +6,7 @@
 use Wikibase\DataModel\Entity\EntityRedirect;
 use Wikibase\DataModel\Entity\ItemId;
 use Wikibase\DataModel\Services\Lookup\EntityLookup;
-use Wikibase\Lib\Store\EntityRevision;
+use Wikibase\EntityRevision;
 use Wikibase\Lib\Store\EntityContentDataCodec;
 use Wikibase\Lib\Store\EntityNamespaceLookup;
 use Wikibase\Lib\Store\Sql\WikiPageEntityMetaDataLookup;
diff --git a/vendor/composer/autoload_classmap.php 
b/vendor/composer/autoload_classmap.php
index 22ad176..c5275e3 100644
--- a/vendor/composer/autoload_classmap.php
+++ b/vendor/composer/autoload_classmap.php
@@ -718,6 +718,7 @@
     'Wikibase\\EntityChange' => $baseDir . 
'/extensions/Wikibase/lib/includes/Changes/EntityChange.php',
     'Wikibase\\EntityContent' => $baseDir . 
'/extensions/Wikibase/repo/includes/Content/EntityContent.php',
     'Wikibase\\EntityFactory' => $baseDir . 
'/extensions/Wikibase/lib/includes/EntityFactory.php',
+    'Wikibase\\EntityRevision' => $baseDir . 
'/extensions/Wikibase/lib/includes/Store/EntityRevision.php',
     'Wikibase\\Formatters\\MonolingualHtmlFormatter' => $baseDir . 
'/extensions/Wikibase/lib/includes/Formatters/MonolingualHtmlFormatter.php',
     'Wikibase\\Formatters\\MonolingualTextFormatter' => $baseDir . 
'/extensions/Wikibase/lib/includes/Formatters/MonolingualTextFormatter.php',
     'Wikibase\\HistoryEntityAction' => $baseDir . 
'/extensions/Wikibase/repo/includes/Actions/HistoryEntityAction.php',
@@ -833,7 +834,6 @@
     'Wikibase\\Lib\\Store\\EntityInfoBuilderFactory' => $baseDir . 
'/extensions/Wikibase/lib/includes/Store/EntityInfoBuilderFactory.php',
     'Wikibase\\Lib\\Store\\EntityInfoTermLookup' => $baseDir . 
'/extensions/Wikibase/lib/includes/Store/EntityInfoTermLookup.php',
     'Wikibase\\Lib\\Store\\EntityNamespaceLookup' => $baseDir . 
'/extensions/Wikibase/lib/includes/Store/EntityNamespaceLookup.php',
-    'Wikibase\\Lib\\Store\\EntityRevision' => $baseDir . 
'/extensions/Wikibase/lib/includes/Store/EntityRevision.php',
     'Wikibase\\Lib\\Store\\EntityRevisionLookup' => $baseDir . 
'/extensions/Wikibase/lib/includes/Store/EntityRevisionLookup.php',
     'Wikibase\\Lib\\Store\\EntityStore' => $baseDir . 
'/extensions/Wikibase/lib/includes/Store/EntityStore.php',
     'Wikibase\\Lib\\Store\\EntityStoreWatcher' => $baseDir . 
'/extensions/Wikibase/lib/includes/Store/EntityStoreWatcher.php',
diff --git a/vendor/composer/autoload_static.php 
b/vendor/composer/autoload_static.php
index ef588e6..69559b8 100644
--- a/vendor/composer/autoload_static.php
+++ b/vendor/composer/autoload_static.php
@@ -1024,6 +1024,7 @@
         'Wikibase\\EntityChange' => __DIR__ . '/../..' . 
'/extensions/Wikibase/lib/includes/Changes/EntityChange.php',
         'Wikibase\\EntityContent' => __DIR__ . '/../..' . 
'/extensions/Wikibase/repo/includes/Content/EntityContent.php',
         'Wikibase\\EntityFactory' => __DIR__ . '/../..' . 
'/extensions/Wikibase/lib/includes/EntityFactory.php',
+        'Wikibase\\EntityRevision' => __DIR__ . '/../..' . 
'/extensions/Wikibase/lib/includes/Store/EntityRevision.php',
         'Wikibase\\Formatters\\MonolingualHtmlFormatter' => __DIR__ . '/../..' 
. '/extensions/Wikibase/lib/includes/Formatters/MonolingualHtmlFormatter.php',
         'Wikibase\\Formatters\\MonolingualTextFormatter' => __DIR__ . '/../..' 
. '/extensions/Wikibase/lib/includes/Formatters/MonolingualTextFormatter.php',
         'Wikibase\\HistoryEntityAction' => __DIR__ . '/../..' . 
'/extensions/Wikibase/repo/includes/Actions/HistoryEntityAction.php',
@@ -1139,7 +1140,6 @@
         'Wikibase\\Lib\\Store\\EntityInfoBuilderFactory' => __DIR__ . '/../..' 
. '/extensions/Wikibase/lib/includes/Store/EntityInfoBuilderFactory.php',
         'Wikibase\\Lib\\Store\\EntityInfoTermLookup' => __DIR__ . '/../..' . 
'/extensions/Wikibase/lib/includes/Store/EntityInfoTermLookup.php',
         'Wikibase\\Lib\\Store\\EntityNamespaceLookup' => __DIR__ . '/../..' . 
'/extensions/Wikibase/lib/includes/Store/EntityNamespaceLookup.php',
-        'Wikibase\\Lib\\Store\\EntityRevision' => __DIR__ . '/../..' . 
'/extensions/Wikibase/lib/includes/Store/EntityRevision.php',
         'Wikibase\\Lib\\Store\\EntityRevisionLookup' => __DIR__ . '/../..' . 
'/extensions/Wikibase/lib/includes/Store/EntityRevisionLookup.php',
         'Wikibase\\Lib\\Store\\EntityStore' => __DIR__ . '/../..' . 
'/extensions/Wikibase/lib/includes/Store/EntityStore.php',
         'Wikibase\\Lib\\Store\\EntityStoreWatcher' => __DIR__ . '/../..' . 
'/extensions/Wikibase/lib/includes/Store/EntityStoreWatcher.php',
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index 013243d..8b4d5f7 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -122,12 +122,12 @@
         "source": {
             "type": "git",
             "url": 
"https://github.com/wikimedia/mediawiki-extensions-ArticlePlaceholder.git";,
-            "reference": "3e9f9c473f9f6d187a2acfe1234a40e0161dd859"
+            "reference": "9fde45a4bb0c062e9004c38a34f99f1c8dcab012"
         },
         "dist": {
             "type": "zip",
-            "url": 
"https://api.github.com/repos/wikimedia/mediawiki-extensions-ArticlePlaceholder/zipball/3e9f9c473f9f6d187a2acfe1234a40e0161dd859";,
-            "reference": "3e9f9c473f9f6d187a2acfe1234a40e0161dd859",
+            "url": 
"https://api.github.com/repos/wikimedia/mediawiki-extensions-ArticlePlaceholder/zipball/9fde45a4bb0c062e9004c38a34f99f1c8dcab012";,
+            "reference": "9fde45a4bb0c062e9004c38a34f99f1c8dcab012",
             "shasum": ""
         },
         "require": {
@@ -138,7 +138,7 @@
             "jakub-onderka/php-parallel-lint": "0.9.2",
             "wikibase/wikibase-codesniffer": "^0.1.0"
         },
-        "time": "2017-08-04 11:48:54",
+        "time": "2017-08-01 20:36:04",
         "type": "mediawiki-extension",
         "installation-source": "dist",
         "autoload": {
@@ -1384,12 +1384,12 @@
         "source": {
             "type": "git",
             "url": 
"https://github.com/wikimedia/mediawiki-extensions-Wikibase.git";,
-            "reference": "dfc49b34843037ab9a97cbc1b16c03dbab7c50a7"
+            "reference": "dce98b4e0fe433f3219ef8d6e199b922df8c66dc"
         },
         "dist": {
             "type": "zip",
-            "url": 
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/dfc49b34843037ab9a97cbc1b16c03dbab7c50a7";,
-            "reference": "dfc49b34843037ab9a97cbc1b16c03dbab7c50a7",
+            "url": 
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/dce98b4e0fe433f3219ef8d6e199b922df8c66dc";,
+            "reference": "dce98b4e0fe433f3219ef8d6e199b922df8c66dc",
             "shasum": ""
         },
         "require": {
@@ -1423,7 +1423,7 @@
             "jakub-onderka/php-parallel-lint": ">=0.3 <0.10",
             "wikibase/wikibase-codesniffer": "^0.1.0"
         },
-        "time": "2017-08-05 00:05:29",
+        "time": "2017-08-04 09:58:14",
         "type": "mediawiki-extension",
         "installation-source": "dist",
         "autoload": {
@@ -1773,7 +1773,7 @@
         "source": {
             "type": "git",
             "url": 
"https://gerrit.wikimedia.org/r/mediawiki/extensions/WikibaseQualityConstraints";,
-            "reference": "41e7d847e504629836007b0dbd757fbad8a575d8"
+            "reference": "919a8f2ae55228c27042b2a76c4e47ba67997601"
         },
         "require": {
             "php": ">=5.5.9",
@@ -1789,7 +1789,7 @@
             "satooshi/php-coveralls": "master-dev",
             "wikibase/wikibase-codesniffer": "^0.1.0"
         },
-        "time": "2017-08-04 10:55:20",
+        "time": "2017-08-03 21:23:39",
         "type": "mediawiki-extension",
         "installation-source": "source",
         "autoload": {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5ac0072a77245887287213031508fcec5ffea390
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikidata
Gerrit-Branch: master
Gerrit-Owner: Aude <aude.w...@gmail.com>
Gerrit-Reviewer: WikidataBuilder <wikidata-servi...@wikimedia.de>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to