WikidataBuilder has uploaded a new change for review.

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

Change subject: New Wikidata Build - 2016-10-09T10:00:01+0000
......................................................................

New Wikidata Build - 2016-10-09T10:00:01+0000

Change-Id: I6ca9fee5ad88cc185357d1de0aa1a8a1491e1940
---
M composer.lock
M 
extensions/Wikibase/client/includes/DataAccess/DataAccessSnakFormatterFactory.php
M 
extensions/Wikibase/client/includes/DataAccess/Scribunto/Scribunto_LuaWikibaseEntityLibrary.php
M extensions/Wikibase/client/includes/Usage/Sql/SqlSubscriptionManager.php
M extensions/Wikibase/client/includes/WikibaseClient.php
M 
extensions/Wikibase/client/tests/phpunit/includes/DataAccess/DataAccessSnakFormatterFactoryTest.php
M 
extensions/Wikibase/client/tests/phpunit/includes/DataAccess/DataAccessSnakFormatterOutputFormatTest.php
M 
extensions/Wikibase/client/tests/phpunit/includes/DataAccess/PropertyParserFunction/StatementGroupRendererFactoryTest.php
A 
extensions/Wikibase/lib/includes/Formatters/BinaryOptionDispatchingSnakFormatter.php
A 
extensions/Wikibase/lib/tests/phpunit/Formatters/BinaryOptionDispatchingSnakFormatterTest.php
M extensions/Wikibase/repo/includes/Hooks/InfoActionHookHandler.php
M extensions/Wikibase/repo/includes/Store/Sql/SqlSubscriptionLookup.php
M vendor/composer/autoload_classmap.php
M vendor/composer/installed.json
14 files changed, 303 insertions(+), 26 deletions(-)


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

diff --git a/composer.lock b/composer.lock
index 712468b..5f668ed 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1574,12 +1574,12 @@
             "source": {
                 "type": "git",
                 "url": 
"https://github.com/wikimedia/mediawiki-extensions-Wikibase.git";,
-                "reference": "826b84b61b770fac3e247ac85668bebe19adb4ac"
+                "reference": "469b03bf8052e1c284816f296f0cc95ed485df02"
             },
             "dist": {
                 "type": "zip",
-                "url": 
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/826b84b61b770fac3e247ac85668bebe19adb4ac";,
-                "reference": "826b84b61b770fac3e247ac85668bebe19adb4ac",
+                "url": 
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/469b03bf8052e1c284816f296f0cc95ed485df02";,
+                "reference": "469b03bf8052e1c284816f296f0cc95ed485df02",
                 "shasum": ""
             },
             "require": {
@@ -1653,7 +1653,7 @@
                 "wikibaserepo",
                 "wikidata"
             ],
