Jeroen De Dauw has uploaded a new change for review.
https://gerrit.wikimedia.org/r/161682
Change subject: Use the moved version of PropertyDataTypeLookup and
InMemoryDataTypeLookup
......................................................................
Use the moved version of PropertyDataTypeLookup and InMemoryDataTypeLookup
Change-Id: I69d9df29540e4f2090896eb10c5c9cc478762606
---
M client/includes/WikibaseClient.php
M client/tests/phpunit/includes/WikibaseClientTest.php
M lib/includes/EntityRetrievingDataTypeLookup.php
D lib/includes/InMemoryDataTypeLookup.php
D lib/includes/PropertyDataTypeLookup.php
M lib/includes/PropertyInfoDataTypeLookup.php
M lib/includes/SnakConstructionService.php
M lib/includes/ValuesFinder.php
M lib/includes/formatters/PropertyValueSnakFormatter.php
M lib/includes/formatters/WikibaseSnakFormatterBuilders.php
M lib/includes/serializers/SerializerFactory.php
M lib/includes/serializers/SnakSerializer.php
D lib/tests/phpunit/InMemoryDataTypeLookupTest.php
M lib/tests/phpunit/MockRepository.php
M lib/tests/phpunit/PropertyInfoDataTypeLookupTest.php
M lib/tests/phpunit/SnakConstructionServiceTest.php
M lib/tests/phpunit/ValuesFinderTest.php
M lib/tests/phpunit/formatters/OutputFormatSnakFormatterFactoryTest.php
M lib/tests/phpunit/formatters/PropertyValueSnakFormatterTest.php
M lib/tests/phpunit/formatters/WikibaseSnakFormatterBuildersTest.php
M lib/tests/phpunit/serializers/SnakSerializerTest.php
M repo/includes/EntityParserOutputGenerator.php
M repo/includes/Validators/SnakValidator.php
M repo/includes/WikibaseRepo.php
M repo/includes/api/ApiHelperFactory.php
M repo/includes/api/ApiWikibase.php
M repo/tests/phpunit/includes/ChangeOp/ChangeOpTestMockProvider.php
M repo/tests/phpunit/includes/EntityParserOutputGeneratorTest.php
M repo/tests/phpunit/includes/LinkedData/EntityDataRequestHandlerTest.php
M repo/tests/phpunit/includes/LinkedData/EntityDataSerializationServiceTest.php
M repo/tests/phpunit/includes/Validators/SnakValidatorTest.php
M repo/tests/phpunit/includes/WikibaseRepoTest.php
M repo/tests/phpunit/includes/api/ApiHelperFactoryTest.php
M repo/tests/phpunit/includes/api/GetClaimsTest.php
M repo/tests/phpunit/includes/api/ResultBuilderTest.php
M repo/tests/phpunit/includes/specials/SpecialEntityDataTest.php
36 files changed, 38 insertions(+), 175 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/82/161682/1
diff --git a/client/includes/WikibaseClient.php
b/client/includes/WikibaseClient.php
index 045f148..2e7be7c 100644
--- a/client/includes/WikibaseClient.php
+++ b/client/includes/WikibaseClient.php
@@ -36,7 +36,7 @@
use Wikibase\Lib\EntityRetrievingDataTypeLookup;
use Wikibase\Lib\OutputFormatSnakFormatterFactory;
use Wikibase\Lib\OutputFormatValueFormatterFactory;
-use Wikibase\Lib\PropertyDataTypeLookup;
+use Wikibase\DataModel\Entity\PropertyDataTypeLookup;
use Wikibase\Lib\PropertyInfoDataTypeLookup;
use Wikibase\Lib\Serializers\ForbiddenSerializer;
use Wikibase\Lib\SnakFormatter;
diff --git a/client/tests/phpunit/includes/WikibaseClientTest.php
b/client/tests/phpunit/includes/WikibaseClientTest.php
index a8fa543..f677e16 100644
--- a/client/tests/phpunit/includes/WikibaseClientTest.php
+++ b/client/tests/phpunit/includes/WikibaseClientTest.php
@@ -42,7 +42,7 @@
public function testGetPropertyDataTypeLookupReturnType() {
$returnValue =
$this->getDefaultInstance()->getPropertyDataTypeLookup();
- $this->assertInstanceOf( 'Wikibase\Lib\PropertyDataTypeLookup',
$returnValue );
+ $this->assertInstanceOf(
'Wikibase\DataModel\Entity\PropertyDataTypeLookup', $returnValue );
}
public function testNewSnakFormatterReturnType() {
diff --git a/lib/includes/EntityRetrievingDataTypeLookup.php
b/lib/includes/EntityRetrievingDataTypeLookup.php
index 6413682..73c89cb 100644
--- a/lib/includes/EntityRetrievingDataTypeLookup.php
+++ b/lib/includes/EntityRetrievingDataTypeLookup.php
@@ -3,6 +3,7 @@
namespace Wikibase\Lib;
use Wikibase\DataModel\Entity\Property;
+use Wikibase\DataModel\Entity\PropertyDataTypeLookup;
use Wikibase\DataModel\Entity\PropertyId;
use Wikibase\Lib\Store\EntityLookup;
diff --git a/lib/includes/InMemoryDataTypeLookup.php
b/lib/includes/InMemoryDataTypeLookup.php
deleted file mode 100644
index 51031c3..0000000
--- a/lib/includes/InMemoryDataTypeLookup.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-
-namespace Wikibase\Lib;
-
-use InvalidArgumentException;
-use Wikibase\DataModel\Entity\PropertyId;
-
-/**
- * PropertyDataTypeLookup that uses an in memory array to retrieve the
requested information.
- * If the information is not set when requested an exception is thrown.
- * This class can be used as a mock in tests.
- *
- * @since 0.4
- *
- * @licence GNU GPL v2+
- * @author Jeroen De Dauw < jeroended...@gmail.com >
- */
-class InMemoryDataTypeLookup implements PropertyDataTypeLookup {
-
- private $dataTypeIds = array();
-
- /**
- * @since 0.4
- *
- * @param PropertyId $propertyId
- *
- * @return string
- * @throws PropertyNotFoundException
- */
- public function getDataTypeIdForProperty( PropertyId $propertyId ) {
- $this->verifyDataTypeIsSet( $propertyId );
-
- return $this->dataTypeIds[$propertyId->getSerialization()];
- }
-
- /**
- * @since 0.4
- *
- * @param PropertyId $propertyId
- * @param string $dataTypeId
- */
- public function setDataTypeForProperty( PropertyId $propertyId,
$dataTypeId ) {
- $this->verifyDataTypeIdType( $dataTypeId );
- $this->dataTypeIds[$propertyId->getSerialization()] =
$dataTypeId;
- }
-
- private function verifyDataTypeIsSet( PropertyId $propertyId ) {
- $numericId = $propertyId->getSerialization();
-
- if ( !array_key_exists( $numericId, $this->dataTypeIds ) ) {
- throw new PropertyNotFoundException( $propertyId, "The
DataType for property '$numericId' is not set" );
- }
- }
-
- private function verifyDataTypeIdType( $dataTypeId ) {
- if ( !is_string( $dataTypeId ) ) {
- throw new InvalidArgumentException( '$dataTypeId needs
to be a string' );
- }
- }
-
-}
diff --git a/lib/includes/PropertyDataTypeLookup.php
b/lib/includes/PropertyDataTypeLookup.php
deleted file mode 100644
index 2ab55ba..0000000
--- a/lib/includes/PropertyDataTypeLookup.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-
-namespace Wikibase\Lib;
-
-use Wikibase\DataModel\Entity\PropertyId;
-
-/**
- * Interface for objects that can find the if of the DataType
- * for the Property of which the id is given.
- *
- * @since 0.4
- *
- * @licence GNU GPL v2+
- * @author Jeroen De Dauw < jeroended...@gmail.com >
- */
-interface PropertyDataTypeLookup {
-
- /**
- * Returns the DataType for the Property of which the id is given.
- *
- * @since 0.4
- *
- * @param PropertyId $propertyId
- *
- * @return string
- * @throws PropertyNotFoundException
- */
- public function getDataTypeIdForProperty( PropertyId $propertyId );
-
-}
diff --git a/lib/includes/PropertyInfoDataTypeLookup.php
b/lib/includes/PropertyInfoDataTypeLookup.php
index db70b45..15e13b3 100644
--- a/lib/includes/PropertyInfoDataTypeLookup.php
+++ b/lib/includes/PropertyInfoDataTypeLookup.php
@@ -2,6 +2,7 @@
namespace Wikibase\Lib;
+use Wikibase\DataModel\Entity\PropertyDataTypeLookup;
use Wikibase\DataModel\Entity\PropertyId;
use Wikibase\PropertyInfoStore;
diff --git a/lib/includes/SnakConstructionService.php
b/lib/includes/SnakConstructionService.php
index 9e951f8..edc040c 100644
--- a/lib/includes/SnakConstructionService.php
+++ b/lib/includes/SnakConstructionService.php
@@ -7,6 +7,7 @@
use DataValues\IllegalValueException;
use InvalidArgumentException;
use OutOfBoundsException;
+use Wikibase\DataModel\Entity\PropertyDataTypeLookup;
use Wikibase\DataModel\Entity\PropertyId;
use Wikibase\DataModel\Snak\Snak;
use Wikibase\SnakFactory;
diff --git a/lib/includes/ValuesFinder.php b/lib/includes/ValuesFinder.php
index cb46f68..d46e982 100644
--- a/lib/includes/ValuesFinder.php
+++ b/lib/includes/ValuesFinder.php
@@ -2,7 +2,7 @@
namespace Wikibase;
-use Wikibase\Lib\PropertyDataTypeLookup;
+use Wikibase\DataModel\Entity\PropertyDataTypeLookup;
use Wikibase\Lib\PropertyNotFoundException;
/**
diff --git a/lib/includes/formatters/PropertyValueSnakFormatter.php
b/lib/includes/formatters/PropertyValueSnakFormatter.php
index 8c14b08..fc28086 100644
--- a/lib/includes/formatters/PropertyValueSnakFormatter.php
+++ b/lib/includes/formatters/PropertyValueSnakFormatter.php
@@ -11,6 +11,7 @@
use ValueFormatters\Exceptions\MismatchingDataValueTypeException;
use ValueFormatters\FormatterOptions;
use ValueFormatters\FormattingException;
+use Wikibase\DataModel\Entity\PropertyDataTypeLookup;
use Wikibase\DataModel\Snak\PropertyValueSnak;
use Wikibase\DataModel\Snak\Snak;
diff --git a/lib/includes/formatters/WikibaseSnakFormatterBuilders.php
b/lib/includes/formatters/WikibaseSnakFormatterBuilders.php
index 4b86c3a..245b18a 100644
--- a/lib/includes/formatters/WikibaseSnakFormatterBuilders.php
+++ b/lib/includes/formatters/WikibaseSnakFormatterBuilders.php
@@ -5,6 +5,7 @@
use DataTypes\DataTypeFactory;
use ValueFormatters\FormatterOptions;
use ValueFormatters\ValueFormatter;
+use Wikibase\DataModel\Entity\PropertyDataTypeLookup;
/**
* Defines the snak formatters supported by Wikibase.
diff --git a/lib/includes/serializers/SerializerFactory.php
b/lib/includes/serializers/SerializerFactory.php
index 9da572f..0c18925 100644
--- a/lib/includes/serializers/SerializerFactory.php
+++ b/lib/includes/serializers/SerializerFactory.php
@@ -12,7 +12,7 @@
use Wikibase\DataModel\Reference;
use Wikibase\DataModel\Snak\Snak;
use Wikibase\EntityFactory;
-use Wikibase\Lib\PropertyDataTypeLookup;
+use Wikibase\DataModel\Entity\PropertyDataTypeLookup;
/**
* Factory for constructing Serializer and Unserializer objects.
diff --git a/lib/includes/serializers/SnakSerializer.php
b/lib/includes/serializers/SnakSerializer.php
index 2232228..e5dd293 100644
--- a/lib/includes/serializers/SnakSerializer.php
+++ b/lib/includes/serializers/SnakSerializer.php
@@ -7,7 +7,7 @@
use Wikibase\DataModel\Entity\PropertyId;
use Wikibase\DataModel\Snak\PropertyValueSnak;
use Wikibase\DataModel\Snak\Snak;
-use Wikibase\Lib\PropertyDataTypeLookup;
+use Wikibase\DataModel\Entity\PropertyDataTypeLookup;
use Wikibase\Lib\PropertyNotFoundException;
/**
diff --git a/lib/tests/phpunit/InMemoryDataTypeLookupTest.php
b/lib/tests/phpunit/InMemoryDataTypeLookupTest.php
deleted file mode 100644
index 56ca82c..0000000
--- a/lib/tests/phpunit/InMemoryDataTypeLookupTest.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-
-namespace Wikibase\Lib\Test;
-
-use Wikibase\DataModel\Entity\PropertyId;
-use Wikibase\Lib\InMemoryDataTypeLookup;
-
-/**
- * @covers Wikibase\Lib\InMemoryDataTypeLookup
- *
- * @group Wikibase
- * @group WikibaseLib
- * @group DataTypeLookupTest
- *
- * @licence GNU GPL v2+
- * @author Jeroen De Dauw < jeroended...@gmail.com >
- */
-class InMemoryDataTypeLookupTest extends \PHPUnit_Framework_TestCase {
-
- public function testGetDataTypeForPropertyThatIsNotSet() {
- $lookup = new InMemoryDataTypeLookup();
-
- $this->setExpectedException(
'\Wikibase\Lib\PropertyNotFoundException' );
-
- $lookup->getDataTypeIdForProperty( new PropertyId( 'p7201010' )
);
- }
-
- public function testSetAndGetDataType() {
- $propertyId = new PropertyId( 'p7201010' );
-
- $stringTypeId = 'string-datatype';
- $intTypeId = 'integer';
-
- $lookup = new InMemoryDataTypeLookup();
- $lookup->setDataTypeForProperty( $propertyId, $stringTypeId );
-
- $actual = $lookup->getDataTypeIdForProperty( $propertyId );
-
- $this->assertInternalType( 'string', $actual );
-
- $this->assertEquals( $stringTypeId, $actual );
-
- $lookup->setDataTypeForProperty( $propertyId, $intTypeId );
-
- $actual = $lookup->getDataTypeIdForProperty( $propertyId );
-
- $this->assertNotEquals( $stringTypeId, $actual );
- $this->assertEquals( $intTypeId, $actual );
- }
-
-}
diff --git a/lib/tests/phpunit/MockRepository.php
b/lib/tests/phpunit/MockRepository.php
index 74709d0..f452bef 100644
--- a/lib/tests/phpunit/MockRepository.php
+++ b/lib/tests/phpunit/MockRepository.php
@@ -12,10 +12,10 @@
use Wikibase\DataModel\Entity\Item;
use Wikibase\DataModel\Entity\ItemId;
use Wikibase\DataModel\Entity\Property;
+use Wikibase\DataModel\Entity\PropertyDataTypeLookup;
use Wikibase\DataModel\Entity\PropertyId;
use Wikibase\DataModel\SiteLink;
use Wikibase\EntityRevision;
-use Wikibase\Lib\PropertyDataTypeLookup;
use Wikibase\Lib\PropertyNotFoundException;
use Wikibase\Lib\Store\EntityInfoBuilderFactory;
use Wikibase\Lib\Store\EntityLookup;
diff --git a/lib/tests/phpunit/PropertyInfoDataTypeLookupTest.php
b/lib/tests/phpunit/PropertyInfoDataTypeLookupTest.php
index 3780514..36692a1 100644
--- a/lib/tests/phpunit/PropertyInfoDataTypeLookupTest.php
+++ b/lib/tests/phpunit/PropertyInfoDataTypeLookupTest.php
@@ -5,7 +5,7 @@
use Wikibase\DataModel\Entity\Property;
use Wikibase\DataModel\Entity\PropertyId;
use Wikibase\Lib\EntityRetrievingDataTypeLookup;
-use Wikibase\Lib\PropertyDataTypeLookup;
+use Wikibase\DataModel\Entity\PropertyDataTypeLookup;
use Wikibase\Lib\PropertyInfoDataTypeLookup;
use Wikibase\PropertyInfoStore;
use Wikibase\Test\MockPropertyInfoStore;
diff --git a/lib/tests/phpunit/SnakConstructionServiceTest.php
b/lib/tests/phpunit/SnakConstructionServiceTest.php
index 685f623..91c26f5 100644
--- a/lib/tests/phpunit/SnakConstructionServiceTest.php
+++ b/lib/tests/phpunit/SnakConstructionServiceTest.php
@@ -5,8 +5,8 @@
use DataTypes\DataType;
use DataTypes\DataTypeFactory;
use DataValues\DataValueFactory;
+use Wikibase\DataModel\Entity\InMemoryDataTypeLookup;
use Wikibase\DataModel\Entity\PropertyId;
-use Wikibase\Lib\InMemoryDataTypeLookup;
use Wikibase\Lib\SnakConstructionService;
use Wikibase\SnakFactory;
diff --git a/lib/tests/phpunit/ValuesFinderTest.php
b/lib/tests/phpunit/ValuesFinderTest.php
index 32eace2..fee36e4 100644
--- a/lib/tests/phpunit/ValuesFinderTest.php
+++ b/lib/tests/phpunit/ValuesFinderTest.php
@@ -5,12 +5,12 @@
use DataValues\BooleanValue;
use DataValues\DataValue;
use DataValues\StringValue;
+use Wikibase\DataModel\Entity\InMemoryDataTypeLookup;
use Wikibase\DataModel\Entity\PropertyId;
use Wikibase\DataModel\Snak\PropertyNoValueSnak;
use Wikibase\DataModel\Snak\PropertySomeValueSnak;
use Wikibase\DataModel\Snak\PropertyValueSnak;
use Wikibase\DataModel\Snak\Snak;
-use Wikibase\Lib\InMemoryDataTypeLookup;
use Wikibase\ValuesFinder;
/**
diff --git
a/lib/tests/phpunit/formatters/OutputFormatSnakFormatterFactoryTest.php
b/lib/tests/phpunit/formatters/OutputFormatSnakFormatterFactoryTest.php
index 55b3d40..85dab6b 100644
--- a/lib/tests/phpunit/formatters/OutputFormatSnakFormatterFactoryTest.php
+++ b/lib/tests/phpunit/formatters/OutputFormatSnakFormatterFactoryTest.php
@@ -25,7 +25,7 @@
public function testConstructorErrors( $builder, $error ) {
$this->setExpectedException( $error );
- $typeLookup = $this->getMock(
'Wikibase\Lib\PropertyDataTypeLookup' );
+ $typeLookup = $this->getMock(
'Wikibase\DataModel\Entity\PropertyDataTypeLookup' );
$typeLookup->expects( $this->never() )->method(
'getDataTypeIdForProperty' );
new OutputFormatSnakFormatterFactory( $builder );
diff --git a/lib/tests/phpunit/formatters/PropertyValueSnakFormatterTest.php
b/lib/tests/phpunit/formatters/PropertyValueSnakFormatterTest.php
index 1816905..6ae025a 100644
--- a/lib/tests/phpunit/formatters/PropertyValueSnakFormatterTest.php
+++ b/lib/tests/phpunit/formatters/PropertyValueSnakFormatterTest.php
@@ -11,7 +11,7 @@
use Wikibase\DataModel\Snak\PropertySomeValueSnak;
use Wikibase\DataModel\Snak\PropertyValueSnak;
use Wikibase\Lib\DispatchingValueFormatter;
-use Wikibase\Lib\PropertyDataTypeLookup;
+use Wikibase\DataModel\Entity\PropertyDataTypeLookup;
use Wikibase\Lib\PropertyNotFoundException;
use Wikibase\Lib\PropertyValueSnakFormatter;
use Wikibase\Lib\SnakFormatter;
@@ -64,7 +64,7 @@
new PropertyNotFoundException( new PropertyId(
'P666' ) ) );
}
- $typeLookup = $this->getMock(
'Wikibase\Lib\PropertyDataTypeLookup' );
+ $typeLookup = $this->getMock(
'Wikibase\DataModel\Entity\PropertyDataTypeLookup' );
$typeLookup->expects( $this->atLeastOnce() )
->method( 'getDataTypeIdForProperty' )
->will( $getDataTypeIdForPropertyResult );
@@ -263,7 +263,7 @@
}
private function getDummyPropertyValueSnakFormatter( $format = 'test' )
{
- $typeLookup = $this->getMock(
'Wikibase\Lib\PropertyDataTypeLookup' );
+ $typeLookup = $this->getMock(
'Wikibase\DataModel\Entity\PropertyDataTypeLookup' );
$typeLookup->expects( $this->never() )->method(
'getDataTypeIdForProperty' );
$typeFactory = $this->getMock( 'DataTypes\DataTypeFactory' );
diff --git a/lib/tests/phpunit/formatters/WikibaseSnakFormatterBuildersTest.php
b/lib/tests/phpunit/formatters/WikibaseSnakFormatterBuildersTest.php
index 4bff946..5ffc70f 100644
--- a/lib/tests/phpunit/formatters/WikibaseSnakFormatterBuildersTest.php
+++ b/lib/tests/phpunit/formatters/WikibaseSnakFormatterBuildersTest.php
@@ -38,7 +38,7 @@
* @return WikibaseSnakFormatterBuilders
*/
public function newBuilders( $propertyType, EntityId $entityId ) {
- $typeLookup = $this->getMock(
'Wikibase\Lib\PropertyDataTypeLookup' );
+ $typeLookup = $this->getMock(
'Wikibase\DataModel\Entity\PropertyDataTypeLookup' );
$typeLookup->expects( $this->any() )
->method( 'getDataTypeIdForProperty' )
->will( $this->returnValue( $propertyType ) );
diff --git a/lib/tests/phpunit/serializers/SnakSerializerTest.php
b/lib/tests/phpunit/serializers/SnakSerializerTest.php
index e792b84..4a768cd 100644
--- a/lib/tests/phpunit/serializers/SnakSerializerTest.php
+++ b/lib/tests/phpunit/serializers/SnakSerializerTest.php
@@ -35,7 +35,7 @@
* @return SnakSerializer
*/
protected function getInstance() {
- $dataTypeLookup = $this->getMock(
'Wikibase\Lib\PropertyDataTypeLookup' );
+ $dataTypeLookup = $this->getMock(
'Wikibase\DataModel\Entity\PropertyDataTypeLookup' );
$dataTypeLookup->expects( $this->any() )
->method( 'getDataTypeIdForProperty' )
->will( $this->returnCallback( array( $this,
'getDataTypeIdForProperty' ) ) );
diff --git a/repo/includes/EntityParserOutputGenerator.php
b/repo/includes/EntityParserOutputGenerator.php
index 8793d09..7572c1e 100644
--- a/repo/includes/EntityParserOutputGenerator.php
+++ b/repo/includes/EntityParserOutputGenerator.php
@@ -4,7 +4,7 @@
use ParserOutput;
use Wikibase\DataModel\SiteLinkList;
-use Wikibase\Lib\PropertyDataTypeLookup;
+use Wikibase\DataModel\Entity\PropertyDataTypeLookup;
use Wikibase\Lib\Serializers\SerializationOptions;
use Wikibase\Lib\Store\EntityTitleLookup;
diff --git a/repo/includes/Validators/SnakValidator.php
b/repo/includes/Validators/SnakValidator.php
index b0a73af..2dc9d56 100644
--- a/repo/includes/Validators/SnakValidator.php
+++ b/repo/includes/Validators/SnakValidator.php
@@ -15,7 +15,7 @@
use Wikibase\DataModel\References;
use Wikibase\DataModel\Snak\PropertyValueSnak;
use Wikibase\DataModel\Snak\Snak;
-use Wikibase\Lib\PropertyDataTypeLookup;
+use Wikibase\DataModel\Entity\PropertyDataTypeLookup;
use Wikibase\Lib\PropertyNotFoundException;
/**
diff --git a/repo/includes/WikibaseRepo.php b/repo/includes/WikibaseRepo.php
index 4df3146..f3b6149 100644
--- a/repo/includes/WikibaseRepo.php
+++ b/repo/includes/WikibaseRepo.php
@@ -40,7 +40,7 @@
use Wikibase\Lib\Localizer\ParseExceptionLocalizer;
use Wikibase\Lib\OutputFormatSnakFormatterFactory;
use Wikibase\Lib\OutputFormatValueFormatterFactory;
-use Wikibase\Lib\PropertyDataTypeLookup;
+use Wikibase\DataModel\Entity\PropertyDataTypeLookup;
use Wikibase\Lib\PropertyInfoDataTypeLookup;
use Wikibase\Lib\SnakConstructionService;
use Wikibase\Lib\SnakFormatter;
diff --git a/repo/includes/api/ApiHelperFactory.php
b/repo/includes/api/ApiHelperFactory.php
index 014847f..0e6bd61 100644
--- a/repo/includes/api/ApiHelperFactory.php
+++ b/repo/includes/api/ApiHelperFactory.php
@@ -5,7 +5,7 @@
use ApiBase;
use Wikibase\EntityFactory;
use Wikibase\Lib\Localizer\ExceptionLocalizer;
-use Wikibase\Lib\PropertyDataTypeLookup;
+use Wikibase\DataModel\Entity\PropertyDataTypeLookup;
use Wikibase\Lib\Serializers\SerializationOptions;
use Wikibase\Lib\Serializers\SerializerFactory;
use Wikibase\Lib\Store\EntityTitleLookup;
diff --git a/repo/includes/api/ApiWikibase.php
b/repo/includes/api/ApiWikibase.php
index 77e3fa8..b91eab9 100644
--- a/repo/includes/api/ApiWikibase.php
+++ b/repo/includes/api/ApiWikibase.php
@@ -15,7 +15,7 @@
use Wikibase\EditEntity;
use Wikibase\EntityRevision;
use Wikibase\Lib\Localizer\ExceptionLocalizer;
-use Wikibase\Lib\PropertyDataTypeLookup;
+use Wikibase\DataModel\Entity\PropertyDataTypeLookup;
use Wikibase\Lib\Store\BadRevisionException;
use Wikibase\Lib\Store\EntityRevisionLookup;
use Wikibase\Lib\Store\EntityStore;
diff --git a/repo/tests/phpunit/includes/ChangeOp/ChangeOpTestMockProvider.php
b/repo/tests/phpunit/includes/ChangeOp/ChangeOpTestMockProvider.php
index 9334867..682ed91 100644
--- a/repo/tests/phpunit/includes/ChangeOp/ChangeOpTestMockProvider.php
+++ b/repo/tests/phpunit/includes/ChangeOp/ChangeOpTestMockProvider.php
@@ -24,7 +24,7 @@
use Wikibase\LabelDescriptionDuplicateDetector;
use Wikibase\Lib\ClaimGuidGenerator;
use Wikibase\Lib\ClaimGuidValidator;
-use Wikibase\Lib\PropertyDataTypeLookup;
+use Wikibase\DataModel\Entity\PropertyDataTypeLookup;
use Wikibase\Lib\Store\SiteLinkCache;
use Wikibase\Validators\CompositeFingerprintValidator;
use Wikibase\Validators\CompositeValidator;
@@ -156,7 +156,7 @@
* @return PropertyDataTypeLookup
*/
public function getMockPropertyDataTypeLookup() {
- $mock = $this->getMock( '\Wikibase\Lib\PropertyDataTypeLookup'
);
+ $mock = $this->getMock(
'\Wikibase\DataModel\Entity\PropertyDataTypeLookup' );
$mock->expects( PHPUnit_Framework_TestCase::any() )
->method( 'getDataTypeIdForProperty' )
->will( PHPUnit_Framework_TestCase::returnValue(
'string' ) );
diff --git a/repo/tests/phpunit/includes/EntityParserOutputGeneratorTest.php
b/repo/tests/phpunit/includes/EntityParserOutputGeneratorTest.php
index bb29408..e9832ad 100644
--- a/repo/tests/phpunit/includes/EntityParserOutputGeneratorTest.php
+++ b/repo/tests/phpunit/includes/EntityParserOutputGeneratorTest.php
@@ -4,10 +4,10 @@
use Title;
use Wikibase\DataModel\Entity\EntityId;
+use Wikibase\DataModel\Entity\InMemoryDataTypeLookup;
use Wikibase\DataModel\Entity\Item;
use Wikibase\EntityParserOutputGenerator;
use Wikibase\EntityRevision;
-use Wikibase\Lib\InMemoryDataTypeLookup;
/**
* @covers Wikibase\EntityParserOutputGenerator
diff --git
a/repo/tests/phpunit/includes/LinkedData/EntityDataRequestHandlerTest.php
b/repo/tests/phpunit/includes/LinkedData/EntityDataRequestHandlerTest.php
index f4df1d1..fdbe874 100644
--- a/repo/tests/phpunit/includes/LinkedData/EntityDataRequestHandlerTest.php
+++ b/repo/tests/phpunit/includes/LinkedData/EntityDataRequestHandlerTest.php
@@ -72,7 +72,7 @@
$idParser = new BasicEntityIdParser(); // we only test for
items and properties here.
- $dataTypeLookup = $this->getMock(
'Wikibase\Lib\PropertyDataTypeLookup' );
+ $dataTypeLookup = $this->getMock(
'Wikibase\DataModel\Entity\PropertyDataTypeLookup' );
$dataTypeLookup->expects( $this->any() )
->method( 'getDataTypeIdForProperty' )
->will( $this->returnValue( 'string' ) );
diff --git
a/repo/tests/phpunit/includes/LinkedData/EntityDataSerializationServiceTest.php
b/repo/tests/phpunit/includes/LinkedData/EntityDataSerializationServiceTest.php
index 06d9ae6..f0678dc 100644
---
a/repo/tests/phpunit/includes/LinkedData/EntityDataSerializationServiceTest.php
+++
b/repo/tests/phpunit/includes/LinkedData/EntityDataSerializationServiceTest.php
@@ -28,7 +28,7 @@
private function newService() {
$entityLookup = new MockRepository();
- $dataTypeLookup = $this->getMock(
'Wikibase\Lib\PropertyDataTypeLookup' );
+ $dataTypeLookup = $this->getMock(
'Wikibase\DataModel\Entity\PropertyDataTypeLookup' );
$dataTypeLookup->expects( $this->any() )
->method( 'getDataTypeIdForProperty' )
->will( $this->returnValue( 'string' ) );
diff --git a/repo/tests/phpunit/includes/Validators/SnakValidatorTest.php
b/repo/tests/phpunit/includes/Validators/SnakValidatorTest.php
index 4985522..5cffbb3 100644
--- a/repo/tests/phpunit/includes/Validators/SnakValidatorTest.php
+++ b/repo/tests/phpunit/includes/Validators/SnakValidatorTest.php
@@ -10,6 +10,7 @@
use DataValues\UnknownValue;
use Wikibase\DataModel\Claim\Claim;
use Wikibase\DataModel\Claim\Statement;
+use Wikibase\DataModel\Entity\InMemoryDataTypeLookup;
use Wikibase\DataModel\Entity\PropertyId;
use Wikibase\DataModel\Reference;
use Wikibase\DataModel\ReferenceList;
@@ -19,8 +20,7 @@
use Wikibase\DataModel\Snak\PropertyValueSnak;
use Wikibase\DataModel\Snak\Snak;
use Wikibase\DataModel\Snak\SnakList;
-use Wikibase\Lib\InMemoryDataTypeLookup;
-use Wikibase\Lib\PropertyDataTypeLookup;
+use Wikibase\DataModel\Entity\PropertyDataTypeLookup;
use Wikibase\Validators\SnakValidator;
/**
diff --git a/repo/tests/phpunit/includes/WikibaseRepoTest.php
b/repo/tests/phpunit/includes/WikibaseRepoTest.php
index b59aaae..f78e020 100644
--- a/repo/tests/phpunit/includes/WikibaseRepoTest.php
+++ b/repo/tests/phpunit/includes/WikibaseRepoTest.php
@@ -53,7 +53,7 @@
public function testGetPropertyDataTypeLookupReturnType() {
$returnValue =
$this->getDefaultInstance()->getPropertyDataTypeLookup();
- $this->assertInstanceOf( 'Wikibase\Lib\PropertyDataTypeLookup',
$returnValue );
+ $this->assertInstanceOf(
'Wikibase\DataModel\Entity\PropertyDataTypeLookup', $returnValue );
}
public function testGetStringNormalizerReturnType() {
diff --git a/repo/tests/phpunit/includes/api/ApiHelperFactoryTest.php
b/repo/tests/phpunit/includes/api/ApiHelperFactoryTest.php
index 6b00f72..3e91107 100644
--- a/repo/tests/phpunit/includes/api/ApiHelperFactoryTest.php
+++ b/repo/tests/phpunit/includes/api/ApiHelperFactoryTest.php
@@ -21,7 +21,7 @@
private function newApiHelperFactory() {
$titleLookup = $this->getMock(
'Wikibase\Lib\Store\EntityTitleLookup' );
$exceptionLocalizer = $this->getMock(
'Wikibase\Lib\Localizer\ExceptionLocalizer' );
- $dataTypeLookup = $this->getMock(
'Wikibase\Lib\PropertyDataTypeLookup' );
+ $dataTypeLookup = $this->getMock(
'Wikibase\DataModel\Entity\PropertyDataTypeLookup' );
return new ApiHelperFactory(
$titleLookup,
diff --git a/repo/tests/phpunit/includes/api/GetClaimsTest.php
b/repo/tests/phpunit/includes/api/GetClaimsTest.php
index f99ce69..1beb64d 100644
--- a/repo/tests/phpunit/includes/api/GetClaimsTest.php
+++ b/repo/tests/phpunit/includes/api/GetClaimsTest.php
@@ -14,7 +14,7 @@
use Wikibase\DataModel\Snak\PropertyNoValueSnak;
use Wikibase\DataModel\Snak\PropertySomeValueSnak;
use Wikibase\DataModel\Snak\PropertyValueSnak;
-use Wikibase\Lib\PropertyDataTypeLookup;
+use Wikibase\DataModel\Entity\PropertyDataTypeLookup;
use Wikibase\Lib\Serializers\ClaimSerializer;
use Wikibase\Lib\Serializers\SerializationOptions;
use Wikibase\Lib\Serializers\SerializerFactory;
@@ -98,7 +98,7 @@
* @return PropertyDataTypeLookup
*/
private function getDataTypeLookup() {
- $lookup = $this->getMock( 'Wikibase\Lib\PropertyDataTypeLookup'
);
+ $lookup = $this->getMock(
'Wikibase\DataModel\Entity\PropertyDataTypeLookup' );
$lookup->expects( $this->any() )
->method( 'getDataTypeIdForProperty' )
diff --git a/repo/tests/phpunit/includes/api/ResultBuilderTest.php
b/repo/tests/phpunit/includes/api/ResultBuilderTest.php
index cda9e64..d22742c 100644
--- a/repo/tests/phpunit/includes/api/ResultBuilderTest.php
+++ b/repo/tests/phpunit/includes/api/ResultBuilderTest.php
@@ -63,7 +63,7 @@
->method( 'getTitleForId' )
->will( $this->returnValue( $mockTitle ) );
- $mockPropertyDataTypeLookup = $this->getMock(
'\Wikibase\Lib\PropertyDataTypeLookup' );
+ $mockPropertyDataTypeLookup = $this->getMock(
'\Wikibase\DataModel\Entity\PropertyDataTypeLookup' );
$mockPropertyDataTypeLookup->expects( $this->any() )
->method( 'getDataTypeIdForProperty' )
->will( $this->returnCallback( function( $propertyId ) {
diff --git a/repo/tests/phpunit/includes/specials/SpecialEntityDataTest.php
b/repo/tests/phpunit/includes/specials/SpecialEntityDataTest.php
index a78d6c8..3e617c4 100644
--- a/repo/tests/phpunit/includes/specials/SpecialEntityDataTest.php
+++ b/repo/tests/phpunit/includes/specials/SpecialEntityDataTest.php
@@ -87,7 +87,7 @@
$idParser = new BasicEntityIdParser();
- $dataTypeLookup = $this->getMock(
'Wikibase\Lib\PropertyDataTypeLookup' );
+ $dataTypeLookup = $this->getMock(
'Wikibase\DataModel\Entity\PropertyDataTypeLookup' );
$dataTypeLookup->expects( $this->any() )
->method( 'getDataTypeIdForProperty' )
->will( $this->returnValue( 'string' ) );
--
To view, visit https://gerrit.wikimedia.org/r/161682
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I69d9df29540e4f2090896eb10c5c9cc478762606
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Jeroen De Dauw <jeroended...@gmail.com>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
