WikidataBuilder has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/372822 )

Change subject: New Wikidata Build - 2017-08-21T10:00:01+0000
......................................................................

New Wikidata Build - 2017-08-21T10:00:01+0000

Change-Id: I5a3a2da357d7704918b4a9cf7a0b73dea8a49d88
---
M composer.lock
M extensions/Constraints/i18n/en.json
M extensions/Constraints/i18n/qqq.json
M extensions/Constraints/includes/ConstraintCheck/Checker/FormatChecker.php
M 
extensions/Constraints/tests/phpunit/Checker/FormatChecker/FormatCheckerTest.php
M extensions/Constraints/tests/phpunit/ConstraintParameters.php
M extensions/Constraints/tests/phpunit/Specials/SpecialConstraintReportTest.php
M extensions/PropertySuggester/Gruntfile.js
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/WikibaseLib.php
M 
extensions/Wikibase/lib/includes/Store/Sql/PrefetchingWikiPageEntityMetaDataAccessor.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/EntityRevisionTest.php
M 
extensions/Wikibase/lib/tests/phpunit/Store/PrefetchingWikiPageEntityMetaDataAccessorTest.php
M extensions/Wikibase/repo/Wikibase.hooks.php
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/TermSqlIndexBuilder.php
M extensions/Wikibase/repo/includes/Store/Sql/WikiPageEntityStore.php
M extensions/Wikibase/repo/maintenance/rebuildTermSqlIndex.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/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/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/installed.json
52 files changed, 275 insertions(+), 190 deletions(-)


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

diff --git a/composer.lock b/composer.lock
index fbfe94c..7968ad7 100644
--- a/composer.lock
+++ b/composer.lock
@@ -805,7 +805,7 @@
             "source": {
                 "type": "git",
                 "url": 
"https://gerrit.wikimedia.org/r/mediawiki/extensions/PropertySuggester";,
-                "reference": "eed41ccdbe6ed5bb90cb2fff70ac8fdbbfbcd7a0"
+                "reference": "3843245ea59fc1c2c89a412167200558ac93c030"
             },
             "require": {
                 "php": ">=5.5.9",
@@ -856,7 +856,7 @@
                 "wikibase",
                 "wikidata"
             ],
-            "time": "2017-08-13 03:37:26"
+            "time": "2017-08-20 07:14:00"
         },
         {
             "name": "serialization/serialization",
@@ -973,7 +973,7 @@
             "source": {
                 "type": "git",
                 "url": 
"https://gerrit.wikimedia.org/r/mediawiki/extensions/WikibaseQualityConstraints";,
-                "reference": "ac1312606e118062b85976b90ab409be300dd69a"
+                "reference": "635fb201d296fbfc0c01ed0db4e8074f619a85aa"
             },
             "require": {
                 "php": ">=5.5.9",
@@ -1034,7 +1034,7 @@
             "support": {
                 "issues": 
"https://phabricator.wikimedia.org/project/profile/1202/";
             },
-            "time": "2017-08-19 21:24:49"
+            "time": "2017-08-21 09:02:20"
         },
         {
             "name": "wikibase/data-model",
@@ -1547,12 +1547,12 @@
             "source": {
                 "type": "git",
                 "url": 
"https://github.com/wikimedia/mediawiki-extensions-Wikibase.git";,
-                "reference": "343a1a85f4c5a7b0d53e4991e1fd193a3af64027"
+                "reference": "04bea4767fc9fd6bf3331d73f2602e1068a6ed10"
             },
             "dist": {
                 "type": "zip",
-                "url": 
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/343a1a85f4c5a7b0d53e4991e1fd193a3af64027";,
-                "reference": "343a1a85f4c5a7b0d53e4991e1fd193a3af64027",
+                "url": 
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/04bea4767fc9fd6bf3331d73f2602e1068a6ed10";,
+                "reference": "04bea4767fc9fd6bf3331d73f2602e1068a6ed10",
                 "shasum": ""
             },
             "require": {
@@ -1629,7 +1629,7 @@
                 "wikibaserepo",
                 "wikidata"
             ],
-            "time": "2017-08-19 23:01:53"
+            "time": "2017-08-21 08:01:38"
         },
         {
             "name": "wikibase/wikimedia-badges",
diff --git a/extensions/Constraints/i18n/en.json 
b/extensions/Constraints/i18n/en.json
index fd7a93b..1c932b2 100644
--- a/extensions/Constraints/i18n/en.json
+++ b/extensions/Constraints/i18n/en.json
@@ -96,7 +96,8 @@
        "wbqc-violation-message-diff-within-range-rightopen": "The difference 
between $3 ($4) and $1 ($2) should be no less than $5 ([$5; ∞)).",
        "wbqc-violation-message-diff-within-range-property-must-exist": "The 
property defined in the parameters must exist.",
        "wbqc-violation-message-diff-within-range-must-have-equal-types": "The 
property defined in the parameters must have a value of the same type as this 
property.",
-       "wbqc-violation-message-format": "The value for $1 ($2) should match 
the pattern $3.",
+       "wbqc-violation-message-format": "The value for $1 ($2) should match 
the regex $3.",
+       "wbqc-violation-message-format-clarification": "The value for $1 ($2) 
should match “$4” (regex: $3).",
        "wbqc-violation-message-inverse": "$1 should also have the inverse 
statement $2 $3.",
        "wbqc-violation-message-item": "An entity with $1 should also have 
{{PLURAL:$3|0=a statement $2.|1=a statement $2 $5.|a statement for $2 with one 
of the following values:$4}}",
        "wbqc-violation-message-mandatory-qualifier": "This $1 statement is 
missing a qualifier $2.",
diff --git a/extensions/Constraints/i18n/qqq.json 
b/extensions/Constraints/i18n/qqq.json
index 6617493..3d3dab8 100644
--- a/extensions/Constraints/i18n/qqq.json
+++ b/extensions/Constraints/i18n/qqq.json
@@ -92,7 +92,8 @@
        "wbqc-violation-message-diff-within-range-rightopen": "Message for a 
violation of the “Diff within range” constraint, when the difference between 
two values is larger than allowed (for a range with a lower but no upper 
limit). Parameters:\n* $1 is the first property.\n* $2 is the value of the 
first property.\n* $3 is the second property.\n* $4 is the value of the second 
property.\n* $5 is the lower bound of the range (inclusive).\nThe “first 
property” is the one referenced in the constraint, and the “second property” is 
the one that the constraint is placed on. The difference is calculated as 
“second property” − “first property” ($4 − 
$2).\n{{Related|wbqc-violation-message-diff-within-range}}",
        "wbqc-violation-message-diff-within-range-property-must-exist": 
"Message for violation of Diff within range constraint. When given property 
does not exist (any more).",
        "wbqc-violation-message-diff-within-range-must-have-equal-types": 
"Message for violation of Diff within range constraint. When this and the given 
property differ in value type.",
-       "wbqc-violation-message-format": "Message for a violation of the 
“Format” constraint, when the value of a statement does not match a certain 
pattern. Parameters:\n* $1 is the property of the statement that has the 
constraint.\n* $2 is the text value of the statement.\n* $3 is the pattern.",
+       "wbqc-violation-message-format": "Message for a violation of the 
“Format” constraint, when the value of a statement does not match a certain 
pattern (“regex” is short for “regular expression”). Parameters:\n* $1 is the 
property of the statement that has the constraint.\n* $2 is the text value of 
the statement.\n* $3 is the regex.\nThis message is only used if no syntax 
clarification for the regex has been provided; if a syntax clarification is 
available, {{msg-mw|wbqc-violation-message-format-clarification}} is used 
instead.",
+       "wbqc-violation-message-format-clarification": "Message for a violation 
of the “Format” constraint, when the value of a statement does not match a 
certain pattern (“regex” is short for “regular expression”). Parameters:\n* $1 
is the property of the statement that has the constraint.\n* $2 is the text 
value of the statement.\n* $3 is the regex.\n* $4 is a human-readable 
explanation of the regex in the user’s language or a fallback language 
(possibly English).\n{{Related|wbqc-violation-message-format}}",
        "wbqc-violation-message-inverse": "Message for a violation of the 
“Inverse” constraint, when the inverse statement of a statement does not exist. 
$1, $2 and $3 contain the expected subject entity, property, and target entity 
of the missing inverse statement.",
        "wbqc-violation-message-item": "Message for a violation of the “Item” 
constraint, when the subject entity of a statement is missing another 
statement. Parameters:\n* $1 is the property of the statement that has the 
constraint.\n* $2 is the property of the missing statement.\n* $3 is the number 
of values permitted for the missing statement (or 0, in which case the 
constraint only specifies that there should be a statement but not the values 
it should have).\n* $4 is an HTML list of all values permitted for the missing 
statement.\n* $5, $6 etc. are the individual values permitted for the missing 
statement.\n{{Related|wbqc-violation-message-target-required-claim}}",
        "wbqc-violation-message-mandatory-qualifier": "Message for a violation 
of the “Mandatory qualifier” constraint, when a mandatory qualifier is missing 
on a statement. Parameters:\n* $1 is the property of the statement.\n* $2 is 
the missing qualifier.",
diff --git 
a/extensions/Constraints/includes/ConstraintCheck/Checker/FormatChecker.php 
b/extensions/Constraints/includes/ConstraintCheck/Checker/FormatChecker.php
index d3d3de7..eedba1d 100644
--- a/extensions/Constraints/includes/ConstraintCheck/Checker/FormatChecker.php
+++ b/extensions/Constraints/includes/ConstraintCheck/Checker/FormatChecker.php
@@ -4,9 +4,11 @@
 
 use Config;
 use DataValues\StringValue;
+use Language;
 use Wikibase\DataModel\Entity\EntityDocument;
 use Wikibase\DataModel\Snak\PropertyValueSnak;
 use Wikibase\DataModel\Statement\StatementListProvider;
+use Wikibase\Repo\WikibaseRepo;
 use WikibaseQuality\ConstraintReport\Constraint;
 use WikibaseQuality\ConstraintReport\ConstraintCheck\ConstraintChecker;
 use 
WikibaseQuality\ConstraintReport\ConstraintCheck\Helper\ConstraintParameterException;
@@ -78,6 +80,14 @@
                $format = 
$this->constraintParameterParser->parseFormatParameter( $constraintParameters, 
$constraint->getConstraintTypeItemId() );
                $parameters['pattern'] = [ $format ];
 
+               $syntaxClarification = 
$this->constraintParameterParser->parseSyntaxClarificationParameter(
+                       $constraintParameters,
+                       WikibaseRepo::getDefaultInstance()->getUserLanguage() 
// TODO make this part of the Context?
+               );
+               if ( $syntaxClarification !== null ) {
+                       $parameters['clarification'] = [ $syntaxClarification ];
+               }
+
                $mainSnak = $statement->getMainSnak();
 
                if ( !$mainSnak instanceof PropertyValueSnak ) {
@@ -114,14 +124,20 @@
                                $message = '';
                                $status = CheckResult::STATUS_COMPLIANCE;
                        } else {
-                               $message = wfMessage( 
'wbqc-violation-message-format' )
-                                                ->rawParams(
-                                                       
$this->constraintParameterRenderer->formatEntityId( 
$statement->getPropertyId(), Role::CONSTRAINT_PROPERTY ),
-                                                       
$this->constraintParameterRenderer->formatDataValue( new StringValue( $text ), 
Role::OBJECT ),
-                                                       
$this->constraintParameterRenderer->formatByRole( 
Role::CONSTRAINT_PARAMETER_VALUE,
-                                                               
'<code><nowiki>' . htmlspecialchars( $format ) . '</nowiki></code>' )
-                                                )
-                                                ->escaped();
+                               $message = wfMessage(
+                                       $syntaxClarification !== null ?
+                                               
'wbqc-violation-message-format-clarification' :
+                                               'wbqc-violation-message-format'
+                               )->rawParams(
+                                       
$this->constraintParameterRenderer->formatEntityId( 
$statement->getPropertyId(), Role::CONSTRAINT_PROPERTY ),
+                                       
$this->constraintParameterRenderer->formatDataValue( new StringValue( $text ), 
Role::OBJECT ),
+                                       
$this->constraintParameterRenderer->formatByRole( 
Role::CONSTRAINT_PARAMETER_VALUE,
+                                               '<code><nowiki>' . 
htmlspecialchars( $format ) . '</nowiki></code>' )
+                               );
+                               if ( $syntaxClarification !== null ) {
+                                       $message->params( $syntaxClarification 
);
+                               }
+                               $message = $message->escaped();
                                $status = CheckResult::STATUS_VIOLATION;
                        }
                } else {
@@ -141,6 +157,14 @@
                } catch ( ConstraintParameterException $e ) {
                        $exceptions[] = $e;
                }
+               try {
+                       
$this->constraintParameterParser->parseSyntaxClarificationParameter(
+                               $constraintParameters,
+                               Language::factory( 'en' ) // errors are 
reported independent of language requested
+                       );
+               } catch ( ConstraintParameterException $e ) {
+                       $exceptions[] = $e;
+               }
                return $exceptions;
        }
 