-            "time": "2016-10-06 22:47:40"
+            "time": "2016-10-07 15:30:44"
         },
         {
             "name": "wikibase/wikimedia-badges",
diff --git 
a/extensions/Wikibase/client/includes/DataAccess/DataAccessSnakFormatterFactory.php
 
b/extensions/Wikibase/client/includes/DataAccess/DataAccessSnakFormatterFactory.php
index 6d968f0..ddb7dd0 100644
--- 
a/extensions/Wikibase/client/includes/DataAccess/DataAccessSnakFormatterFactory.php
+++ 
b/extensions/Wikibase/client/includes/DataAccess/DataAccessSnakFormatterFactory.php
@@ -6,7 +6,10 @@
 use ValueFormatters\FormatterOptions;
 use Wikibase\Client\Usage\UsageAccumulator;
 use Wikibase\Client\Usage\UsageTrackingSnakFormatter;
+use Wikibase\DataModel\Services\Lookup\PropertyDataTypeLookup;
 use Wikibase\LanguageFallbackChainFactory;
+use Wikibase\Lib\BinaryOptionDispatchingSnakFormatter;
+use Wikibase\Lib\EscapingSnakFormatter;
 use Wikibase\Lib\FormatterLabelDescriptionLookupFactory;
 use Wikibase\Lib\OutputFormatSnakFormatterFactory;
 use Wikibase\Lib\SnakFormatter;
@@ -34,15 +37,23 @@
        private $snakFormatterFactory;
 
        /**
+        * @var PropertyDataTypeLookup
+        */
+       private $propertyDataTypeLookup;
+
+       /**
         * @param LanguageFallbackChainFactory $languageFallbackChainFactory
         * @param OutputFormatSnakFormatterFactory $snakFormatterFactory
+        * @param PropertyDataTypeLookup $propertyDataTypeLookup
         */
        public function __construct(
                LanguageFallbackChainFactory $languageFallbackChainFactory,
-               OutputFormatSnakFormatterFactory $snakFormatterFactory
+               OutputFormatSnakFormatterFactory $snakFormatterFactory,
+               PropertyDataTypeLookup $propertyDataTypeLookup
        ) {
                $this->languageFallbackChainFactory = 
$languageFallbackChainFactory;
                $this->snakFormatterFactory = $snakFormatterFactory;
+               $this->propertyDataTypeLookup = $propertyDataTypeLookup;
        }
 
        /**
@@ -65,14 +76,41 @@
                        SnakFormatter::OPT_LANG => $language->getCode(),
                ] );
 
+               $snakFormatter = $this->getSnakFormatterForOptions( $options );
+
                return new UsageTrackingSnakFormatter(
-                       $this->snakFormatterFactory->getSnakFormatter(
-                               SnakFormatter::FORMAT_WIKI,
-                               $options
-                       ),
+                       $snakFormatter,
                        $usageAccumulator,
                        $fallbackChain->getFetchLanguageCodes()
                );
        }
 
+       /**
+        * Our output format is basically wikitext escaped plain text, except
+        * for URLs, these are not wikitext escaped.
+        *
+        * @param FormatterOptions $options
+        * @return BinaryOptionDispatchingSnakFormatter
+        */
+       private function getSnakFormatterForOptions( FormatterOptions $options 
) {
+               $plainTextSnakFormatter = 
$this->snakFormatterFactory->getSnakFormatter(
+                       SnakFormatter::FORMAT_PLAIN,
+                       $options
+               );
+
+               $escapingSnakFormatter = new EscapingSnakFormatter(
+                       SnakFormatter::FORMAT_PLAIN,
+                       $plainTextSnakFormatter,
+                       'wfEscapeWikiText'
+               );
+
+               return new BinaryOptionDispatchingSnakFormatter(
+                       SnakFormatter::FORMAT_PLAIN,
+                       $this->propertyDataTypeLookup,
+                       $plainTextSnakFormatter,
+                       $escapingSnakFormatter,
+                       [ 'url' ]
+               );
+       }
+
 }
diff --git 
a/extensions/Wikibase/client/includes/DataAccess/Scribunto/Scribunto_LuaWikibaseEntityLibrary.php
 
b/extensions/Wikibase/client/includes/DataAccess/Scribunto/Scribunto_LuaWikibaseEntityLibrary.php
index 3f555a3..92117df 100644
--- 
a/extensions/Wikibase/client/includes/DataAccess/Scribunto/Scribunto_LuaWikibaseEntityLibrary.php
+++ 
b/extensions/Wikibase/client/includes/DataAccess/Scribunto/Scribunto_LuaWikibaseEntityLibrary.php
@@ -6,16 +6,12 @@
 use Language;
 use Scribunto_LuaLibraryBase;
 use ScribuntoException;
-use ValueFormatters\FormatterOptions;
 use Wikibase\Client\Usage\ParserOutputUsageAccumulator;
-use Wikibase\Client\Usage\UsageTrackingSnakFormatter;
 use Wikibase\Client\WikibaseClient;
 use Wikibase\Client\DataAccess\PropertyIdResolver;
 use Wikibase\Client\DataAccess\SnaksFinder;
 use Wikibase\Client\DataAccess\StatementTransclusionInteractor;
 use Wikibase\Client\PropertyLabelNotResolvedException;
