Start using PHPUnit 6 forwards compatibility aliases

thiemowmde · thiemowmde · commit 8ec5a55f2322 · 2018-03-12T09:46:33.000+01:00
diff --git a/composer.json b/composer.json
@@ -36,7 +36,7 @@
 		"data-values/geo": "~2.0|~1.0|~0.1",
 		"data-values/number": ">=0.1 <0.10",
 		"data-values/time": "~0.2",
-		"phpunit/phpunit": "~4.8",
+		"phpunit/phpunit": "^4.8.35",
 		"wikibase/wikibase-codesniffer": "^0.3.0"
 	},
 	"suggest": {
diff --git a/tests/integration/EntityDeserializationCompatibilityTest.php b/tests/integration/EntityDeserializationCompatibilityTest.php
@@ -9,6 +9,7 @@
 use DataValues\TimeValue;
 use DataValues\UnknownValue;
 use Deserializers\Deserializer;
+use PHPUnit\Framework\TestCase;
 use RecursiveDirectoryIterator;
 use RecursiveIteratorIterator;
 use SplFileInfo;
@@ -21,7 +22,7 @@
  * @license GPL-2.0+
  * @author Jeroen De Dauw < jeroendedauw@gmail.com >
  */
-class EntityDeserializationCompatibilityTest extends \PHPUnit_Framework_TestCase {
+class EntityDeserializationCompatibilityTest extends TestCase {
 
 	/**
 	 * @var Deserializer
diff --git a/tests/integration/EntitySerializationRoundtripTest.php b/tests/integration/EntitySerializationRoundtripTest.php
@@ -4,6 +4,7 @@
 
 use DataValues\Deserializers\DataValueDeserializer;
 use DataValues\Serializers\DataValueSerializer;
+use PHPUnit\Framework\TestCase;
 use Wikibase\DataModel\DeserializerFactory;
 use Wikibase\DataModel\Entity\BasicEntityIdParser;
 use Wikibase\DataModel\Entity\Item;
@@ -17,7 +18,7 @@
  * @author Thomas Pellissier Tanon
  * @author Thiemo Kreuz
  */
-class EntitySerializationRoundtripTest extends \PHPUnit_Framework_TestCase {
+class EntitySerializationRoundtripTest extends TestCase {
 
 	public function itemProvider() {
 		$empty = new Item( new ItemId( 'Q42' ) );
diff --git a/tests/integration/ReferenceSerializationRoundtripTest.php b/tests/integration/ReferenceSerializationRoundtripTest.php
@@ -4,6 +4,7 @@
 
 use DataValues\Deserializers\DataValueDeserializer;
 use DataValues\Serializers\DataValueSerializer;
+use PHPUnit\Framework\TestCase;
 use Wikibase\DataModel\DeserializerFactory;
 use Wikibase\DataModel\Entity\BasicEntityIdParser;
 use Wikibase\DataModel\Reference;
@@ -17,7 +18,7 @@
  * @author Jeroen De Dauw < jeroendedauw@gmail.com >
  * @author Thomas Pellissier Tanon
  */
-class ReferenceSerializationRoundtripTest extends \PHPUnit_Framework_TestCase {
+class ReferenceSerializationRoundtripTest extends TestCase {
 
 	/**
 	 * @dataProvider referenceProvider
diff --git a/tests/integration/ReferencesSerializationRoundtripTest.php b/tests/integration/ReferencesSerializationRoundtripTest.php
@@ -4,6 +4,7 @@
 
 use DataValues\Deserializers\DataValueDeserializer;
 use DataValues\Serializers\DataValueSerializer;
+use PHPUnit\Framework\TestCase;
 use Wikibase\DataModel\DeserializerFactory;
 use Wikibase\DataModel\Entity\BasicEntityIdParser;
 use Wikibase\DataModel\Reference;
@@ -16,7 +17,7 @@
  * @license GPL-2.0+
  * @author Thomas Pellissier Tanon
  */
-class ReferencesSerializationRoundtripTest extends \PHPUnit_Framework_TestCase {
+class ReferencesSerializationRoundtripTest extends TestCase {
 
 	/**
 	 * @dataProvider referencesProvider
diff --git a/tests/integration/SiteLinkSerializationRoundtripTest.php b/tests/integration/SiteLinkSerializationRoundtripTest.php
@@ -4,6 +4,7 @@
 
 use DataValues\Deserializers\DataValueDeserializer;
 use DataValues\Serializers\DataValueSerializer;
+use PHPUnit\Framework\TestCase;
 use Wikibase\DataModel\DeserializerFactory;
 use Wikibase\DataModel\Entity\BasicEntityIdParser;
 use Wikibase\DataModel\Entity\ItemId;
@@ -14,7 +15,7 @@
  * @license GPL-2.0+
  * @author Thomas Pellissier Tanon
  */
-class SiteLinkSerializationRoundtripTest extends \PHPUnit_Framework_TestCase {
+class SiteLinkSerializationRoundtripTest extends TestCase {
 
 	/**
 	 * @dataProvider siteLinkProvider
diff --git a/tests/integration/SnakListSerializationRoundtripTest.php b/tests/integration/SnakListSerializationRoundtripTest.php
@@ -4,6 +4,7 @@
 
 use DataValues\Deserializers\DataValueDeserializer;
 use DataValues\Serializers\DataValueSerializer;
+use PHPUnit\Framework\TestCase;
 use Wikibase\DataModel\DeserializerFactory;
 use Wikibase\DataModel\Entity\BasicEntityIdParser;
 use Wikibase\DataModel\SerializerFactory;
@@ -16,7 +17,7 @@
  * @author Jeroen De Dauw < jeroendedauw@gmail.com >
  * @author Thomas Pellissier Tanon
  */
-class SnakListSerializationRoundtripTest extends \PHPUnit_Framework_TestCase {
+class SnakListSerializationRoundtripTest extends TestCase {
 
 	/**
 	 * @dataProvider snakListProvider
diff --git a/tests/integration/SnakSerializationRoundtripTest.php b/tests/integration/SnakSerializationRoundtripTest.php
@@ -6,6 +6,7 @@
 use DataValues\Serializers\DataValueSerializer;
 use DataValues\StringValue;
 use DataValues\UnDeserializableValue;
+use PHPUnit\Framework\TestCase;
 use Wikibase\DataModel\DeserializerFactory;
 use Wikibase\DataModel\Entity\BasicEntityIdParser;
 use Wikibase\DataModel\SerializerFactory;
@@ -20,7 +21,7 @@
  * @author Thomas Pellissier Tanon
  * @author Thiemo Kreuz
  */
-class SnakSerializationRoundtripTest extends \PHPUnit_Framework_TestCase {
+class SnakSerializationRoundtripTest extends TestCase {
 
 	private function getSnakSerializer() {
 		$factory = new SerializerFactory( new DataValueSerializer() );
diff --git a/tests/integration/StatementListSerializationRoundtripTest.php b/tests/integration/StatementListSerializationRoundtripTest.php
@@ -4,6 +4,7 @@
 
 use DataValues\Deserializers\DataValueDeserializer;
 use DataValues\Serializers\DataValueSerializer;
+use PHPUnit\Framework\TestCase;
 use Wikibase\DataModel\DeserializerFactory;
 use Wikibase\DataModel\Entity\BasicEntityIdParser;
 use Wikibase\DataModel\SerializerFactory;
@@ -15,7 +16,7 @@
  * @license GPL-2.0+
  * @author Thomas Pellissier Tanon
  */
-class StatementListSerializationRoundtripTest extends \PHPUnit_Framework_TestCase {
+class StatementListSerializationRoundtripTest extends TestCase {
 
 	/**
 	 * @dataProvider snaksProvider
diff --git a/tests/integration/StatementSerializationRoundtripTest.php b/tests/integration/StatementSerializationRoundtripTest.php
@@ -4,6 +4,7 @@
 
 use DataValues\Deserializers\DataValueDeserializer;
 use DataValues\Serializers\DataValueSerializer;
+use PHPUnit\Framework\TestCase;
 use Wikibase\DataModel\DeserializerFactory;
 use Wikibase\DataModel\Entity\BasicEntityIdParser;
 use Wikibase\DataModel\Reference;
@@ -18,7 +19,7 @@
  * @license GPL-2.0+
  * @author Thomas Pellissier Tanon
  */
-class StatementSerializationRoundtripTest extends \PHPUnit_Framework_TestCase {
+class StatementSerializationRoundtripTest extends TestCase {
 
 	/**
 	 * @dataProvider snaksProvider
diff --git a/tests/unit/DeserializerFactoryTest.php b/tests/unit/DeserializerFactoryTest.php
@@ -4,6 +4,7 @@
 
 use DataValues\Deserializers\DataValueDeserializer;
 use Deserializers\Deserializer;
+use PHPUnit\Framework\TestCase;
 use Wikibase\DataModel\DeserializerFactory;
 use Wikibase\DataModel\Entity\BasicEntityIdParser;
 
@@ -12,7 +13,7 @@
  * @author Thomas Pellissier Tanon
  * @author Bene* < benestar.wikimedia@gmail.com >
  */
-class DeserializerFactoryTest extends \PHPUnit_Framework_TestCase {
+class DeserializerFactoryTest extends TestCase {
 
 	private function buildDeserializerFactory() {
 		return new DeserializerFactory( new DataValueDeserializer(), new BasicEntityIdParser() );
diff --git a/tests/unit/Deserializers/AliasGroupListDeserializerTest.php b/tests/unit/Deserializers/AliasGroupListDeserializerTest.php
@@ -3,7 +3,7 @@
 namespace Tests\Wikibase\DataModel\Deserializers;
 
 use Deserializers\Exceptions\DeserializationException;
-use PHPUnit_Framework_TestCase;
+use PHPUnit\Framework\TestCase;
 use Wikibase\DataModel\Deserializers\AliasGroupListDeserializer;
 use Wikibase\DataModel\Term\AliasGroup;
 use Wikibase\DataModel\Term\AliasGroupList;
@@ -15,7 +15,7 @@
  * @author Addshore
  * @author Bene* < benestar.wikimedia@gmail.com >
  */
-class AliasGroupListDeserializerTest extends PHPUnit_Framework_TestCase {
+class AliasGroupListDeserializerTest extends TestCase {
 
 	/**
 	 * @dataProvider nonDeserializableProvider
diff --git a/tests/unit/Deserializers/DispatchableDeserializerTest.php b/tests/unit/Deserializers/DispatchableDeserializerTest.php
@@ -4,14 +4,14 @@
 
 use Deserializers\DispatchableDeserializer;
 use Deserializers\Exceptions\DeserializationException;
-use PHPUnit_Framework_TestCase;
+use PHPUnit\Framework\TestCase;
 
 /**
  * @license GPL-2.0+
  * @author Thomas Pellissier Tanon
  * @author Thiemo Kreuz
  */
-abstract class DispatchableDeserializerTest extends PHPUnit_Framework_TestCase {
+abstract class DispatchableDeserializerTest extends TestCase {
 
 	/**
 	 * @return DispatchableDeserializer
diff --git a/tests/unit/Deserializers/EntityIdDeserializerTest.php b/tests/unit/Deserializers/EntityIdDeserializerTest.php
@@ -3,7 +3,7 @@
 namespace Tests\Wikibase\DataModel\Deserializers;
 
 use Deserializers\Exceptions\DeserializationException;
-use PHPUnit_Framework_TestCase;
+use PHPUnit\Framework\TestCase;
 use Wikibase\DataModel\Deserializers\EntityIdDeserializer;
 use Wikibase\DataModel\Entity\EntityIdParser;
 use Wikibase\DataModel\Entity\EntityIdParsingException;
@@ -15,7 +15,7 @@
  * @license GPL-2.0+
  * @author Thomas Pellissier Tanon
  */
-class EntityIdDeserializerTest extends PHPUnit_Framework_TestCase {
+class EntityIdDeserializerTest extends TestCase {
 
 	private function buildDeserializer() {
 		$entityIdParserMock = $this->getMock( EntityIdParser::class );
diff --git a/tests/unit/Deserializers/ReferenceListDeserializerTest.php b/tests/unit/Deserializers/ReferenceListDeserializerTest.php
@@ -4,7 +4,7 @@
 
 use Deserializers\Deserializer;
 use Deserializers\Exceptions\DeserializationException;
-use PHPUnit_Framework_TestCase;
+use PHPUnit\Framework\TestCase;
 use Wikibase\DataModel\Deserializers\ReferenceListDeserializer;
 use Wikibase\DataModel\Reference;
 use Wikibase\DataModel\ReferenceList;
@@ -15,7 +15,7 @@
  * @license GPL-2.0+
  * @author Thomas Pellissier Tanon
  */
-class ReferenceListDeserializerTest extends PHPUnit_Framework_TestCase {
+class ReferenceListDeserializerTest extends TestCase {
 
 	private function buildDeserializer() {
 		$referenceDeserializerMock = $this->getMock( Deserializer::class );
diff --git a/tests/unit/Deserializers/SiteLinkDeserializerTest.php b/tests/unit/Deserializers/SiteLinkDeserializerTest.php
@@ -5,7 +5,7 @@
 use Deserializers\Deserializer;
 use Deserializers\Exceptions\DeserializationException;
 use Deserializers\Exceptions\InvalidAttributeException;
-use PHPUnit_Framework_TestCase;
+use PHPUnit\Framework\TestCase;
 use Wikibase\DataModel\Deserializers\SiteLinkDeserializer;
 use Wikibase\DataModel\Entity\ItemId;
 use Wikibase\DataModel\Entity\PropertyId;
@@ -17,7 +17,7 @@
  * @license GPL-2.0+
  * @author Thomas Pellissier Tanon
  */
-class SiteLinkDeserializerTest extends PHPUnit_Framework_TestCase {
+class SiteLinkDeserializerTest extends TestCase {
 
 	private function buildDeserializer() {
 		$entityIdDeserializerMock = $this->getMock( Deserializer::class );
diff --git a/tests/unit/Deserializers/SnakListDeserializerTest.php b/tests/unit/Deserializers/SnakListDeserializerTest.php
@@ -4,7 +4,7 @@
 
 use Deserializers\Deserializer;
 use Deserializers\Exceptions\DeserializationException;
-use PHPUnit_Framework_TestCase;
+use PHPUnit\Framework\TestCase;
 use Wikibase\DataModel\Deserializers\SnakListDeserializer;
 use Wikibase\DataModel\Snak\PropertyNoValueSnak;
 use Wikibase\DataModel\Snak\SnakList;
@@ -15,7 +15,7 @@
  * @license GPL-2.0+
  * @author Thomas Pellissier Tanon
  */
-class SnakListDeserializerTest extends PHPUnit_Framework_TestCase {
+class SnakListDeserializerTest extends TestCase {
 
 	private function buildDeserializer() {
 		$snakDeserializerMock = $this->getMock( Deserializer::class );
diff --git a/tests/unit/Deserializers/StatementListDeserializerTest.php b/tests/unit/Deserializers/StatementListDeserializerTest.php
@@ -4,7 +4,7 @@
 
 use Deserializers\Deserializer;
 use Deserializers\Exceptions\DeserializationException;
-use PHPUnit_Framework_TestCase;
+use PHPUnit\Framework\TestCase;
 use Wikibase\DataModel\Deserializers\StatementListDeserializer;
 use Wikibase\DataModel\Snak\PropertyNoValueSnak;
 use Wikibase\DataModel\Statement\Statement;
@@ -16,7 +16,7 @@
  * @license GPL-2.0+
  * @author Bene* < benestar.wikimedia@gmail.com >
  */
-class StatementListDeserializerTest extends PHPUnit_Framework_TestCase {
+class StatementListDeserializerTest extends TestCase {
 
 	private function buildDeserializer() {
 		$statement = new Statement( new PropertyNoValueSnak( 42 ) );
diff --git a/tests/unit/Deserializers/TermDeserializerTest.php b/tests/unit/Deserializers/TermDeserializerTest.php
@@ -3,7 +3,7 @@
 namespace Tests\Wikibase\DataModel\Deserializers;
 
 use Deserializers\Exceptions\DeserializationException;
-use PHPUnit_Framework_TestCase;
+use PHPUnit\Framework\TestCase;
 use Wikibase\DataModel\Deserializers\TermDeserializer;
 use Wikibase\DataModel\Term\Term;
 
@@ -13,7 +13,7 @@
  * @license GPL-2.0+
  * @author Addshore
  */
-class TermDeserializerTest extends PHPUnit_Framework_TestCase {
+class TermDeserializerTest extends TestCase {
 
 	/**
 	 * @dataProvider nonDeserializableProvider
diff --git a/tests/unit/Deserializers/TermListDeserializerTest.php b/tests/unit/Deserializers/TermListDeserializerTest.php
@@ -4,7 +4,7 @@
 
 use Deserializers\Deserializer;
 use Deserializers\Exceptions\DeserializationException;
-use PHPUnit_Framework_TestCase;
+use PHPUnit\Framework\TestCase;
 use Wikibase\DataModel\Deserializers\TermDeserializer;
 use Wikibase\DataModel\Deserializers\TermListDeserializer;
 use Wikibase\DataModel\Term\Term;
@@ -16,7 +16,7 @@
  * @license GPL-2.0+
  * @author Addshore
  */
-class TermListDeserializerTest extends PHPUnit_Framework_TestCase {
+class TermListDeserializerTest extends TestCase {
 
 	/**
 	 * @return Deserializer
diff --git a/tests/unit/SerializerFactoryTest.php b/tests/unit/SerializerFactoryTest.php
@@ -4,6 +4,7 @@
 
 use DataValues\Serializers\DataValueSerializer;
 use InvalidArgumentException;
+use PHPUnit\Framework\TestCase;
 use Serializers\Serializer;
 use Wikibase\DataModel\Entity\Item;
 use Wikibase\DataModel\Entity\Property;
@@ -26,7 +27,7 @@
  * @author Thomas Pellissier Tanon
  * @author Bene* < benestar.wikimedia@gmail.com >
  */
-class SerializerFactoryTest extends \PHPUnit_Framework_TestCase {
+class SerializerFactoryTest extends TestCase {
 
 	private function buildSerializerFactory() {
 		return new SerializerFactory( new DataValueSerializer() );
diff --git a/tests/unit/Serializers/AliasGroupListSerializerTest.php b/tests/unit/Serializers/AliasGroupListSerializerTest.php
@@ -2,7 +2,7 @@
 
 namespace Tests\Wikibase\DataModel\Serializers;
 
-use PHPUnit_Framework_TestCase;
+use PHPUnit\Framework\TestCase;
 use Serializers\Exceptions\UnsupportedObjectException;
 use Serializers\Serializer;
 use stdClass;
@@ -17,7 +17,7 @@
  * @author Addshore
  * @author Bene* < benestar.wikimedia@gmail.com >
  */
-class AliasGroupListSerializerTest extends PHPUnit_Framework_TestCase {
+class AliasGroupListSerializerTest extends TestCase {
 
 	/**
 	 * @param bool $useObjectsForMaps
diff --git a/tests/unit/Serializers/AliasGroupSerializerTest.php b/tests/unit/Serializers/AliasGroupSerializerTest.php
@@ -2,7 +2,7 @@
 
 namespace Tests\Wikibase\DataModel\Serializers;
 
-use PHPUnit_Framework_TestCase;
+use PHPUnit\Framework\TestCase;
 use Serializers\Exceptions\UnsupportedObjectException;
 use Wikibase\DataModel\Serializers\AliasGroupSerializer;
 use Wikibase\DataModel\Term\AliasGroup;
@@ -15,7 +15,7 @@
  * @license GPL-2.0+
  * @author Bene* < benestar.wikimedia@gmail.com >
  */
-class AliasGroupSerializerTest extends PHPUnit_Framework_TestCase {
+class AliasGroupSerializerTest extends TestCase {
 
 	/**
 	 * @dataProvider nonSerializableProvider
diff --git a/tests/unit/Serializers/DispatchableSerializerTest.php b/tests/unit/Serializers/DispatchableSerializerTest.php
diff --git a/tests/unit/Serializers/TermListSerializerTest.php b/tests/unit/Serializers/TermListSerializerTest.php
diff --git a/tests/unit/Serializers/TermSerializerTest.php b/tests/unit/Serializers/TermSerializerTest.php
diff --git a/tests/unit/Serializers/TypedSnakSerializerTest.php b/tests/unit/Serializers/TypedSnakSerializerTest.php