diff --git 
a/extensions/Constraints/tests/phpunit/Checker/FormatChecker/FormatCheckerTest.php
 
b/extensions/Constraints/tests/phpunit/Checker/FormatChecker/FormatCheckerTest.php
index d729b5a..a16ac32 100644
--- 
a/extensions/Constraints/tests/phpunit/Checker/FormatChecker/FormatCheckerTest.php
+++ 
b/extensions/Constraints/tests/phpunit/Checker/FormatChecker/FormatCheckerTest.php
@@ -117,42 +117,42 @@
                        $this->getConstraintMock( $this->formatParameter( 
$pattern ) ),
                        $this->getEntity()
                );
-               $this->assertViolation( $result );
+               $this->assertViolation( $result, 
'wbqc-violation-message-format' );
 
                $result = $this->formatChecker->checkConstraint(
                        $statement6,
                        $this->getConstraintMock( $this->formatParameter( 
$pattern ) ),
                        $this->getEntity()
                );
-               $this->assertViolation( $result );
+               $this->assertViolation( $result, 
'wbqc-violation-message-format' );
 
                $result = $this->formatChecker->checkConstraint(
                        $statement7,
                        $this->getConstraintMock( $this->formatParameter( 
$pattern ) ),
                        $this->getEntity()
                );
-               $this->assertViolation( $result );
+               $this->assertViolation( $result, 
'wbqc-violation-message-format' );
 
                $result = $this->formatChecker->checkConstraint(
                        $statement8,
                        $this->getConstraintMock( $this->formatParameter( 
$pattern ) ),
                        $this->getEntity()
                );
-               $this->assertViolation( $result );
+               $this->assertViolation( $result, 
'wbqc-violation-message-format' );
 
                $result = $this->formatChecker->checkConstraint(
                        $statement9,
                        $this->getConstraintMock( $this->formatParameter( 
$pattern ) ),
                        $this->getEntity()
                );
-               $this->assertViolation( $result );
+               $this->assertViolation( $result, 
'wbqc-violation-message-format' );
 
                $result = $this->formatChecker->checkConstraint(
                        $statement10,
                        $this->getConstraintMock( $this->formatParameter( 
$pattern ) ),
                        $this->getEntity()
                );
-               $this->assertViolation( $result );
+               $this->assertViolation( $result, 
'wbqc-violation-message-format' );
        }
 
        public function testFormatConstraintTaxonName() {
@@ -220,42 +220,57 @@
                        $this->getConstraintMock( $this->formatParameter( 
$pattern ) ),
                        $this->getEntity()
                );
-               $this->assertViolation( $result );
+               $this->assertViolation( $result, 
'wbqc-violation-message-format' );
 
                $result = $this->formatChecker->checkConstraint(
                        $statement6,
                        $this->getConstraintMock( $this->formatParameter( 
$pattern ) ),
                        $this->getEntity()
                );
-               $this->assertViolation( $result );
+               $this->assertViolation( $result, 
'wbqc-violation-message-format' );
 
                $result = $this->formatChecker->checkConstraint(
                        $statement7,
                        $this->getConstraintMock( $this->formatParameter( 
$pattern ) ),
                        $this->getEntity()
                );
-               $this->assertViolation( $result );
+               $this->assertViolation( $result, 
'wbqc-violation-message-format' );
 
                $result = $this->formatChecker->checkConstraint(
                        $statement8,
                        $this->getConstraintMock( $this->formatParameter( 
$pattern ) ),
                        $this->getEntity()
                );
-               $this->assertViolation( $result );
+               $this->assertViolation( $result, 
'wbqc-violation-message-format' );
 
                $result = $this->formatChecker->checkConstraint(
                        $statement9,
                        $this->getConstraintMock( $this->formatParameter( 
$pattern ) ),
                        $this->getEntity()
                );
-               $this->assertViolation( $result );
+               $this->assertViolation( $result, 
'wbqc-violation-message-format' );
 
                $result = $this->formatChecker->checkConstraint(
                        $statement10,
                        $this->getConstraintMock( $this->formatParameter( 
$pattern ) ),
                        $this->getEntity()
                );
-               $this->assertViolation( $result );
+               $this->assertViolation( $result, 
'wbqc-violation-message-format' );
+       }
+
+       public function testFormatConstraintWithSyntaxClarification() {
+               $syntaxClarificationId = $this->getDefaultConfig()->get( 
'WBQualityConstraintsSyntaxClarificationId' );
+               $statement = NewStatement::forProperty( $syntaxClarificationId )
+                       ->withValue( '' )
+                       ->build();
+
+               $result = $this->formatChecker->checkConstraint(
+                       $statement,
+                       $this->getConstraintMock( array_merge( 
$this->formatParameter( '.+' ), $this->syntaxClarificationParameter( 'en', 
'nonempty' ) ) ),
+                       $this->getEntity()
+               );
+
+               $this->assertViolation( $result, 
'wbqc-violation-message-format-clarification' );
        }
 
        public function testFormatConstraintNoStringValue() {
diff --git a/extensions/Constraints/tests/phpunit/ConstraintParameters.php 
b/extensions/Constraints/tests/phpunit/ConstraintParameters.php
index 02dab6b..e07b9b9 100644
--- a/extensions/Constraints/tests/phpunit/ConstraintParameters.php
+++ b/extensions/Constraints/tests/phpunit/ConstraintParameters.php
@@ -3,6 +3,7 @@
 namespace WikibaseQuality\ConstraintReport\Tests;
 
 use DataValues\DataValue;
+use DataValues\MonolingualTextValue;
 use DataValues\StringValue;
 use DataValues\UnboundedQuantityValue;
 use InvalidArgumentException;
@@ -256,4 +257,16 @@
                return [ $formatId => [ $this->getSnakSerializer()->serialize( 
$snak ) ] ];
        }
 
+       /**
+        * @param string $languageCode
+        * @param string $syntaxClarification
+        * @return array
+        */
+       public function syntaxClarificationParameter( $languageCode, 
$syntaxClarification ) {
+               $syntaxClarificationId = $this->getDefaultConfig()->get( 
'WBQualityConstraintsSyntaxClarificationId' );
+               $value = new MonolingualTextValue( $languageCode, 
$syntaxClarificationId );
+               $snak = new PropertyValueSnak( new PropertyId( 
$syntaxClarificationId ), $value );
+               return [ $syntaxClarificationId => [ 
$this->getSnakSerializer()->serialize( $snak ) ] ];
+       }
+
 }
diff --git 
a/extensions/Constraints/tests/phpunit/Specials/SpecialConstraintReportTest.php 
b/extensions/Constraints/tests/phpunit/Specials/SpecialConstraintReportTest.php
index 4b793bd..f1cd809 100644
--- 
a/extensions/Constraints/tests/phpunit/Specials/SpecialConstraintReportTest.php
+++ 
b/extensions/Constraints/tests/phpunit/Specials/SpecialConstraintReportTest.php
@@ -2,16 +2,22 @@
 
 namespace 
WikibaseQuality\ConstraintReport\Tests\Specials\SpecialConstraintReport;
 
+use MediaWiki\MediaWikiServices;
 use SpecialPageTestBase;
 use Wikibase\DataModel\Services\Statement\GuidGenerator;
 use Wikibase\Repo\EntityIdLabelFormatterFactory;
 use DataValues\StringValue;
+use ValueFormatters\FormatterOptions;
 use Wikibase\DataModel\Entity\Item;
 use Wikibase\DataModel\Entity\Property;
+use Wikibase\DataModel\Services\EntityId\PlainEntityIdFormatter;
 use Wikibase\DataModel\Snak\PropertyValueSnak;
 use Wikibase\DataModel\Statement\Statement;
+use Wikibase\Lib\SnakFormatter;
 use Wikibase\Repo\WikibaseRepo;
 use Wikibase\DataModel\Entity\EntityId;
+use 
WikibaseQuality\ConstraintReport\ConstraintCheck\Helper\ConstraintParameterParser;
+use WikibaseQuality\ConstraintReport\ConstraintParameterRenderer;
 use WikibaseQuality\ConstraintReport\ConstraintReportFactory;
 use WikibaseQuality\ConstraintReport\Specials\SpecialConstraintReport;
 use WikibaseQuality\ConstraintReport\Tests\DefaultConfig;