-use Wikibase\Lib\SnakFormatter;
-use Wikibase\Lib\FormatterLabelDescriptionLookupFactory;
 
 /**
  * Registers and defines functions to access Wikibase through the Scribunto 
extension
diff --git 
a/extensions/Wikibase/client/includes/Usage/Sql/SqlSubscriptionManager.php 
b/extensions/Wikibase/client/includes/Usage/Sql/SqlSubscriptionManager.php
index 18381c0..af2fffc 100644
--- a/extensions/Wikibase/client/includes/Usage/Sql/SqlSubscriptionManager.php
+++ b/extensions/Wikibase/client/includes/Usage/Sql/SqlSubscriptionManager.php
@@ -6,7 +6,6 @@
 use DBError;
 use Exception;
 use InvalidArgumentException;
-use ResultWrapper;
 use Wikibase\Client\Store\Sql\ConsistentReadConnectionManager;
 use Wikibase\Client\Usage\SubscriptionManager;
 use Wikibase\Client\Usage\UsageTrackerException;
diff --git a/extensions/Wikibase/client/includes/WikibaseClient.php 
b/extensions/Wikibase/client/includes/WikibaseClient.php
index 9810ae8..135d726 100644
--- a/extensions/Wikibase/client/includes/WikibaseClient.php
+++ b/extensions/Wikibase/client/includes/WikibaseClient.php
@@ -1068,7 +1068,8 @@
        public function getDataAccessSnakFormatterFactory() {
                return new DataAccessSnakFormatterFactory(
                        $this->getLanguageFallbackChainFactory(),
-                       $this->getSnakFormatterFactory()
+                       $this->getSnakFormatterFactory(),
+                       $this->getPropertyDataTypeLookup()
                );
        }
 
diff --git 
a/extensions/Wikibase/client/tests/phpunit/includes/DataAccess/DataAccessSnakFormatterFactoryTest.php
 
b/extensions/Wikibase/client/tests/phpunit/includes/DataAccess/DataAccessSnakFormatterFactoryTest.php
index ef99cd7..973645d 100644
--- 
a/extensions/Wikibase/client/tests/phpunit/includes/DataAccess/DataAccessSnakFormatterFactoryTest.php
+++ 
b/extensions/Wikibase/client/tests/phpunit/includes/DataAccess/DataAccessSnakFormatterFactoryTest.php
@@ -7,12 +7,15 @@
 use ValueFormatters\FormatterOptions;
 use Wikibase\Client\DataAccess\DataAccessSnakFormatterFactory;
 use Wikibase\Client\Usage\UsageAccumulator;
+use Wikibase\DataModel\Services\Lookup\PropertyDataTypeLookup;
 use Wikibase\LanguageFallbackChainFactory;
 use Wikibase\Lib\OutputFormatSnakFormatterFactory;
 use Wikibase\Lib\SnakFormatter;
 
 /**
  * @covers Wikibase\Client\DataAccess\DataAccessSnakFormatterFactory
+ *
+ * @note We also have integration tests for this at 
DataAccessSnakFormatterOutputFormatTest.
  *
  * @group Wikibase
  * @group WikibaseClient
@@ -26,7 +29,8 @@
        private function getDataAccessSnakFormatterFactory() {
                return new DataAccessSnakFormatterFactory(
                        $this->getLanguageFallbackChainFactory(),
-                       $this->getOutputFormatSnakFormatterFactory()
+                       $this->getOutputFormatSnakFormatterFactory(),
+                       $this->getMock( PropertyDataTypeLookup::class )
                );
        }
 
@@ -56,7 +60,7 @@
 
                $factory->expects( $this->once() )
                        ->method( 'getSnakFormatter' )
-                       ->with( SnakFormatter::FORMAT_WIKI, 
$this->isInstanceOf( FormatterOptions::class ) )
+                       ->with( SnakFormatter::FORMAT_PLAIN, 
$this->isInstanceOf( FormatterOptions::class ) )
                        ->will( $this->returnValue( $this->getMock( 
SnakFormatter::class ) ) );
 
                return $factory;
diff --git 
a/extensions/Wikibase/client/tests/phpunit/includes/DataAccess/DataAccessSnakFormatterOutputFormatTest.php
 
b/extensions/Wikibase/client/tests/phpunit/includes/DataAccess/DataAccessSnakFormatterOutputFormatTest.php
index 8220fd4..bcec5b3 100644
--- 
a/extensions/Wikibase/client/tests/phpunit/includes/DataAccess/DataAccessSnakFormatterOutputFormatTest.php
+++ 
b/extensions/Wikibase/client/tests/phpunit/includes/DataAccess/DataAccessSnakFormatterOutputFormatTest.php
@@ -185,6 +185,13 @@
                                        new StringValue( 'abc' )
                                )
                        ],
+                       'external-id including wikitext' => [
+                               wfEscapeWikiText( 'a [[b]] c' ),
+                               new PropertyValueSnak(
+                                       new PropertyId( 'P8' ),
+                                       new StringValue( 'a [[b]] c' )
+                               )
+                       ],
                        'wikibase-item (wikibase-entityid)' => [
                                wfEscapeWikiText( 'label [[with]] wikitext' ),
                                new PropertyValueSnak(
diff --git 
a/extensions/Wikibase/client/tests/phpunit/includes/DataAccess/PropertyParserFunction/StatementGroupRendererFactoryTest.php
 
b/extensions/Wikibase/client/tests/phpunit/includes/DataAccess/PropertyParserFunction/StatementGroupRendererFactoryTest.php
index 49789c6..f36c3b3 100644
--- 
a/extensions/Wikibase/client/tests/phpunit/includes/DataAccess/PropertyParserFunction/StatementGroupRendererFactoryTest.php
+++ 
b/extensions/Wikibase/client/tests/phpunit/includes/DataAccess/PropertyParserFunction/StatementGroupRendererFactoryTest.php
@@ -22,6 +22,7 @@
 use Wikibase\DataModel\Entity\ItemId;
 use Wikibase\DataModel\Entity\PropertyId;
 use Wikibase\DataModel\Services\Lookup\EntityLookup;
+use Wikibase\DataModel\Services\Lookup\PropertyDataTypeLookup;
 use Wikibase\DataModel\Snak\PropertyValueSnak;
 use Wikibase\DataModel\Statement\StatementListProvider;
 use Wikibase\LanguageFallbackChainFactory;
@@ -155,7 +156,8 @@
                        $this->getMock( EntityLookup::class ),
                        new DataAccessSnakFormatterFactory(
                                $this->getLanguageFallbackChainFactory(),
-                               $formatterFactory
+                               $formatterFactory,
+                               $this->getMock( PropertyDataTypeLookup::class )
                        ),
                        $allowDataAccessInUserLanguage
                );
@@ -176,7 +178,8 @@
                        $this->getEntityLookup(),
                        new DataAccessSnakFormatterFactory(
                                $this->getLanguageFallbackChainFactory(),
-                               $this->getSnakFormatterFactory()
+                               $this->getSnakFormatterFactory(),
+                               $this->getMock( PropertyDataTypeLookup::class )
                        ),
                        $allowDataAccessInUserLanguage
                );
diff --git 
a/extensions/Wikibase/lib/includes/Formatters/BinaryOptionDispatchingSnakFormatter.php
 
b/extensions/Wikibase/lib/includes/Formatters/BinaryOptionDispatchingSnakFormatter.php
new file mode 100644
index 0000000..533a626
--- /dev/null
+++ 
b/extensions/Wikibase/lib/includes/Formatters/BinaryOptionDispatchingSnakFormatter.php
@@ -0,0 +1,117 @@
+<?php
+
+namespace Wikibase\Lib;
+
+use ValueFormatters\FormattingException;
+use Wikibase\DataModel\Services\Lookup\PropertyDataTypeLookup;
+use Wikibase\DataModel\Services\Lookup\PropertyDataTypeLookupException;
+use Wikibase\DataModel\Snak\Snak;
+use Wikimedia\Assert\Assert;
+
+/**
+ * Dispatching snak formatter that makes it possible to special case certain
+ * Snaks based on the associated property's data type. Depending on that
+ * data type, we choose between a "special" SnakFormatter and a generic one.
+ *
+ * @license GPL-2.0+
+ * @author Marius Hoch
+ */
+class BinaryOptionDispatchingSnakFormatter implements SnakFormatter {
+
+       /**
+        * @var string One of the SnakFormatter::FORMAT_... constants.
+        */
+       private $format;
+
+       /**
+        * @var PropertyDataTypeLookup
+        */
+       private $dataTypeLookup;
+
+       /**
+        * @var SnakFormatter
+        */
+       private $specialCaseSnakFormatter;
+
+       /**
+        * @var SnakFormatter
+        */
+       private $fallbackSnakFormatter;
+
+       /**
+        * @var string[]
+        */
+       private $specialCasedPropertyDataTypes;
+
+       /**
+        * @param string $format One of the SnakFormatter::FORMAT_... constants.
+        * @param PropertyDataTypeLookup $dataTypeLookup
+        * @param SnakFormatter $specialCaseSnakFormatter Snak formatter to use 
for
+        *     Snaks with a property data type in 
$specialCasedPropertyDataTypes.
+        * @param SnakFormatter $fallbackSnakFormatter
+        * @param array $specialCasedPropertyDataTypes
+        */
+       public function __construct(
+               $format,
+               PropertyDataTypeLookup $dataTypeLookup,
+               SnakFormatter $specialCaseSnakFormatter,
+               SnakFormatter $fallbackSnakFormatter,
+               array $specialCasedPropertyDataTypes
+       ) {
+               Assert::parameterType( 'string', $format, '$format' );
+               Assert::parameterElementType(
+                       'string',
+                       $specialCasedPropertyDataTypes,
+                       '$specialCasedPropertyDataTypes'
+               );
+
+               $this->format = $format;
+               $this->dataTypeLookup = $dataTypeLookup;
+               $this->specialCaseSnakFormatter = $specialCaseSnakFormatter;
+               $this->fallbackSnakFormatter = $fallbackSnakFormatter;
+               $this->specialCasedPropertyDataTypes = 
$specialCasedPropertyDataTypes;
+       }
+
+       /**
+        * @param Snak $snak
+        *
+        * @throws PropertyDataTypeLookupException
+        * @return string The Snak's data type
+        */
+       private function getSnakDataType( Snak $snak ) {
+               return $this->dataTypeLookup->getDataTypeIdForProperty( 
$snak->getPropertyId() );
+               // @todo: wrap the PropertyDataTypeLookupException, but make 
sure ErrorHandlingSnakFormatter still handles it.
+       }
+
+       /**
+        * @see SnakFormatter::formatSnak
+        *
+        * @param Snak $snak
+        *
+        * @throws FormattingException
+        * @throws PropertyDataTypeLookupException
+        * @return string The formatted snak value, in the format specified by 
getFormat().
+        */
+       public function formatSnak( Snak $snak ) {
+               $snakType = $snak->getType();
+
+               if ( $snakType === 'value' ) {
+                       $dataType = $this->getSnakDataType( $snak );
+                       if ( in_array( $dataType, 
$this->specialCasedPropertyDataTypes ) ) {
+                               return 
$this->specialCaseSnakFormatter->formatSnak( $snak );
+                       }
+               }
+
+               return $this->fallbackSnakFormatter->formatSnak( $snak );
+       }
+
+       /**
+        * @see SnakFormatter::getFormat
+        *
+        * @return string One of the SnakFormatter::FORMAT_... constants.
+        */
+       public function getFormat() {
+               return $this->format;
+       }
+
+}
diff --git 
a/extensions/Wikibase/lib/tests/phpunit/Formatters/BinaryOptionDispatchingSnakFormatterTest.php
 
