Merge pull request #126 from wmde/dm8

Added compatibility with Wikibase DataModel 8.x
wmde · Aug 8, 2018 · 6129fea · 6129fea
2 parents 008a9ec + af4783a
commit 6129fea
Show file tree

Hide file tree

Showing 12 changed files with 21 additions and 26 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,25 +1,18 @@
 language: php
 
-dist: trusty
-
-env:
-  - THENEEDFORTHIS=FAIL
-
 matrix:
   fast_finish: true
   include:
     - env: DM=@dev
-      php: 5.5
+      php: 7.2
     - env: DM=~5.0
       php: 5.6
     - env: DM=~6.0
       php: 7.0
-    - env: DM=~5.0
+    - env: DM=~8.0
       php: 7.1
     - env: DM=~7.0
       php: hhvm
-  exclude:
-    - env: THENEEDFORTHIS=FAIL
   allow_failures:
     - env: DM=@dev
 

diff --git a/README.md b/README.md
@@ -105,9 +105,11 @@ Wikibase Internal Serialization has been written by
 
 ## Release notes
 
-### 2.8.0 (dev)
+### 2.8.0 (2018-08-07)
 
+* Added compatibility with Wikibase DataModel 8.x
 * Dropped compatibility with Wikibase DataModel 4.x
+* Raised minimum PHP version to 5.6
 
 ### 2.7.0 (2017-10-26)
 