@@ -66,8 +72,30 @@
        }
 
        protected function newSpecialPage() {
-               $constraintReportFactory = 
ConstraintReportFactory::getDefaultInstance();
+               $config = $this->getDefaultConfig();
                $wikibaseRepo = WikibaseRepo::getDefaultInstance();
+               $constraintParameterRenderer = new ConstraintParameterRenderer(
+                       new PlainEntityIdFormatter(),
+                       
$wikibaseRepo->getValueFormatterFactory()->getValueFormatter(
+                               SnakFormatter::FORMAT_HTML,
+                               new FormatterOptions()
+                       )
+               );
+               $constraintReportFactory = new ConstraintReportFactory(
+                       $wikibaseRepo->getEntityLookup(),
+                       $wikibaseRepo->getPropertyDataTypeLookup(),
+                       $wikibaseRepo->getStatementGuidParser(),
+                       $config,
+                       $constraintParameterRenderer,
+                       new ConstraintParameterParser(
+                               $config,
+                               
$wikibaseRepo->getBaseDataModelDeserializerFactory(),
+                               $constraintParameterRenderer
+                       ),
+                       $wikibaseRepo->getRdfVocabulary(),
+                       $wikibaseRepo->getEntityIdParser(),
+                       MediaWikiServices::getInstance()->getTitleParser()
+               );
 
                return new SpecialConstraintReport(
                        $wikibaseRepo->getEntityLookup(),
@@ -78,7 +106,7 @@
                        $wikibaseRepo->getEntityIdParser(),
                        $wikibaseRepo->getValueFormatterFactory(),
                        $constraintReportFactory->getConstraintChecker(),
-                       $this->getDefaultConfig()
+                       $config
                );
        }
 
@@ -126,14 +154,16 @@
                                [
                                        'constraint_guid' => '1',
                                        'pid' => self::$idMap[ 'P1' 
]->getNumericId(),
-                                       'constraint_type_qid' => 'Multi value',
-                                       'constraint_parameters' => 
'{"constraint_status":"mandatory"}'
+                                       'constraint_type_qid' =>
+                                               $this->getDefaultConfig()->get( 
'WBQualityConstraintsMultiValueConstraintId' ),
+                                       'constraint_parameters' => '{}'
                                ],
                                [
                                        'constraint_guid' => '3',
                                        'pid' => self::$idMap[ 'P1' 
]->getNumericId(),
-                                       'constraint_type_qid' => 'Single value',
-                                       'constraint_parameters' => 
'{"constraint_status":"mandatory"}'
+                                       'constraint_type_qid' =>
+                                               $this->getDefaultConfig()->get( 
'WBQualityConstraintsSingleValueConstraintId' ),
+                                       'constraint_parameters' => '{}'
                                ]
                        ]
                );
@@ -255,10 +285,10 @@
                        havingTextContents( 
'(wbqc-constraintreport-result-table-header-constraint)' )
                );
 