b/extensions/Wikibase/lib/tests/phpunit/Formatters/BinaryOptionDispatchingSnakFormatterTest.php
new file mode 100644
index 0000000..f789bb2
--- /dev/null
+++ 
b/extensions/Wikibase/lib/tests/phpunit/Formatters/BinaryOptionDispatchingSnakFormatterTest.php
@@ -0,0 +1,114 @@
+<?php
+
+namespace Wikibase\Lib\Test;
+
+use PHPUnit_Framework_TestCase;
+use DataValues\DataValue;
+use Wikibase\DataModel\Entity\PropertyId;
+use Wikibase\DataModel\Services\Lookup\PropertyDataTypeLookup;
+use Wikibase\DataModel\Snak\PropertyNoValueSnak;
+use Wikibase\DataModel\Snak\PropertySomeValueSnak;
+use Wikibase\DataModel\Snak\PropertyValueSnak;
+use Wikibase\DataModel\Snak\Snak;
+use Wikibase\Lib\BinaryOptionDispatchingSnakFormatter;
+use Wikibase\Lib\SnakFormatter;
+
+/**
+ * @covers Wikibase\Lib\BinaryOptionDispatchingSnakFormatterTest
+ *
+ * @group SnakFormatters
+ * @group DataValueExtensions
+ * @group WikibaseLib
+ * @group Wikibase
+ *
+ * @license GPL-2.0+
+ * @author Marius Hoch
+ */
+class BinaryOptionDispatchingSnakFormatterTest extends 
PHPUnit_Framework_TestCase {
+
+       /**
+        * @dataProvider formatSnakProvider
+        */
+       public function testFormatSnak(
+               Snak $snak,
+               $specialHandling
+       ) {
+               $formatter = new BinaryOptionDispatchingSnakFormatter(
+                       'text/whatever',
+                       $this->getPropertyDataTypeLookup(),
+                       $this->getSnakFormatter( $specialHandling ? 1 : 0, 'a' 
),
+                       $this->getSnakFormatter( $specialHandling ? 0 : 1, 'b' 
),
+                       [ 'sdfd', 'special', 'dsfd' ]
+               );
+
+               $this->assertSame(
+                       $specialHandling ? 'a' : 'b',
+                       $formatter->formatSnak( $snak )
+               );
+       }
+
+       public function formatSnakProvider() {
+               $pSpecial = new PropertyId( 'P1' );
+               $pRegular = new PropertyId( 'P2' );
+
+               return [
+                       'PropertyNoValueSnak gets fallback treatment always' => 
[
+                               new PropertyNoValueSnak( $pSpecial ),
+                               false
+                       ],
+                       'PropertySomeValueSnak gets fallback treatment always' 
=> [
+                               new PropertySomeValueSnak( $pSpecial ),
+                               false
+                       ],
+                       'PropertyValueSnak with special treatment' => [
+                               new PropertyValueSnak( $pSpecial, 
$this->getMock( DataValue::class ) ),
+                               true
+                       ],
+                       'PropertyValueSnak without special treatment' => [
+                               new PropertyValueSnak( $pRegular, 
$this->getMock( DataValue::class ) ),
+                               false
+                       ]
+               ];
+       }
+
+       public function testGetFormat() {
+               $formatter = new BinaryOptionDispatchingSnakFormatter(
+                       'text/whatever',
+                       $this->getMock( PropertyDataTypeLookup::class ),
+                       $this->getMock( SnakFormatter::class ),
+                       $this->getMock( SnakFormatter::class ),
+                       []
+               );
+
+               $this->assertSame( 'text/whatever', $formatter->getFormat() );
+       }
+
+       private function getSnakFormatter( $expectedCallCount, $result = '' ) {
+               $snakFormatter = $this->getMock( SnakFormatter::class );
+               $snakFormatter->expects( $this->exactly( $expectedCallCount ) )
+                       ->method( 'formatSnak' )
+                       ->with( $this->isInstanceOf( Snak::class ) )
+                       ->will( $this->returnValue( $result ) );
+
+               return $snakFormatter;
+       }
+
+       private function getPropertyDataTypeLookup() {
+               $propertyDataTypeLookup = $this->getMock( 
PropertyDataTypeLookup::class );
+               $propertyDataTypeLookup->expects( $this->any() )
+                       ->method( 'getDataTypeIdForProperty' )
+                       ->willReturnCallback( function( PropertyId $propertyId 
) {
+                               switch ( $propertyId->getSerialization() ) {
+                                       case 'P1':
+                                               return 'special';
+                                       case 'P2':
+                                               return 'something';
+                                       default:
+                                               $this->fail( 'Unexpcted 
PropertyId' );
+                               }
+                       } );
+
+               return $propertyDataTypeLookup;
+       }
+
+}
diff --git a/extensions/Wikibase/repo/includes/Hooks/InfoActionHookHandler.php 
b/extensions/Wikibase/repo/includes/Hooks/InfoActionHookHandler.php
index afeb3eb..a63a2fe 100644
--- a/extensions/Wikibase/repo/includes/Hooks/InfoActionHookHandler.php
+++ b/extensions/Wikibase/repo/includes/Hooks/InfoActionHookHandler.php
@@ -8,11 +8,9 @@
 use MediaWiki\Linker\LinkRenderer;
 use SiteLookup;
 use Title;
-use Wikibase\DataModel\SiteLink;
 use Wikibase\Store\Sql\SqlSubscriptionLookup;
 use Wikibase\Store\EntityIdLookup;
 use Wikibase\Lib\Store\EntityNamespaceLookup;
-use Wikibase\NamespaceChecker;
 
 /**
  * @since 0.5
diff --git 
a/extensions/Wikibase/repo/includes/Store/Sql/SqlSubscriptionLookup.php 
b/extensions/Wikibase/repo/includes/Store/Sql/SqlSubscriptionLookup.php
index bad3eee..bc5b38d 100644
--- a/extensions/Wikibase/repo/includes/Store/Sql/SqlSubscriptionLookup.php
+++ b/extensions/Wikibase/repo/includes/Store/Sql/SqlSubscriptionLookup.php
@@ -4,7 +4,6 @@
 
 use DatabaseBase;
 use LoadBalancer;
-use ResultWrapper;
 use Wikibase\DataModel\Entity\EntityId;
 use Wikibase\Store\SubscriptionLookup;
 
diff --git a/vendor/composer/autoload_classmap.php 
b/vendor/composer/autoload_classmap.php
index bbfa53b..223957f 100644
--- a/vendor/composer/autoload_classmap.php
+++ b/vendor/composer/autoload_classmap.php
@@ -783,6 +783,7 @@
     'Wikibase\\LibHooks' => $baseDir . 
'/extensions/Wikibase/lib/WikibaseLib.hooks.php',
     'Wikibase\\Lib\\AutoCommentFormatter' => $baseDir . 
'/extensions/Wikibase/lib/includes/Formatters/AutoCommentFormatter.php',
     'Wikibase\\Lib\\BaseUnitStorage' => $baseDir . 
'/extensions/Wikibase/lib/includes/Units/BaseUnitStorage.php',
+    'Wikibase\\Lib\\BinaryOptionDispatchingSnakFormatter' => $baseDir . 
'/extensions/Wikibase/lib/includes/Formatters/BinaryOptionDispatchingSnakFormatter.php',
     'Wikibase\\Lib\\CSVUnitStorage' => $baseDir . 
'/extensions/Wikibase/lib/includes/Units/CSVUnitStorage.php',
     'Wikibase\\Lib\\Changes\\EntityChangeFactory' => $baseDir . 
'/extensions/Wikibase/lib/includes/Changes/EntityChangeFactory.php',
     'Wikibase\\Lib\\CommonsLinkFormatter' => $baseDir . 
'/extensions/Wikibase/lib/includes/Formatters/CommonsLinkFormatter.php',
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index 58cdec2..6608d28 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -1348,12 +1348,12 @@
         "source": {
             "type": "git",
             "url": 
"https://github.com/wikimedia/mediawiki-extensions-Wikibase.git";,
-            "reference": "826b84b61b770fac3e247ac85668bebe19adb4ac"
+            "reference": "469b03bf8052e1c284816f296f0cc95ed485df02"
         },
         "dist": {
             "type": "zip",
-            "url": 
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/826b84b61b770fac3e247ac85668bebe19adb4ac";,
-            "reference": "826b84b61b770fac3e247ac85668bebe19adb4ac",
+            "url": 
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/469b03bf8052e1c284816f296f0cc95ed485df02";,
+            "reference": "469b03bf8052e1c284816f296f0cc95ed485df02",
             "shasum": ""
         },
         "require": {
@@ -1386,7 +1386,7 @@
             "jakub-onderka/php-parallel-lint": "0.9.2",
             "mediawiki/mediawiki-codesniffer": "0.4.0|0.5.0"
         },
-        "time": "2016-10-06 22:47:40",
+        "time": "2016-10-07 15:30:44",
         "type": "mediawiki-extension",
         "installation-source": "dist",
         "autoload": {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6ca9fee5ad88cc185357d1de0aa1a8a1491e1940
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikidata
Gerrit-Branch: master
Gerrit-Owner: WikidataBuilder <wikidata-servi...@wikimedia.de>

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

Reply via email to