From 17db228af296bd59c12ff1ad6efc08923d74aa59 Mon Sep 17 00:00:00 2001 From: Jeroen De Dauw Date: Tue, 7 Aug 2018 17:11:51 +0200 Subject: [PATCH 1/3] Added compatibility with Wikibase DataModel 8.x --- README.md | 3 ++- composer.json | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index c761340..42279fc 100644 --- a/README.md +++ b/README.md @@ -105,8 +105,9 @@ 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 ### 2.7.0 (2017-10-26) diff --git a/composer.json b/composer.json index 09cac39..421cf52 100644 --- a/composer.json +++ b/composer.json @@ -24,7 +24,7 @@ }, "require": { "php": ">=5.5.9", - "wikibase/data-model": "~7.0|~6.0|~5.0", + "wikibase/data-model": "~8.0|~7.0|~6.0|~5.0", "wikibase/data-model-serialization": "~2.0", "serialization/serialization": "~4.0|~3.2" }, From 3ab6b324430defaa61672c4b842e58b9cd82f3e6 Mon Sep 17 00:00:00 2001 From: Jeroen De Dauw Date: Tue, 7 Aug 2018 17:17:12 +0200 Subject: [PATCH 2/3] Use more modern PHPUnit --- README.md | 1 + composer.json | 4 ++-- tests/integration/DeserializerFactoryTest.php | 4 ++-- tests/integration/SerializerFactoryTest.php | 2 +- tests/integration/TestFactoryBuilder.php | 2 +- tests/unit/Deserializers/EntityDeserializerTest.php | 6 +++--- tests/unit/Deserializers/LegacyItemDeserializerTest.php | 2 +- tests/unit/Deserializers/LegacySnakDeserializerTest.php | 2 +- tests/unit/Deserializers/LegacySnakListDeserializerTest.php | 2 +- .../unit/Deserializers/LegacyStatementDeserializerTest.php | 2 +- tests/unit/Deserializers/StatementDeserializerTest.php | 4 ++-- 11 files changed, 16 insertions(+), 15 deletions(-) diff --git a/README.md b/README.md index 42279fc..3d67eb6 100644 --- a/README.md +++ b/README.md @@ -109,6 +109,7 @@ Wikibase Internal Serialization has been written by * 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 index 421cf52..2fd88df 100644 --- a/composer.json +++ b/composer.json @@ -23,14 +23,14 @@ "irc": "irc://irc.freenode.net/wikidata" }, "require": { - "php": ">=5.5.9", + "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 index 07b8e38..0ed93b4 100644 --- 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 index c0c715c..376b727 100644 --- 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 index bb7fb47..49f4b45 100644 --- 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 index ceade8c..8993f03 100644 --- 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 index 5625996..d2d8d2e 100644 --- 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 index 1b174a3..cf62301 100644 --- 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 index 9df37cf..1956a21 100644 --- 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 index 686202d..3c0da2f 100644 --- 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 index b16090a..74cd844 100644 --- 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 ); } From af4783af68ae188867022944d4a2f6291c1568fa Mon Sep 17 00:00:00 2001 From: Jeroen De Dauw Date: Wed, 8 Aug 2018 12:49:23 +0200 Subject: [PATCH 3/3] Also run tests with PHP 7.2 and DM 8 --- .travis.yml | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3c6381d..90f8bab 100644 --- 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