-               $matchers['value status - violation'] = both(
-                       tagMatchingOutline( '<span class="wbqc-status 
wbqc-status-violation"/>' )
+               $matchers['value status - warning'] = both(
+                       tagMatchingOutline( '<span class="wbqc-status 
wbqc-status-warning"/>' )
                )->andAlso(
-                       havingTextContents( 
'(wbqc-constraintreport-status-violation)' )
+                       havingTextContents( 
'(wbqc-constraintreport-status-warning)' )
                );
 
                $matchers['value status - compliance'] = both(
diff --git a/extensions/PropertySuggester/Gruntfile.js 
b/extensions/PropertySuggester/Gruntfile.js
index 1d561f5..81096e6 100644
--- a/extensions/PropertySuggester/Gruntfile.js
+++ b/extensions/PropertySuggester/Gruntfile.js
@@ -11,8 +11,8 @@
                jsonlint: {
                        all: [
                                '**/*.json',
-                               '.stylelintrc',
-                               '!node_modules/**'
+                               '!node_modules/**',
+                               '!vendor/**'
                        ]
                },
                banana: {
diff --git 
a/extensions/Wikibase/client/tests/phpunit/includes/DataAccess/StatementTransclusionInteractorTest.php
 
b/extensions/Wikibase/client/tests/phpunit/includes/DataAccess/StatementTransclusionInteractorTest.php
index dc5b87a..8b1349d 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 as TheEntityRevision;
+use Wikibase\Lib\Store\EntityRevision;
 use Wikibase\Lib\SnakFormatter;
 use Wikibase\Lib\Store\EntityRevisionLookup;
 use Wikibase\Lib\Store\RevisionBasedEntityLookup;
@@ -231,7 +231,7 @@
                        ->will( $this->returnCallback( function( EntityId 
$entityId ) {
                                switch ( $entityId->getSerialization() ) {
                                        case 'Q42':
-                                               return new TheEntityRevision( 
new Item( new ItemId( 'Q42' ) ) );
+                                               return new EntityRevision( new 
Item( new ItemId( 'Q42' ) ) );
                                        case 'Q43':
                                                throw new 
RevisionedUnresolvedRedirectException(
                                                        $entityId,
diff --git a/extensions/Wikibase/data-access/src/DispatchingServiceFactory.php 
b/extensions/Wikibase/data-access/src/DispatchingServiceFactory.php
index 825ac17..c3ef487 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 as TheEntityRevision;
+use Wikibase\Lib\Store\EntityRevision;
 use Wikibase\Lib\Interactors\TermSearchInteractorFactory;
 use Wikibase\Lib\RepositoryDefinitions;
 use Wikibase\Lib\Store\EntityInfoBuilderFactory;
@@ -88,9 +88,9 @@
        /**
         * @see EntityStoreWatcher::entityUpdated
         *
-        * @param TheEntityRevision $entityRevision
+        * @param EntityRevision $entityRevision
         */
-       public function entityUpdated( TheEntityRevision $entityRevision ) {
+       public function entityUpdated( EntityRevision $entityRevision ) {
                $container = $this->getContainerForRepository(
                        
$entityRevision->getEntity()->getId()->getRepositoryName()
                );
diff --git a/extensions/Wikibase/data-access/src/RepositoryServiceContainer.php 
b/extensions/Wikibase/data-access/src/RepositoryServiceContainer.php
index 6ea872b..1db0ac2 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 as TheEntityRevision;
+use Wikibase\Lib\Store\EntityRevision;
 use Wikibase\InternalSerialization\DeserializerFactory as 
InternalDeserializerFactory;
 use Wikibase\Lib\Store\EntityStoreWatcher;
 
@@ -128,9 +128,9 @@
        /**
         * @see EntityStoreWatcher::entityUpdated
         *
-        * @param TheEntityRevision $entityRevision
+        * @param EntityRevision $entityRevision
         */
-       public function entityUpdated( TheEntityRevision $entityRevision ) {
+       public function entityUpdated( EntityRevision $entityRevision ) {
                foreach ( $this->getServiceNames() as $serviceName ) {
                        $service = $this->peekService( $serviceName );
                        if ( $service instanceof EntityStoreWatcher ) {
diff --git 
a/extensions/Wikibase/data-access/tests/phpunit/DispatchingServiceFactoryTest.php
 
b/extensions/Wikibase/data-access/tests/phpunit/DispatchingServiceFactoryTest.php
index c9c144f..b09f95e 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 as TheEntityRevision;
+use Wikibase\Lib\Store\EntityRevision;
 use Wikibase\Lib\RepositoryDefinitions;
 
 /**
@@ -116,10 +116,10 @@
                        )
                );
 
-               $factory->entityUpdated( new TheEntityRevision( new Item( new 
ItemId( 'foo:Q123' ) ) ) );
+               $factory->entityUpdated( new EntityRevision( new Item( new 
ItemId( 'foo:Q123' ) ) ) );
 
                $fooContainer->entityUpdated(
-                       new TheEntityRevision( new Item( new ItemId( 'foo:Q123' 
) ) )
+                       new EntityRevision( new Item( new ItemId( 'foo:Q123' ) 
) )
                )->shouldHaveBeenCalled();
                $localContainer->entityUpdated( Argument::any() 
)->shouldNotHaveBeenCalled();
        }
diff --git 
a/extensions/Wikibase/data-access/tests/phpunit/RepositoryServiceContainerTest.php
 
b/extensions/Wikibase/data-access/tests/phpunit/RepositoryServiceContainerTest.php
index d74086f..b6f6fcb 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 as TheEntityRevision;
+use Wikibase\Lib\Store\EntityRevision;
 use Wikibase\Lib\DataTypeDefinitions;
 use Wikibase\Lib\EntityTypeDefinitions;
 use Wikibase\Lib\RepositoryDefinitions;
@@ -158,7 +158,7 @@
        public function 
testEntityUpdatedDelegatesEventToAllWatchersThatHaveAlreadyBeenUsed() {
                $container = $this->getRepositoryServiceContainerForEventTest( 
'entityUpdated' );
 
-               $container->entityUpdated( new TheEntityRevision( new Item( new 
ItemId( 'foo:Q123' ) ) ) );
+               $container->entityUpdated( new EntityRevision( new Item( new 
ItemId( 'foo:Q123' ) ) ) );
        }
 
        public function 
testEntityDeletedDelegatesEventToAllWatchersThatHaveAlreadyBeenUsed() {
diff --git a/extensions/Wikibase/lib/WikibaseLib.php 
b/extensions/Wikibase/lib/WikibaseLib.php
index 02fff5e..8f7681a 100644
--- a/extensions/Wikibase/lib/WikibaseLib.php
+++ b/extensions/Wikibase/lib/WikibaseLib.php
@@ -22,8 +22,6 @@
  * and join the open data revolution.              <>
  */
 
-use Wikibase\Lib\Store\EntityRevision;
-
 /**
  * Entry point for the WikibaseLib extension.
  *
@@ -53,9 +51,6 @@
 if ( is_readable( __DIR__ . '/../vendor/autoload.php' ) ) {
        require_once __DIR__ . '/../vendor/autoload.php';
 }
-
-// Remove once the cache used by CachingEntityRevisionLookup has expired, see: 
T172616
-class_alias( EntityRevision::class, 'Wikibase\EntityRevision' );
 
 call_user_func( function() {
        global $wgExtensionCredits, $wgHooks, $wgResourceModules, 
$wgMessagesDirs;
diff --git 
a/extensions/Wikibase/lib/includes/Store/Sql/PrefetchingWikiPageEntityMetaDataAccessor.php
 
b/extensions/Wikibase/lib/includes/Store/Sql/PrefetchingWikiPageEntityMetaDataAccessor.php
index 456d491..ae9c0c4 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 as TheEntityRevision;
+use Wikibase\Lib\Store\EntityRevision;
 use Wikibase\Lib\Store\EntityRevisionLookup;
 use Wikibase\Lib\Store\EntityStoreWatcher;
 
@@ -116,9 +116,9 @@
        /**
         * @see EntityStoreWatcher::entityDeleted
         *
-        * @param TheEntityRevision $entityRevision
+        * @param EntityRevision $entityRevision
         */
-       public function entityUpdated( TheEntityRevision $entityRevision ) {
+       public function entityUpdated( EntityRevision $entityRevision ) {
                $this->purge( $entityRevision->getEntity()->getId() );
        }
 
diff --git 
a/extensions/Wikibase/lib/includes/Store/Sql/WikiPageEntityRevisionLookup.php 
b/extensions/Wikibase/lib/includes/Store/Sql/WikiPageEntityRevisionLookup.php
index 928f6d4..b14f67e 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 as TheEntityRevision;
+use Wikibase\Lib\Store\EntityRevision;
 use Wikibase\Lib\Store\StorageException;
 use Wikimedia\Assert\Assert;
 
@@ -63,7 +63,7 @@
         *
         * @throws RevisionedUnresolvedRedirectException
         * @throws StorageException
-        * @return TheEntityRevision|null
+        * @return EntityRevision|null
         */
        public function getEntityRevision(
                EntityId $entityId,
@@ -76,7 +76,7 @@
                wfDebugLog( __CLASS__, __FUNCTION__ . ': Looking up entity ' . 
$entityId
                        . " (revision $revisionId)." );
 
-               /** @var TheEntityRevision $entityRevision */
+               /** @var EntityRevision $entityRevision */
                $entityRevision = null;
 
                if ( $revisionId > 0 ) {
@@ -163,7 +163,7 @@
                $entity = $this->contentCodec->decodeEntity( $blob, 
$row->rev_content_format );
 
                if ( $entity ) {
-                       $entityRevision = new TheEntityRevision( $entity, 
(int)$row->rev_id, $row->rev_timestamp );
+                       $entityRevision = new EntityRevision( $entity, 
(int)$row->rev_id, $row->rev_timestamp );
 
                        $result = [ $entityRevision, null ];
                } else {
diff --git a/extensions/Wikibase/lib/tests/phpunit/EntityRevisionLookupTest.php 
b/extensions/Wikibase/lib/tests/phpunit/EntityRevisionLookupTest.php
index 253abc8..ecf2692 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 as TheEntityRevision;
+use Wikibase\Lib\Store\EntityRevision;
 use Wikibase\Lib\Store\EntityRevisionLookup;
 use Wikibase\Lib\Store\RevisionedUnresolvedRedirectException;
 use Wikibase\Lib\Store\StorageException;
@@ -24,24 +24,24 @@
 abstract class EntityRevisionLookupTest extends \MediaWikiTestCase {
 
        /**
-        * @return TheEntityRevision[]
+        * @return EntityRevision[]
         */
        protected function getTestRevisions() {
                $entities = [];
 
                $item = new Item( new ItemId( 'Q42' ) );
 
-               $entities[11] = new TheEntityRevision( $item, 11, 
'20130101001100' );
+               $entities[11] = new EntityRevision( $item, 11, '20130101001100' 
);
 
                $item = new Item( new ItemId( 'Q42' ) );
                $item->setLabel( 'en', "Foo" );
 
-               $entities[12] = new TheEntityRevision( $item, 12, 
'20130101001200' );
+               $entities[12] = new EntityRevision( $item, 12, '20130101001200' 
);
 
                $prop = Property::newFromType( "string" );
                $prop->setId( 753 );
 
-               $entities[13] = new TheEntityRevision( $prop, 13, 
'20130101001300' );
+               $entities[13] = new EntityRevision( $prop, 13, '20130101001300' 
);
 
                return $entities;
        }
@@ -74,7 +74,7 @@
        }
 
        /**
-        * @param TheEntityRevision[] $entityRevisions
+        * @param EntityRevision[] $entityRevisions
         * @param EntityRedirect[] $entityRedirects
         *
         * @return EntityRevisionLookup
@@ -191,7 +191,7 @@
                $this->assertEquals( $expected, $result );
 
                $entityRev = $lookup->getEntityRevision( $id );
-               $this->assertInstanceOf( TheEntityRevision::class, $entityRev );
+               $this->assertInstanceOf( EntityRevision::class, $entityRev );
        }
 
        public function testGetLatestRevisionForMissing() {
diff --git a/extensions/Wikibase/lib/tests/phpunit/MockRepository.php 
b/extensions/Wikibase/lib/tests/phpunit/MockRepository.php
index 81f2075..e70d01d 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 as TheEntityRevision;
+use Wikibase\Lib\Store\EntityRevision;
 use Wikibase\Lib\Store\EntityInfoBuilderFactory;
 use Wikibase\Lib\Store\EntityRevisionLookup;
 use Wikibase\Lib\Store\EntityStore;
@@ -118,7 +118,7 @@
         *
         * @throws RevisionedUnresolvedRedirectException
         * @throws StorageException
-        * @return TheEntityRevision|null
+        * @return EntityRevision|null
         */
        public function getEntityRevision(
                EntityId $entityId,
@@ -146,7 +146,7 @@
                        $revisionId = 0;
                }
 
-               /** @var TheEntityRevision[] $revisions */
+               /** @var EntityRevision[] $revisions */
                $revisions = $this->entities[$key];
 
                if ( $revisionId === 0 ) {
@@ -157,7 +157,7 @@
                }
 
                $revision = $revisions[$revisionId];
-               $revision = new TheEntityRevision( // return a copy!
+               $revision = new EntityRevision( // return a copy!
                        $revision->getEntity()->copy(), // return a copy!
                        $revision->getRevisionId(),
                        $revision->getTimestamp()
@@ -229,7 +229,7 @@
         * @param User|string|null $user
         *
         * @throws StorageException
-        * @return TheEntityRevision
+        * @return EntityRevision
         */
        public function putEntity( EntityDocument $entity, $revisionId = 0, 
$timestamp = 0, $user = null ) {
                if ( $entity->getId() === null ) {
@@ -255,7 +255,7 @@
                $this->updateMaxNumericId( $entity->getId() );
                $this->maxRevisionId = max( $this->maxRevisionId, $revisionId );
 
-               $revision = new TheEntityRevision(
+               $revision = new EntityRevision(
                        $entity->copy(), // note: always clone
                        $revisionId,
                        wfTimestamp( TS_MW, $timestamp )
@@ -479,7 +479,7 @@
         *
         * @see WikiPage::doEditContent
         *
-        * @return TheEntityRevision
+        * @return EntityRevision
         * @throws StorageException
         */
        public function saveEntity( EntityDocument $entity, $summary, User 
$user, $flags = 0, $baseRevisionId = false ) {
@@ -568,7 +568,7 @@
                        return false;
                }
 
-               /** @var TheEntityRevision $revision */
+               /** @var EntityRevision $revision */
                foreach ( $this->entities[$key] as $revision ) {
                        if ( $revision->getRevisionId() >= $lastRevisionId ) {
                                if ( isset( $revision->user ) && 
$revision->user !== $user->getName() ) {
diff --git a/extensions/Wikibase/lib/tests/phpunit/MockRepositoryTest.php 
b/extensions/Wikibase/lib/tests/phpunit/MockRepositoryTest.php
index 03adf33..759d567 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 as TheEntityRevision;
+use Wikibase\Lib\Store\EntityRevision;
 use Wikibase\Lib\Store\RevisionedUnresolvedRedirectException;
 use Wikibase\Lib\Store\StorageException;
 
@@ -121,14 +121,14 @@
                // test latest item
                $itemRev = $this->repo->getEntityRevision( $itemId );
                $this->assertNotNull( $item, 'Entity ' . $itemId );
-               $this->assertInstanceOf( TheEntityRevision::class, $itemRev, 
'Entity ' . $itemId );
+               $this->assertInstanceOf( EntityRevision::class, $itemRev, 
'Entity ' . $itemId );
                $this->assertInstanceOf( Item::class, $itemRev->getEntity(), 
'Entity ' . $itemId );
                $this->assertEquals( 24, $itemRev->getRevisionId() );
 
                // test item by rev id
                $itemRev = $this->repo->getEntityRevision( $itemId, 23 );
                $this->assertNotNull( $item, 'Entity ' . $itemId . '@23' );
-               $this->assertInstanceOf( TheEntityRevision::class, $itemRev, 
'Entity ' . $itemId );
+               $this->assertInstanceOf( EntityRevision::class, $itemRev, 
'Entity ' . $itemId );
                $this->assertInstanceOf( Item::class, $itemRev->getEntity(), 
'Entity ' . $itemId );
                $this->assertEquals( 23, $itemRev->getRevisionId() );
                $this->assertEquals( '20130101000000', $itemRev->getTimestamp() 
);
@@ -136,7 +136,7 @@
                // test latest prop
                $propRev = $this->repo->getEntityRevision( $propId );
                $this->assertNotNull( $propRev, 'Entity ' . $propId );
-               $this->assertInstanceOf( TheEntityRevision::class, $propRev, 
'Entity ' . $propId );
+               $this->assertInstanceOf( EntityRevision::class, $propRev, 
'Entity ' . $propId );
                $this->assertInstanceOf( Property::class, 
$propRev->getEntity(), 'Entity ' . $propId );
        }
 
diff --git 
a/extensions/Wikibase/lib/tests/phpunit/Store/CachingEntityRevisionLookupTest.php
 
b/extensions/Wikibase/lib/tests/phpunit/Store/CachingEntityRevisionLookupTest.php
index d8a8614..93dd33f 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 as TheEntityRevision;
+use Wikibase\Lib\Store\EntityRevision;
 use Wikibase\Lib\Store\CachingEntityRevisionLookup;
 use Wikibase\Lib\Store\EntityRevisionLookup;
 use Wikibase\Lib\Store\RevisionedUnresolvedRedirectException;
@@ -28,7 +28,7 @@
        /**
         * @see EntityLookupTest::newEntityLoader(newEntityLookup
         *
-        * @param TheEntityRevision[] $entityRevisions
+        * @param EntityRevision[] $entityRevisions
         * @param EntityRedirect[] $entityRedirects
         *
         * @return EntityLookup
diff --git 
a/extensions/Wikibase/lib/tests/phpunit/Store/DispatchingEntityRevisionLookupTest.php
 
b/extensions/Wikibase/lib/tests/phpunit/Store/DispatchingEntityRevisionLookupTest.php
index aaabf0a..0c8ebdb 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 as TheEntityRevision;
+use Wikibase\Lib\Store\EntityRevision;
 use Wikibase\Lib\Store\DispatchingEntityRevisionLookup;
 use Wikibase\Lib\Store\EntityRevisionLookup;
 use Wikibase\Lib\Store\StorageException;
@@ -35,7 +35,7 @@
                $localLookup->expects( $this->any() )
                        ->method( 'getEntityRevision' )
                        ->with( $itemId )
-                       ->willReturn( new TheEntityRevision( $item, 123 ) );
+                       ->willReturn( new EntityRevision( $item, 123 ) );
 
                $foreignItemId = new ItemId( 'foo:Q303' );
                $foreignItem = new Item( $foreignItemId );
@@ -44,7 +44,7 @@
                $fooLookup->expects( $this->any() )
                        ->method( 'getEntityRevision' )
                        ->with( $foreignItemId )
-                       ->willReturn( new TheEntityRevision( $foreignItem, 100 
) );
+                       ->willReturn( new EntityRevision( $foreignItem, 100 ) );
 
                $dispatchingLookup = new DispatchingEntityRevisionLookup(
                        [ '' => $localLookup, 'foo' => $fooLookup, ]
diff --git a/extensions/Wikibase/lib/tests/phpunit/Store/EntityRevisionTest.php 
b/extensions/Wikibase/lib/tests/phpunit/Store/EntityRevisionTest.php
index 7b23e96..8747ea4 100644
--- a/extensions/Wikibase/lib/tests/phpunit/Store/EntityRevisionTest.php
+++ b/extensions/Wikibase/lib/tests/phpunit/Store/EntityRevisionTest.php
@@ -5,7 +5,7 @@
 use InvalidArgumentException;
 use PHPUnit_Framework_TestCase;
 use Wikibase\DataModel\Entity\Item;
-use Wikibase\Lib\Store\EntityRevision as TheEntityRevision;
+use Wikibase\Lib\Store\EntityRevision;
 
 /**
  * @covers Wikibase\Lib\Store\EntityRevision
@@ -20,7 +20,7 @@
 
        public function testMinimalConstructorArguments() {
                $entity = new Item();
-               $revision = new TheEntityRevision( $entity );
+               $revision = new EntityRevision( $entity );
 
                $this->assertSame( $entity, $revision->getEntity() );
                $this->assertSame( 0, $revision->getRevisionId() );
@@ -29,7 +29,7 @@
 
        public function testAllConstructorArguments() {
                $entity = new Item();
-               $revision = new TheEntityRevision( $entity, 42, 
'20150211000000' );
+               $revision = new EntityRevision( $entity, 42, '20150211000000' );
 
                $this->assertSame( $entity, $revision->getEntity() );
                $this->assertSame( 42, $revision->getRevisionId() );
@@ -41,7 +41,7 @@
         */
        public function testInvalidConstructorArguments( $revisionId, 
$mwTimestamp ) {
                $this->setExpectedException( InvalidArgumentException::class );
-               new TheEntityRevision( new Item(), $revisionId, $mwTimestamp );
+               new EntityRevision( new Item(), $revisionId, $mwTimestamp );
        }
 
        public function invalidConstructorArgumentsProvider() {
diff --git 
a/extensions/Wikibase/lib/tests/phpunit/Store/PrefetchingWikiPageEntityMetaDataAccessorTest.php
 
b/extensions/Wikibase/lib/tests/phpunit/Store/PrefetchingWikiPageEntityMetaDataAccessorTest.php
index 9123ae8..2059810 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 as TheEntityRevision;
+use Wikibase\Lib\Store\EntityRevision;
 use Wikibase\Lib\Store\EntityRevisionLookup;
 use Wikibase\Lib\Store\Sql\PrefetchingWikiPageEntityMetaDataAccessor;
 use Wikibase\Lib\Store\Sql\WikiPageEntityMetaDataAccessor;
@@ -287,7 +287,7 @@
        }
 
        public function testEntityUpdated() {
-               $entityRevision = new TheEntityRevision(
+               $entityRevision = new EntityRevision(
                        new Item( new ItemId( 'Q1' ) ),
                        123
                );
diff --git a/extensions/Wikibase/repo/Wikibase.hooks.php 
b/extensions/Wikibase/repo/Wikibase.hooks.php
index bab1d43..f31a55c 100644
--- a/extensions/Wikibase/repo/Wikibase.hooks.php
+++ b/extensions/Wikibase/repo/Wikibase.hooks.php
@@ -29,7 +29,7 @@
 use Title;
 use User;
 use Wikibase\Lib\AutoCommentFormatter;
-use Wikibase\Lib\Store\EntityRevision as TheEntityRevision;
+use Wikibase\Lib\Store\EntityRevision;
 use Wikibase\Lib\Store\Sql\EntityChangeLookup;
 use Wikibase\Repo\Content\EntityHandler;
 use Wikibase\Repo\Hooks\InfoActionHookHandler;
@@ -213,7 +213,7 @@
                                $revision->getId()
                        );
                } else {
-                       $watcher->entityUpdated( new TheEntityRevision(
+                       $watcher->entityUpdated( new EntityRevision(
                                $content->getEntity(),
                                $revision->getId(),
                                $revision->getTimestamp()
diff --git a/extensions/Wikibase/repo/includes/Api/EntityLoadingHelper.php 
b/extensions/Wikibase/repo/includes/Api/EntityLoadingHelper.php
index 5a84a15..43b8883 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 as TheEntityRevision;
+use Wikibase\Lib\Store\EntityRevision;
 use Wikibase\Lib\Store\BadRevisionException;
 use Wikibase\Lib\Store\EntityRevisionLookup;
 use Wikibase\Lib\Store\SiteLinkLookup;
@@ -131,7 +131,7 @@
         *
         * @throws ApiUsageException
         * @throws LogicException
-        * @return TheEntityRevision|null
+        * @return EntityRevision|null
         */
        protected function loadEntityRevision(
                EntityId $entityId,
diff --git a/extensions/Wikibase/repo/includes/Api/GetEntities.php 
b/extensions/Wikibase/repo/includes/Api/GetEntities.php
index c358c08..e6278ce 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 as TheEntityRevision;
+use Wikibase\Lib\Store\EntityRevision;
 use Wikibase\LanguageFallbackChainFactory;
 use Wikibase\Lib\Store\EntityRevisionLookup;
 use Wikibase\Lib\Store\RevisionedUnresolvedRedirectException;
@@ -239,7 +239,7 @@
         * @param EntityId[] $entityIds
         * @param bool $resolveRedirects
         *
-        * @return TheEntityRevision[]
+        * @return EntityRevision[]
         */
        private function getEntityRevisionsFromEntityIds( array $entityIds, 
$resolveRedirects = false ) {
                $revisionArray = [];
@@ -260,7 +260,7 @@
         * @param EntityId $entityId
         * @param bool $resolveRedirects
         *
-        * @return null|TheEntityRevision
+        * @return null|EntityRevision
         */
        private function getEntityRevision( EntityId $entityId, 
$resolveRedirects = false ) {
                $entityRevision = null;
@@ -286,12 +286,12 @@
         * Adds the given EntityRevision to the API result.
         *
         * @param string|null $sourceEntityId
-        * @param TheEntityRevision|null $entityRevision
+        * @param EntityRevision|null $entityRevision
         * @param array $params
         */
        private function handleEntity(
                $sourceEntityId,
-               TheEntityRevision $entityRevision = null,
+               EntityRevision $entityRevision = null,
                array $params = []
        ) {
                if ( $entityRevision === null ) {
diff --git a/extensions/Wikibase/repo/includes/Api/MergeItems.php 
b/extensions/Wikibase/repo/includes/Api/MergeItems.php
index bf8d2c5..96a55b9 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 as TheEntityRevision;
+use Wikibase\Lib\Store\EntityRevision;
 use Wikibase\Repo\Interactors\ItemMergeException;
 use Wikibase\Repo\Interactors\ItemMergeInteractor;
 use Wikibase\Repo\Interactors\RedirectCreationException;
@@ -155,7 +155,7 @@
                }
        }
 
-       private function addEntityToOutput( TheEntityRevision $entityRevision, 
$name ) {
+       private function addEntityToOutput( EntityRevision $entityRevision, 
$name ) {
                $entityId = $entityRevision->getEntity()->getId();
                $revisionId = $entityRevision->getRevisionId();
 
diff --git a/extensions/Wikibase/repo/includes/Api/ResultBuilder.php 
b/extensions/Wikibase/repo/includes/Api/ResultBuilder.php
index 433fb5b..9f5e86e 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 as TheEntityRevision;
+use Wikibase\Lib\Store\EntityRevision;
 use Wikibase\LanguageFallbackChain;
 use Wikibase\Lib\Serialization\CallbackFactory;
 use Wikibase\Lib\Serialization\SerializationModifier;
@@ -252,7 +252,7 @@
         *        Used as the key for the entity in the 'entities' structure 
and for adding redirect
         *     info Will default to the entity's serialized ID if null. If 
given this must be the
         *     entity id before any redirects were resolved.
-        * @param TheEntityRevision $entityRevision
+        * @param EntityRevision $entityRevision
         * @param string[]|string $props a list of fields to include, or "all"
         * @param string[]|null $filterSiteIds A list of site IDs to filter by
         * @param string[] $filterLangCodes A list of language codes to filter 
by
@@ -260,7 +260,7 @@
         */
        public function addEntityRevision(
                $sourceEntityIdSerialization,
-               TheEntityRevision $entityRevision,
+               EntityRevision $entityRevision,
                $props = 'all',
                array $filterSiteIds = null,
                array $filterLangCodes = [],
@@ -1080,7 +1080,7 @@
        private function getRevisionId( $revision ) {
                if ( $revision instanceof Revision ) {
                        $revisionId = $revision->getId();
-               } elseif ( $revision instanceof TheEntityRevision ) {
+               } elseif ( $revision instanceof EntityRevision ) {
                        $revisionId = $revision->getRevisionId();
                }
 
diff --git a/extensions/Wikibase/repo/includes/Content/EntityContent.php 
b/extensions/Wikibase/repo/includes/Content/EntityContent.php
index a81807c..7464ed2 100644
--- a/extensions/Wikibase/repo/includes/Content/EntityContent.php
+++ b/extensions/Wikibase/repo/includes/Content/EntityContent.php
@@ -27,7 +27,7 @@
 use Wikibase\DataModel\Entity\EntityId;
 use Wikibase\DataModel\Entity\EntityRedirect;
 use Wikibase\DataModel\Term\DescriptionsProvider;
-use Wikibase\Lib\Store\EntityRevision as TheEntityRevision;
+use Wikibase\Lib\Store\EntityRevision;
 use Wikibase\Repo\Content\EntityContentDiff;
 use Wikibase\Repo\Content\EntityHandler;
 use Wikibase\Repo\FingerprintSearchTextGenerator;
@@ -284,19 +284,19 @@
        /**
         * @param int|null $revisionId
         *
-        * @return TheEntityRevision
+        * @return EntityRevision
         */
        private function getEntityRevision( $revisionId = null ) {
                $entity = $this->getEntity();
 
                if ( $revisionId !== null ) {
-                       return new TheEntityRevision( $entity, $revisionId );
+                       return new EntityRevision( $entity, $revisionId );
                }
 
                // Revision defaults to 0 (latest), which is desired and 
suitable in cases where
                // getParserOutput specifies no revision. (e.g. is called 
during save process
                // when revision id is unknown or not assigned yet)
-               return new TheEntityRevision( $entity );
+               return new EntityRevision( $entity );
        }
 
        /**
diff --git a/extensions/Wikibase/repo/includes/EditEntity.php 
b/extensions/Wikibase/repo/includes/EditEntity.php
index 5aead7a..5b1306f 100644
--- a/extensions/Wikibase/repo/includes/EditEntity.php
+++ b/extensions/Wikibase/repo/includes/EditEntity.php
@@ -13,7 +13,7 @@
 use Wikibase\DataModel\Entity\EntityId;
 use Wikibase\DataModel\Services\Diff\EntityDiffer;
 use Wikibase\DataModel\Services\Diff\EntityPatcher;
-use Wikibase\Lib\Store\EntityRevision as TheEntityRevision;
+use Wikibase\Lib\Store\EntityRevision;
 use Wikibase\Lib\Store\EntityRevisionLookup;
 use Wikibase\Lib\Store\EntityStore;
 use Wikibase\Repo\Store\EntityTitleStoreLookup;
@@ -70,7 +70,7 @@
        private $entityId = null;
 
        /**
-        * @var TheEntityRevision|null
+        * @var EntityRevision|null
         */
        private $baseRev = null;
 
@@ -80,7 +80,7 @@
        private $baseRevId;
 
        /**
-        * @var TheEntityRevision|null
+        * @var EntityRevision|null
         */
        private $latestRev = null;
 
@@ -242,7 +242,7 @@
        /**
         * Returns the latest revision of the entity.
         *
-        * @return TheEntityRevision|null
+        * @return EntityRevision|null
         */
        public function getLatestRevision() {
                if ( $this->latestRev === null ) {
@@ -315,7 +315,7 @@
         * the constructor, this returns the latest revision. If the entity 
does not exist
         * yet, this returns null.
         *
-        * @return TheEntityRevision|null
+        * @return EntityRevision|null
         * @throws MWException
         */
        public function getBaseRevision() {
diff --git 
a/extensions/Wikibase/repo/includes/Hooks/OutputPageBeforeHTMLHookHandler.php 
b/extensions/Wikibase/repo/includes/Hooks/OutputPageBeforeHTMLHookHandler.php
index b40141d..9a3b192 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 as TheEntityRevision;
+use Wikibase\Lib\Store\EntityRevision;
 use Wikibase\Lib\ContentLanguages;
 use Wikibase\Lib\LanguageNameLookup;
 use Wikibase\Lib\Store\EntityRevisionLookup;
@@ -188,7 +188,7 @@
                        // The parser cache content is too old to contain the 
terms list items
                        // Pass the correct entity to generate terms list items 
on the fly
                        $entityRev = 
$this->entityRevisionLookup->getEntityRevision( $entityId, $revisionId );
-                       if ( !( $entityRev instanceof TheEntityRevision ) ) {
+                       if ( !( $entityRev instanceof EntityRevision ) ) {
                                return null;
                        }
                        $entity = $entityRev->getEntity();
diff --git 
a/extensions/Wikibase/repo/includes/LinkedData/EntityDataRequestHandler.php 
b/extensions/Wikibase/repo/includes/LinkedData/EntityDataRequestHandler.php
index ce5dfa9..2236b90 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 as TheEntityRevision;
+use Wikibase\Lib\Store\EntityRevision;
 use Wikibase\Lib\Store\BadRevisionException;
 use Wikibase\Lib\Store\EntityRevisionLookup;
 use Wikibase\Lib\Store\EntityTitleLookup;
@@ -420,7 +420,7 @@
 
                $flavor = $request->getVal( "flavor" );
 
-               /** @var TheEntityRevision $entityRevision */
+               /** @var EntityRevision $entityRevision */
                /** @var RedirectRevision $followedRedirectRevision */
                list( $entityRevision, $followedRedirectRevision ) = 
$this->getEntityRevision( $id, $revision );
 
diff --git 
a/extensions/Wikibase/repo/includes/LinkedData/EntityDataSerializationService.php
 
b/extensions/Wikibase/repo/includes/LinkedData/EntityDataSerializationService.php
index 2c09146..0264469 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 as TheEntityRevision;
+use Wikibase\Lib\Store\EntityRevision;
 use Wikibase\Lib\Store\EntityTitleLookup;
 use Wikibase\Rdf\EntityRdfBuilderFactory;
 use Wikibase\Rdf\ValueSnakRdfBuilderFactory;
@@ -138,7 +138,7 @@
         * Output entity data.
         *
         * @param string $format The name (mime type of file extension) of the 
format to use
-        * @param TheEntityRevision $entityRevision The entity
+        * @param EntityRevision $entityRevision The entity
         * @param RedirectRevision|null $followedRedirect The redirect that led 
to the entity, or null
         * @param EntityId[] $incomingRedirects Incoming redirects to include 
in the output
         * @param string|null $flavor The type of the output provided by 
serializer
@@ -148,7 +148,7 @@
         */
        public function getSerializedData(
                $format,
-               TheEntityRevision $entityRevision,
+               EntityRevision $entityRevision,
                RedirectRevision $followedRedirect = null,
                array $incomingRedirects = [],
                $flavor = null
@@ -182,7 +182,7 @@
        }
 
        /**
-        * @param TheEntityRevision $entityRevision
+        * @param EntityRevision $entityRevision
         * @param RedirectRevision|null $followedRedirect a redirect leading to 
the entity for use in the output
         * @param EntityId[] $incomingRedirects Incoming redirects to include 
in the output
         * @param RdfBuilder $rdfBuilder
@@ -191,7 +191,7 @@
         * @return string RDF
         */
        private function rdfSerialize(
-               TheEntityRevision $entityRevision,
+               EntityRevision $entityRevision,
                RedirectRevision $followedRedirect = null,
                array $incomingRedirects,
                RdfBuilder $rdfBuilder,
@@ -385,14 +385,14 @@
         * result, if $printer was generated from that same ApiMain module, as
         * createApiPrinter() does.
         *
-        * @param TheEntityRevision $entityRevision The entity to convert ot an 
ApiResult
+        * @param EntityRevision $entityRevision The entity to convert ot an 
ApiResult
         * @param ApiFormatBase $printer The output printer that will be used 
for serialization.
         *   Used to provide context for generating the ApiResult, and may also 
be manipulated
         *   to fine-tune the output.
         *
         * @return ApiResult
         */
-       private function generateApiResult( TheEntityRevision $entityRevision, 
ApiFormatBase $printer ) {
+       private function generateApiResult( EntityRevision $entityRevision, 
ApiFormatBase $printer ) {
                $res = $printer->getResult();
 
                // Make sure result is empty. May still be full if this
@@ -420,13 +420,13 @@
         * representation of data entities. Using the ContentHandler to 
serialize the entity would
         * expose internal implementation details.
         *
-        * @param TheEntityRevision $entityRevision the entity to output.
+        * @param EntityRevision $entityRevision the entity to output.
         * @param ApiFormatBase $printer the printer to use to generate the 
output
         *
         * @return string the serialized data
         */
        private function getApiSerialization(
-               TheEntityRevision $entityRevision,
+               EntityRevision $entityRevision,
                ApiFormatBase $printer
        ) {
                // NOTE: The way the ApiResult is provided to $printer is 
somewhat
diff --git a/extensions/Wikibase/repo/includes/Specials/SpecialMergeItems.php 
b/extensions/Wikibase/repo/includes/Specials/SpecialMergeItems.php
index 0107956..600b94a 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 as TheEntityRevision;
+use Wikibase\Lib\Store\EntityRevision;
 use Wikibase\Lib\Store\EntityTitleLookup;
 use Wikibase\Lib\Store\RevisionedUnresolvedRedirectException;
 use Wikibase\Lib\UserInputException;
@@ -175,8 +175,8 @@
                $fromTitle = $this->titleLookup->getTitleForId( $fromId );
                $toTitle = $this->titleLookup->getTitleForId( $toId );
 
-               /** @var TheEntityRevision $newRevisionFrom  */
-               /** @var TheEntityRevision $newRevisionTo */
+               /** @var EntityRevision $newRevisionFrom  */
+               /** @var EntityRevision $newRevisionTo */
                list( $newRevisionFrom, $newRevisionTo, )
                        = $this->interactor->mergeItems( $fromId, $toId, 
$ignoreConflicts, $summary );
 
diff --git a/extensions/Wikibase/repo/includes/Specials/SpecialModifyEntity.php 
b/extensions/Wikibase/repo/includes/Specials/SpecialModifyEntity.php
index a5e0b18..c26a165 100644
--- a/extensions/Wikibase/repo/includes/Specials/SpecialModifyEntity.php
+++ b/extensions/Wikibase/repo/includes/Specials/SpecialModifyEntity.php
@@ -12,7 +12,7 @@
 use Wikibase\Repo\ChangeOp\ChangeOpValidationException;
 use Wikibase\DataModel\Entity\EntityDocument;
 use Wikibase\EditEntityFactory;
-use Wikibase\Lib\Store\EntityRevision as TheEntityRevision;
+use Wikibase\Lib\Store\EntityRevision;
 use Wikibase\Lib\MessageException;
 use Wikibase\Lib\Store\EntityTitleLookup;
 use Wikibase\Lib\Store\RevisionedUnresolvedRedirectException;
@@ -87,7 +87,7 @@
         *
         * @throws UserInputException
         *
-        * @return TheEntityRevision
+        * @return EntityRevision
         */
        protected function getBaseRevision() {
                $id = $this->getEntityId();
@@ -123,7 +123,7 @@
         *
         * @throws UserInputException
         *
-        * @return null|TheEntityRevision
+        * @return null|EntityRevision
         */
        protected function getLatestRevision() {
                $id = $this->getEntityId();
diff --git 
a/extensions/Wikibase/repo/includes/Store/DispatchingEntityStoreWatcher.php 
b/extensions/Wikibase/repo/includes/Store/DispatchingEntityStoreWatcher.php
index b7535db..a542e9f 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 as TheEntityRevision;
+use Wikibase\Lib\Store\EntityRevision;
 use Wikibase\Lib\Store\EntityStoreWatcher;
 use Wikibase\Repo\GenericEventDispatcher;
 
@@ -23,9 +23,9 @@
        /**
         * @see EntityStoreWatcher::entityUpdated
         *
-        * @param TheEntityRevision $entityRevision
+        * @param EntityRevision $entityRevision
         */
-       public function entityUpdated( TheEntityRevision $entityRevision ) {
+       public function entityUpdated( EntityRevision $entityRevision ) {
                $this->dispatch( 'entityUpdated', $entityRevision );
        }
 
diff --git 
a/extensions/Wikibase/repo/includes/Store/Sql/TermSqlIndexBuilder.php 
b/extensions/Wikibase/repo/includes/Store/Sql/TermSqlIndexBuilder.php
index 1814848..7d85ac8 100644
--- a/extensions/Wikibase/repo/includes/Store/Sql/TermSqlIndexBuilder.php
+++ b/extensions/Wikibase/repo/includes/Store/Sql/TermSqlIndexBuilder.php
@@ -97,19 +97,22 @@
         * @param SqlEntityIdPagerFactory $entityIdPagerFactory
         * @param EntityRevisionLookup $entityRevisionLookup
         * @param string[] $entityTypes
+        * @param int $sleep Sleep time between each batch
         */
        public function __construct(
                LBFactory $loadBalancerFactory,
                TermSqlIndex $termSqlIndex,
                SqlEntityIdPagerFactory $entityIdPagerFactory,
                EntityRevisionLookup $entityRevisionLookup,
-               array $entityTypes
+               array $entityTypes,
+               $sleep = 10
        ) {
                $this->loadBalancerFactory = $loadBalancerFactory;
                $this->termSqlIndex = $termSqlIndex;
                $this->entityIdPagerFactory = $entityIdPagerFactory;
                $this->entityRevisionLookup = $entityRevisionLookup;
                $this->entityTypes = $entityTypes;
+               $this->sleep = $sleep;
                $this->progressReporter = new NullMessageReporter();
                $this->errorReporter = new NullMessageReporter();
        }
@@ -200,6 +203,7 @@
                                $this->progressReporter->reportMessage( 
"Processed up to page "
                                        . $idPager->getPosition() . " 
($lastIdProcessed)" );
                        }
+                       sleep( $this->sleep );
                }
 
                $this->progressReporter->reportMessage( "Done rebuilding 
$entityType terms" );
diff --git 
a/extensions/Wikibase/repo/includes/Store/Sql/WikiPageEntityStore.php 
b/extensions/Wikibase/repo/includes/Store/Sql/WikiPageEntityStore.php
index 0597c2d..4465678 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 as TheEntityRevision;
+use Wikibase\Lib\Store\EntityRevision;
 use Wikibase\IdGenerator;
 use Wikibase\Lib\EntityIdComposer;
 use Wikibase\Lib\Store\EntityStore;
@@ -166,7 +166,7 @@
         *
         * @throws InvalidArgumentException
         * @throws StorageException
-        * @return TheEntityRevision
+        * @return EntityRevision
         */
        public function saveEntity(
                EntityDocument $entity,
@@ -188,7 +188,7 @@
                $content = $this->contentFactory->newFromEntity( $entity );
                $revision = $this->saveEntityContent( $content, $summary, 
$user, $flags, $baseRevId );
 
-               $entityRevision = new TheEntityRevision(
+               $entityRevision = new EntityRevision(
                        $entity,
                        $revision->getId(),
                        $revision->getTimestamp()
diff --git a/extensions/Wikibase/repo/maintenance/rebuildTermSqlIndex.php 
b/extensions/Wikibase/repo/maintenance/rebuildTermSqlIndex.php
index b99e8de..1695950 100644
--- a/extensions/Wikibase/repo/maintenance/rebuildTermSqlIndex.php
+++ b/extensions/Wikibase/repo/maintenance/rebuildTermSqlIndex.php
@@ -46,6 +46,7 @@
                        'rebuild-all-terms', 'Rebuilds all terms of the entity 
(requires loading data of each processed entity)'
                );
                $this->addOption( 'from-id', "First row (page id) to start 
updating from", false, true );
+               $this->addOption( 'sleep', "Sleep time (in seconds) between 
every batch", false, true );
        }
 
        public function execute() {
@@ -88,7 +89,8 @@
                        $termIndex,
                        $sqlEntityIdPagerFactory,
                        $wikibaseRepo->getEntityRevisionLookup( 'uncached' ),
-                       $this->getEntityTypes()
+                       $this->getEntityTypes(),
+                       $this->getOption( 'sleep', 10 )
                );
                $builder->setProgressReporter( $this->getReporter() );
                $builder->setErrorReporter( $this->getErrorReporter() );
diff --git 
a/extensions/Wikibase/repo/tests/phpunit/includes/Actions/ActionTestCase.php 
b/extensions/Wikibase/repo/tests/phpunit/includes/Actions/ActionTestCase.php
index 5344b32..19ccd39 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 as TheEntityRevision;
+use Wikibase\Lib\Store\EntityRevision;
 use Wikibase\ItemContent;
 use Wikibase\Repo\WikibaseRepo;
 use WikiPage;
@@ -260,7 +260,7 @@
        private function createTestContent( $handle, array $revisions ) {
                global $wgUser;
 
-               /** @var TheEntityRevision $rev */
+               /** @var EntityRevision $rev */
                $id = null;
                $result = null;
 
diff --git 
a/extensions/Wikibase/repo/tests/phpunit/includes/Api/ApiFormatTestCase.php 
b/extensions/Wikibase/repo/tests/phpunit/includes/Api/ApiFormatTestCase.php
index 92779f6..320279f 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 as TheEntityRevision;
+use Wikibase\Lib\Store\EntityRevision;
 use Wikibase\Repo\WikibaseRepo;
 
 /**
@@ -94,7 +94,7 @@
                return $entityRevision;
        }
 
-       private function storePresetDataInStatement( TheEntityRevision 
$entityRevision, PropertyId $propertyId ) {
+       private function storePresetDataInStatement( EntityRevision 
$entityRevision, PropertyId $propertyId ) {
                global $wgUser;
 
                $store = WikibaseRepo::getDefaultInstance()->getEntityStore();
diff --git 
a/extensions/Wikibase/repo/tests/phpunit/includes/Api/EntityLoadingHelperTest.php
 
b/extensions/Wikibase/repo/tests/phpunit/includes/Api/EntityLoadingHelperTest.php
index 60feb2b..b53cdf9 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 as TheEntityRevision;
+use Wikibase\Lib\Store\EntityRevision;
 use Wikibase\Lib\Store\BadRevisionException;
 use Wikibase\Lib\Store\EntityRevisionLookup;
 use Wikibase\Lib\Store\SiteLinkLookup;
@@ -50,14 +50,14 @@
 
        /**
         * @param EntityId|null $entityId Entity ID getEntityRevision() should 
expect.
-        * @param TheEntityRevision|null $entityRevision The EntityRevision 
getEntityRevision() should return.
+        * @param EntityRevision|null $entityRevision The EntityRevision 
getEntityRevision() should return.
         * @param Exception|null $exception The Exception getEntityRevision() 
should throw.
         *
         * @return EntityRevisionLookup|PHPUnit_Framework_MockObject_MockObject
         */
        protected function getMockEntityRevisionLookup(
                EntityId $entityId = null,
-               TheEntityRevision $entityRevision = null,
+               EntityRevision $entityRevision = null,
                Exception $exception = null
        ) {
                $mock = $this->getMock( EntityRevisionLookup::class );
@@ -119,12 +119,12 @@
        }
 
        /**
-        * @return TheEntityRevision|PHPUnit_Framework_MockObject_MockObject
+        * @return EntityRevision|PHPUnit_Framework_MockObject_MockObject
         */
        protected function getMockRevision() {
                $entity = $this->getMock( EntityDocument::class );
 
-               $revision = $this->getMockBuilder( TheEntityRevision::class )
+               $revision = $this->getMockBuilder( EntityRevision::class )
                        ->disableOriginalConstructor()
                        ->getMock();
 
diff --git 
a/extensions/Wikibase/repo/tests/phpunit/includes/Api/ResultBuilderTest.php 
b/extensions/Wikibase/repo/tests/phpunit/includes/Api/ResultBuilderTest.php
index dac698e..f79e7be 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 as TheEntityRevision;
+use Wikibase\Lib\Store\EntityRevision;
 use Wikibase\LanguageFallbackChainFactory;
 use Wikibase\Lib\Store\EntityTitleLookup;
 use Wikibase\Repo\Api\ResultBuilder;
@@ -385,7 +385,7 @@
                $guid = 'imaguid';
                $item->getStatements()->addNewStatement( $snak, $qualifiers, 
$references, $guid );
 
-               $entityRevision = new TheEntityRevision( $item, 33, 
'20131126202923' );
+               $entityRevision = new EntityRevision( $item, 33, 
'20131126202923' );
 
                $resultBuilder = $this->getResultBuilder( $result, $addMetaData 
);
                $resultBuilder->addEntityRevision( 'Q1230000', $entityRevision 
);
@@ -398,7 +398,7 @@
        public function testAddEntityRevisionKey() {
                $item = new Item( new ItemId( 'Q11' ) );
 
-               $entityRevision = new TheEntityRevision( $item, 33, 
'20131126202923' );
+               $entityRevision = new EntityRevision( $item, 33, 
'20131126202923' );
 
                $props = [];
                $result = $this->getDefaultResult();
@@ -497,7 +497,7 @@
                $item->getFingerprint()->setLabel( 'en', 'Oslo-en' );
                $item->getFingerprint()->setDescription( 'es', 'desc-es' );
                $item->getFingerprint()->setDescription( 'zh-sg', 'desc-zh-sg' 
);
-               $entityRevision = new TheEntityRevision( $item );
+               $entityRevision = new EntityRevision( $item );
 
                $fallbackChainFactory = new LanguageFallbackChainFactory();
                $fallbackMode = LanguageFallbackChainFactory::FALLBACK_ALL;
@@ -533,7 +533,7 @@
                $item->setDescription( 'de', 'text' );
                $item->setAliases( 'en', [ 'text' ] );
                $item->setAliases( 'de', [ 'text' ] );
-               $entityRevision = new TheEntityRevision( $item );
+               $entityRevision = new EntityRevision( $item );
 
                $result = $this->getDefaultResult();
                $resultBuilder = $this->getResultBuilder( $result );
@@ -585,7 +585,7 @@
                $item = new Item( new ItemId( 'Q123099' ) );
                $item->getSiteLinkList()->addNewSiteLink( 'enwiki', 'Berlin' );
                $item->getSiteLinkList()->addNewSiteLink( 'dewiki', 'Berlin' );
-               $entityRevision = new TheEntityRevision( $item );
+               $entityRevision = new EntityRevision( $item );
 
                $props = [ 'sitelinks' ];
                $siteIds = [ 'enwiki' ];
@@ -624,7 +624,7 @@
                $item = new Item( new ItemId( 'Q123100' ) );
                $item->getSiteLinkList()->addNewSiteLink( 'enwiki', 'Berlin' );
                $item->getSiteLinkList()->addNewSiteLink( 'dewiki', 'Berlin' );
-               $entityRevision = new TheEntityRevision( $item );
+               $entityRevision = new EntityRevision( $item );
 
                $props = [ 'sitelinks' ];
                $siteIds = [ 'enwiki' ];
diff --git 
a/extensions/Wikibase/repo/tests/phpunit/includes/Dumpers/RdfDumpGeneratorTest.php
 
b/extensions/Wikibase/repo/tests/phpunit/includes/Dumpers/RdfDumpGeneratorTest.php
index 0aed836..58a8114 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 as TheEntityRevision;
+use Wikibase\Lib\Store\EntityRevision;
 use Wikibase\Lib\Store\EntityRevisionLookup;
 use Wikibase\Lib\Store\EntityTitleLookup;
 use Wikibase\Lib\Store\RevisionedUnresolvedRedirectException;
@@ -189,7 +189,7 @@
                                if ( !$entity ) {
                                        return null;
                                }
-                               return new TheEntityRevision( $entity, 12, 
wfTimestamp( TS_MW, 1000000 ) );
+                               return new EntityRevision( $entity, 12, 
wfTimestamp( TS_MW, 1000000 ) );
                        }
                ) );
 
diff --git 
a/extensions/Wikibase/repo/tests/phpunit/includes/Hooks/OutputPageBeforeHTMLHookHandlerTest.php
 
b/extensions/Wikibase/repo/tests/phpunit/includes/Hooks/OutputPageBeforeHTMLHookHandlerTest.php
index 56ade9f..b113ff5 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 as TheEntityRevision;
+use Wikibase\Lib\Store\EntityRevision;
 use Wikibase\Lib\LanguageNameLookup;
 use Wikibase\Lib\StaticContentLanguages;
 use Wikibase\Lib\Store\EntityRevisionLookup;
@@ -66,7 +66,7 @@
                $entityRevisionLookup = $this->getMock( 
EntityRevisionLookup::class );
                $entityRevisionLookup->expects( $this->once() )
                        ->method( 'getEntityRevision' )
-                       ->will( $this->returnValue( new TheEntityRevision( new 
Item( $itemId ) ) ) );
+                       ->will( $this->returnValue( new EntityRevision( new 
Item( $itemId ) ) ) );
 
                $outputPageBeforeHTMLHookHandler = new 
OutputPageBeforeHTMLHookHandler(
                        TemplateFactory::getDefaultInstance(),
diff --git a/extensions/Wikibase/repo/tests/phpunit/includes/ItemMoveTest.php 
b/extensions/Wikibase/repo/tests/phpunit/includes/ItemMoveTest.php
index 4577922..a2199cd 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 as TheEntityRevision;
+use Wikibase\Lib\Store\EntityRevision;
 use Wikibase\Repo\WikibaseRepo;
 use WikiPage;
 use WikitextContent;
@@ -28,7 +28,7 @@
        //@todo: make this a baseclass to use with all types of entities.
 
        /**
-        * @var TheEntityRevision
+        * @var EntityRevision
         */
        protected $entityRevision;
 
diff --git 
a/extensions/Wikibase/repo/tests/phpunit/includes/LinkedData/EntityDataSerializationServiceTest.php
 
b/extensions/Wikibase/repo/tests/phpunit/includes/LinkedData/EntityDataSerializationServiceTest.php
index 52a0175..348487b 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 as TheEntityRevision;
+use Wikibase\Lib\Store\EntityRevision;
 use Wikibase\Lib\Store\EntityTitleLookup;
 use Wikibase\Lib\Tests\MockRepository;
 use Wikibase\Rdf\RdfVocabulary;
@@ -323,7 +323,7 @@
         */
        public function testGetSerializedData(
                $format,
-               TheEntityRevision $entityRev,
+               EntityRevision $entityRev,
                RedirectRevision $followedRedirect = null,
                array $incomingRedirects,
                $flavor,
diff --git 
a/extensions/Wikibase/repo/tests/phpunit/includes/LinkedData/EntityDataTestProvider.php
 
b/extensions/Wikibase/repo/tests/phpunit/includes/LinkedData/EntityDataTestProvider.php
index 105f7ea..f335d46 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 as TheEntityRevision;
+use Wikibase\Lib\Store\EntityRevision;
 use Wikibase\Lib\Tests\MockRepository;
 
 /**
@@ -19,13 +19,13 @@
 class EntityDataTestProvider {
 
        /**
-        * @return TheEntityRevision[]
+        * @return EntityRevision[]
         */
        public static function getEntityRevisions() {
                $item = new Item( new ItemId( 'Q42' ) );
                $item->setLabel( 'en', 'Raarrr!' );
 
-               $itemRev = new TheEntityRevision( $item, 4242, '20131211100908' 
);
+               $itemRev = new EntityRevision( $item, 4242, '20131211100908' );
 
                return [ $itemRev ];
        }
diff --git 
a/extensions/Wikibase/repo/tests/phpunit/includes/PropertyDataTypeChangerTest.php
 
b/extensions/Wikibase/repo/tests/phpunit/includes/PropertyDataTypeChangerTest.php
index f3dec05..bd5444b 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 as TheEntityRevision;
+use Wikibase\Lib\Store\EntityRevision;
 use Wikibase\Lib\Store\EntityRevisionLookup;
 use Wikibase\Lib\Store\EntityStore;
 use Wikibase\Lib\Store\StorageException;
@@ -39,7 +39,7 @@
                                $this->isInstanceOf( User::class ),
                                EDIT_UPDATE, 6789
                        )
-                       ->will( $this->returnValue( new TheEntityRevision( 
$expectedProperty, 6790 ) ) );
+                       ->will( $this->returnValue( new EntityRevision( 
$expectedProperty, 6790 ) ) );
 
                $propertyDataTypeChanger = $this->getPropertyDataTypeChanger( 
$entityStore );
                $propertyDataTypeChanger->changeDataType( $propertyId, 
$this->getMock( User::class ), 'shinydata' );
@@ -114,7 +114,7 @@
                                                'rustydata'
                                        );
 
-                                       return new TheEntityRevision( 
$property, 6789, '20151015195144' );
+                                       return new EntityRevision( $property, 
6789, '20151015195144' );
                                } else {
                                        return null;
                                }
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 4600d40..cbbf448 100644
--- 
a/extensions/Wikibase/repo/tests/phpunit/includes/Store/Sql/WikiPageEntityMetaDataLookupTest.php
+++ 
b/extensions/Wikibase/repo/tests/phpunit/includes/Store/Sql/WikiPageEntityMetaDataLookupTest.php
@@ -8,7 +8,7 @@
 use Wikibase\DataModel\Entity\EntityId;
 use Wikibase\DataModel\Entity\Item;
 use Wikibase\DataModel\Entity\ItemId;
-use Wikibase\Lib\Store\EntityRevision as TheEntityRevision;
+use Wikibase\Lib\Store\EntityRevision;
 use Wikibase\Lib\Store\EntityNamespaceLookup;
 use Wikibase\Lib\Store\EntityRevisionLookup;
 use Wikibase\Lib\Store\Sql\WikiPageEntityMetaDataLookup;
@@ -32,7 +32,7 @@
 class WikiPageEntityMetaDataLookupTest extends MediaWikiTestCase {
 
        /**
-        * @var TheEntityRevision[]
+        * @var EntityRevision[]
         */
        private $data = [];
 
diff --git 
a/extensions/Wikibase/repo/tests/phpunit/includes/Store/WikiPageEntityRevisionLookupTest.php
 
b/extensions/Wikibase/repo/tests/phpunit/includes/Store/WikiPageEntityRevisionLookupTest.php
index 1c68128..f8c6783 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 as TheEntityRevision;
+use Wikibase\Lib\Store\EntityRevision;
 use Wikibase\Lib\Store\EntityContentDataCodec;
 use Wikibase\Lib\Store\EntityNamespaceLookup;
 use Wikibase\Lib\Store\Sql\WikiPageEntityMetaDataLookup;
@@ -30,7 +30,7 @@
 class WikiPageEntityRevisionLookupTest extends EntityRevisionLookupTest {
 
        /**
-        * @var TheEntityRevision[]
+        * @var EntityRevision[]
         */
        private static $testEntities = [];
 
@@ -55,7 +55,7 @@
        /**
         * @see EntityLookupTest::newEntityLoader(newEntityLookup
         *
-        * @param TheEntityRevision[] $entityRevisions
+        * @param EntityRevision[] $entityRevisions
         * @param EntityRedirect[] $entityRedirects
         *
         * @return EntityLookup
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index 96c646c..66845db 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -1387,12 +1387,12 @@
         "source": {
             "type": "git",
             "url": 
"https://github.com/wikimedia/mediawiki-extensions-Wikibase.git";,
-            "reference": "343a1a85f4c5a7b0d53e4991e1fd193a3af64027"
+            "reference": "04bea4767fc9fd6bf3331d73f2602e1068a6ed10"
         },
         "dist": {
             "type": "zip",
-            "url": 
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/343a1a85f4c5a7b0d53e4991e1fd193a3af64027";,
-            "reference": "343a1a85f4c5a7b0d53e4991e1fd193a3af64027",
+            "url": 
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/04bea4767fc9fd6bf3331d73f2602e1068a6ed10";,
+            "reference": "04bea4767fc9fd6bf3331d73f2602e1068a6ed10",
             "shasum": ""
         },
         "require": {
@@ -1426,7 +1426,7 @@
             "jakub-onderka/php-parallel-lint": ">=0.3 <0.10",
             "wikibase/wikibase-codesniffer": "^0.1.0"
         },
-        "time": "2017-08-19 23:01:53",
+        "time": "2017-08-21 08:01:38",
         "type": "mediawiki-extension",
         "installation-source": "dist",
         "autoload": {
@@ -1646,7 +1646,7 @@
         "source": {
             "type": "git",
             "url": 
"https://gerrit.wikimedia.org/r/mediawiki/extensions/PropertySuggester";,
-            "reference": "eed41ccdbe6ed5bb90cb2fff70ac8fdbbfbcd7a0"
+            "reference": "3843245ea59fc1c2c89a412167200558ac93c030"
         },
         "require": {
             "php": ">=5.5.9",
@@ -1661,7 +1661,7 @@
             "wikibase/wikibase-codesniffer": "^0.1.0",
             "wikimedia/testing-access-wrapper": "~1.0"
         },
-        "time": "2017-08-13 03:37:26",
+        "time": "2017-08-19 08:22:24",
         "type": "mediawiki-extension",
         "installation-source": "source",
         "autoload": {
@@ -1776,7 +1776,7 @@
         "source": {
             "type": "git",
             "url": 
"https://gerrit.wikimedia.org/r/mediawiki/extensions/WikibaseQualityConstraints";,
-            "reference": "ac1312606e118062b85976b90ab409be300dd69a"
+            "reference": "635fb201d296fbfc0c01ed0db4e8074f619a85aa"
         },
         "require": {
             "php": ">=5.5.9",
@@ -1792,7 +1792,7 @@
             "satooshi/php-coveralls": "master-dev",
             "wikibase/wikibase-codesniffer": "^0.1.0"
         },
-        "time": "2017-08-19 21:24:49",
+        "time": "2017-08-21 09:02:20",
         "type": "mediawiki-extension",
         "installation-source": "source",
         "autoload": {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5a3a2da357d7704918b4a9cf7a0b73dea8a49d88
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikidata
Gerrit-Branch: master
Gerrit-Owner: WikidataBuilder <[email protected]>

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

Reply via email to