Declare compatibility with data-values/geo 2.0

Author: thiemowmde

composer.json

@@ -27,13 +27,13 @@
 		"irc": "irc://irc.freenode.net/wikidata"
 	},
 	"require": {
-		"php": ">=5.5.0",
+		"php": ">=5.5.9",
 		"wikibase/data-model": "~7.0|~6.0|~5.0|~4.2",
 		"serialization/serialization": "~3.1",
 		"data-values/serialization": "~1.0"
 	},
 	"require-dev": {
-		"data-values/geo": "~1.0|~0.1",
+		"data-values/geo": "~2.0|~1.0|~0.1",
 		"data-values/number": ">=0.1 <0.9",
 		"data-values/time": "~0.2",
 		"phpunit/phpunit": "~4.8"

tests/integration/EntityDeserializationCompatibilityTest.php

@@ -3,12 +3,19 @@
 namespace Tests\Wikibase\DataModel;
 
 use DataValues\Deserializers\DataValueDeserializer;
+use DataValues\Geo\Values\GlobeCoordinateValue;
+use DataValues\QuantityValue;
+use DataValues\StringValue;
+use DataValues\TimeValue;
+use DataValues\UnknownValue;
 use Deserializers\Deserializer;
 use RecursiveDirectoryIterator;
 use RecursiveIteratorIterator;
 use SplFileInfo;
 use Wikibase\DataModel\DeserializerFactory;
 use Wikibase\DataModel\Entity\BasicEntityIdParser;
+use Wikibase\DataModel\Entity\EntityDocument;
+use Wikibase\DataModel\Entity\EntityIdValue;
 
 /**
  * @license GPL-2.0+
@@ -23,16 +30,14 @@ class EntityDeserializationCompatibilityTest extends \PHPUnit_Framework_TestCase
 
 	protected function setUp() {
 		$deserializerFactory = new DeserializerFactory(
-			new DataValueDeserializer(
-				array(
-					'string' => 'DataValues\StringValue',
-					'unknown' => 'DataValues\UnknownValue',
-					'globecoordinate' => 'DataValues\GlobeCoordinateValue',
-					'quantity' => 'DataValues\QuantityValue',
-					'time' => 'DataValues\TimeValue',
-					'wikibase-entityid' => 'Wikibase\DataModel\Entity\EntityIdValue',
-				)
-			),
+			new DataValueDeserializer( [
+				'string' => StringValue::class,
+				'unknown' => UnknownValue::class,
+				'globecoordinate' => GlobeCoordinateValue::class,
+				'quantity' => QuantityValue::class,
+				'time' => TimeValue::class,
+				'wikibase-entityid' => EntityIdValue::class,
+			] ),
 			new BasicEntityIdParser()
 		);
 
@@ -46,7 +51,7 @@ public function testGivenEntitySerialization_entityIsReturned( $fileName, $seria
 		$entity = $this->deserializer->deserialize( $serialization );
 
 		$this->assertInstanceOf(
-			'Wikibase\DataModel\Entity\EntityDocument',
+			EntityDocument::class,
 			$entity,
 			'Deserialization of ' . $fileName . ' should lead to an EntityDocument instance'
 		);
@@ -57,17 +62,17 @@ public function entityProvider() {
 	}
 
 	private function getEntitySerializationsFromDir( $dir ) {
-		$argumentLists = array();
+		$argumentLists = [];
 
 		/**
 		 * @var SplFileInfo $fileInfo
 		 */
 		foreach ( new RecursiveIteratorIterator( new RecursiveDirectoryIterator( $dir ) ) as $fileInfo ) {
 			if ( $fileInfo->getExtension() === 'json' ) {
-				$argumentLists[] = array(
+				$argumentLists[] = [
 					$fileInfo->getFilename(),
 					json_decode( file_get_contents( $fileInfo->getPathname() ), true )
-				);
+				];
 			}
 		}