diff --git a/composer.json b/composer.json
@@ -23,14 +23,14 @@
 		"irc": "irc://irc.freenode.net/wikidata"
 	},
 	"require": {
-		"php": ">=5.5.9",
-		"wikibase/data-model": "~7.0|~6.0|~5.0",
+		"php": ">=5.6",
+		"wikibase/data-model": "~8.0|~7.0|~6.0|~5.0",
 		"wikibase/data-model-serialization": "~2.0",
 		"serialization/serialization": "~4.0|~3.2"
 	},
 	"require-dev": {
 		"phpmd/phpmd": "~2.3",
-		"phpunit/phpunit": "~4.8",
+		"phpunit/phpunit": "~5.7",
 		"data-values/common": ">=0.1 <0.5",
 		"data-values/geo": ">=1.0 <4.0",
 		"data-values/number": ">=0.1 <0.10",

diff --git a/tests/integration/DeserializerFactoryTest.php b/tests/integration/DeserializerFactoryTest.php
@@ -37,9 +37,9 @@ public function testNewStatementDeserializerReturnsDeserializer() {
 
 	public function testConstructWithCustomEntityDeserializer() {
 		$factory = new DeserializerFactory(
-			$this->getMock( Deserializer::class ),
+			$this->createMock( Deserializer::class ),
 			new BasicEntityIdParser(),
-			$this->getMock( DispatchableDeserializer::class )
+			$this->createMock( DispatchableDeserializer::class )
 		);
 
 		$deserializer = $factory->newEntityDeserializer();

diff --git a/tests/integration/SerializerFactoryTest.php b/tests/integration/SerializerFactoryTest.php
@@ -20,7 +20,7 @@ class SerializerFactoryTest extends \PHPUnit_Framework_TestCase {
 	private $factory;
 
 	protected function setUp() {
-		$this->factory = new SerializerFactory( $this->getMock( Serializer::class ) );
+		$this->factory = new SerializerFactory( $this->createMock( Serializer::class ) );
 	}
 
 	public function testEntitySerializerConstruction() {

diff --git a/tests/integration/TestFactoryBuilder.php b/tests/integration/TestFactoryBuilder.php
@@ -31,7 +31,7 @@ public static function newLegacyDeserializerFactory( PHPUnit_Framework_TestCase
 	 * @return Deserializer
 	 */
 	private static function newFakeDataValueDeserializer( PHPUnit_Framework_TestCase $testCase ) {
-		$dataValueDeserializer = $testCase->getMock( Deserializer::class );
+		$dataValueDeserializer = $testCase->getMockBuilder( Deserializer::class )->getMock();
 
 		$dataValueDeserializer->expects( $testCase->any() )
 			->method( 'deserialize' )

diff --git a/tests/unit/Deserializers/EntityDeserializerTest.php b/tests/unit/Deserializers/EntityDeserializerTest.php
@@ -31,7 +31,7 @@ protected function setUp() {
 	 * @return DispatchableDeserializer
 	 */
 	private function getStubLegacyDeserializer() {
-		$legacyDeserializer = $this->getMock( DispatchableDeserializer::class );
+		$legacyDeserializer = $this->createMock( DispatchableDeserializer::class );
 
 		$legacyDeserializer->expects( $this->any() )
 			->method( 'isDeserializerFor' )
@@ -50,7 +50,7 @@ private function getStubLegacyDeserializer() {
 	 * @return DispatchableDeserializer
 	 */
 	private function getStubCurrentDeserializer() {
-		$currentDeserializer = $this->getMock( DispatchableDeserializer::class );
+		$currentDeserializer = $this->createMock( DispatchableDeserializer::class );
 
 		$currentDeserializer->expects( $this->any() )
 			->method( 'isDeserializerFor' )
@@ -79,7 +79,7 @@ public function testGivenCurrentSerialization_currentIsDetected() {
 	 * @return DispatchableDeserializer
 	 */
 	private function getThrowingDeserializer() {
-		$currentDeserializer = $this->getMock( DispatchableDeserializer::class );
+		$currentDeserializer = $this->createMock( DispatchableDeserializer::class );
 
 		$currentDeserializer->expects( $this->any() )
 			->method( 'deserialize' )

diff --git a/tests/unit/Deserializers/LegacyItemDeserializerTest.php b/tests/unit/Deserializers/LegacyItemDeserializerTest.php
@@ -32,7 +32,7 @@ class LegacyItemDeserializerTest extends \PHPUnit_Framework_TestCase {
 	protected function setUp() {
 		$idDeserializer = new LegacyEntityIdDeserializer( new BasicEntityIdParser() );
 
-		$snakDeserializer = new LegacySnakDeserializer( $this->getMock( Deserializer::class ) );
+		$snakDeserializer = new LegacySnakDeserializer( $this->createMock( Deserializer::class ) );
 
 		$statementDeserializer = new LegacyStatementDeserializer(
 			$snakDeserializer,

diff --git a/tests/unit/Deserializers/LegacySnakDeserializerTest.php b/tests/unit/Deserializers/LegacySnakDeserializerTest.php
@@ -27,7 +27,7 @@ class LegacySnakDeserializerTest extends \PHPUnit_Framework_TestCase {
 	private $deserializer;
 
 	protected function setUp() {
-		$dataValueDeserializer = $this->getMock( Deserializer::class );
+		$dataValueDeserializer = $this->createMock( Deserializer::class );
 
 		$dataValueDeserializer->expects( $this->any() )
 			->method( 'deserialize' )

diff --git a/tests/unit/Deserializers/LegacySnakListDeserializerTest.php b/tests/unit/Deserializers/LegacySnakListDeserializerTest.php
@@ -24,7 +24,7 @@ class LegacySnakListDeserializerTest extends \PHPUnit_Framework_TestCase {
 	private $deserializer;
 
 	protected function setUp() {
-		$snakDeserializer = new LegacySnakDeserializer( $this->getMock( Deserializer::class ) );
+		$snakDeserializer = new LegacySnakDeserializer( $this->createMock( Deserializer::class ) );
 
 		$this->deserializer = new LegacySnakListDeserializer( $snakDeserializer );
 	}

diff --git a/tests/unit/Deserializers/LegacyStatementDeserializerTest.php b/tests/unit/Deserializers/LegacyStatementDeserializerTest.php
@@ -28,7 +28,7 @@ class LegacyStatementDeserializerTest extends \PHPUnit_Framework_TestCase {
 	private $deserializer;
 
 	protected function setUp() {
-		$snakDeserializer = new LegacySnakDeserializer( $this->getMock( Deserializer::class ) );
+		$snakDeserializer = new LegacySnakDeserializer( $this->createMock( Deserializer::class ) );
 		$qualifiersDeserializer = new LegacySnakListDeserializer( $snakDeserializer );
 
 		$this->deserializer = new LegacyStatementDeserializer( $snakDeserializer, $qualifiersDeserializer );

diff --git a/tests/unit/Deserializers/StatementDeserializerTest.php b/tests/unit/Deserializers/StatementDeserializerTest.php
@@ -22,8 +22,8 @@ class StatementDeserializerTest extends PHPUnit_Framework_TestCase {
 	private $deserializer;
 
 	protected function setUp() {
-		$legacyDeserializer = $this->getMock( DispatchableDeserializer::class );
-		$currentDeserializer = $this->getMock( DispatchableDeserializer::class );
+		$legacyDeserializer = $this->createMock( DispatchableDeserializer::class );
+		$currentDeserializer = $this->createMock( DispatchableDeserializer::class );
 		$this->deserializer = new StatementDeserializer( $legacyDeserializer, $currentDeserializer );
 	}