Merge pull request #790 from wmde/php

JeroenDeDauw · web-flow · commit bcc928dc6a9a · 2018-09-14T14:24:03.000+02:00
Drop PHP 5.5 support
diff --git a/.travis.yml b/.travis.yml
@@ -3,7 +3,6 @@ language: php
 dist: trusty
 
 php:
-  - 5.5
   - 5.6
   - 7.0
   - 7.1
diff --git a/composer.json b/composer.json
@@ -23,14 +23,14 @@
 		"irc": "irc://irc.freenode.net/wikidata"
 	},
 	"require": {
-		"php": ">=5.5.9",
+		"php": ">=5.6",
 		"data-values/data-values": "~0.1|~1.0|~2.0",
 		"wikimedia/assert": "~0.2.2"
 	},
 	"require-dev": {
-		"ockcyp/covers-validator": "~0.4.0",
-		"phpmd/phpmd": "~2.3",
-		"phpunit/phpunit": "~4.8",
+		"ockcyp/covers-validator": "~0.5.0",
+		"phpmd/phpmd": "~2.6",
+		"phpunit/phpunit": "~5.7",
 		"wikibase/wikibase-codesniffer": "^0.3.0"
 	},
 	"autoload": {
diff --git a/tests/unit/Assert/RepositoryNameAssertTest.php b/tests/unit/Assert/RepositoryNameAssertTest.php
@@ -33,7 +33,7 @@ public function provideInvalidRepositoryNames() {
 	 * @dataProvider provideInvalidRepositoryNames
 	 */
 	public function testGivenInvalidValue_assertParameterIsValidRepositoryNameFails( $value ) {
-		$this->setExpectedException( ParameterAssertionException::class );
+		$this->expectException( ParameterAssertionException::class );
 		RepositoryNameAssert::assertParameterIsValidRepositoryName( $value, 'test' );
 	}
 
@@ -66,7 +66,7 @@ public function provideInvalidRepositoryNameIndexedArrays() {
 	 * @dataProvider provideInvalidRepositoryNameIndexedArrays
 	 */
 	public function testGivenInvalidValue_assertParameterKeysAreValidRepositoryNamesFails( $values ) {
-		$this->setExpectedException( ParameterAssertionException::class );
+		$this->expectException( ParameterAssertionException::class );
 		RepositoryNameAssert::assertParameterKeysAreValidRepositoryNames( $values, 'test' );
 	}
 
diff --git a/tests/unit/ByPropertyIdArrayTest.php b/tests/unit/ByPropertyIdArrayTest.php
@@ -42,7 +42,7 @@ public function testGivenNonTraversableObject_constructorDoesNotCastObjectToArra
 		$object = new stdClass();
 		$object->property = true;
 
-		$this->setExpectedException( InvalidArgumentException::class );
+		$this->expectException( InvalidArgumentException::class );
 		new ByPropertyIdArray( $object );
 	}
 
@@ -212,22 +212,22 @@ public function testGetByNotSetIdThrowsException() {
 		$indexedArray = new ByPropertyIdArray();
 		$indexedArray->buildIndex();
 
-		$this->setExpectedException( OutOfBoundsException::class );
+		$this->expectException( OutOfBoundsException::class );
 
 		$indexedArray->getByPropertyId( new PropertyId( 'P9000' ) );
 	}
 
 	public function testNotBuildExceptionIsThrownForByPropertyId() {
 		$indexedArray = new ByPropertyIdArray();
 
-		$this->setExpectedException( RuntimeException::class );
+		$this->expectException( RuntimeException::class );
 		$indexedArray->getByPropertyId( new PropertyId( 'P9000' ) );
 	}
 
 	public function testNotBuildExceptionIsThrownForGetPropertyIds() {
 		$indexedArray = new ByPropertyIdArray();
 
-		$this->setExpectedException( RuntimeException::class );
+		$this->expectException( RuntimeException::class );
 		$indexedArray->getPropertyIds();
 	}
 
@@ -344,7 +344,7 @@ public function testMoveThrowingOutOfBoundsExceptionIfObjectNotPresent() {
 		$indexedArray = new ByPropertyIdArray( $statements );
 		$indexedArray->buildIndex();
 
-		$this->setExpectedException( OutOfBoundsException::class );
+		$this->expectException( OutOfBoundsException::class );
 
 		$indexedArray->moveObjectToIndex( new Statement( new PropertyNoValueSnak( new PropertyId( 'P9999' ) ) ), 0 );
 	}
@@ -354,7 +354,7 @@ public function testMoveThrowingOutOfBoundsExceptionOnInvalidIndex() {
 		$indexedArray = new ByPropertyIdArray( $statements );
 		$indexedArray->buildIndex();
 
-		$this->setExpectedException( OutOfBoundsException::class );
+		$this->expectException( OutOfBoundsException::class );
 
 		$indexedArray->moveObjectToIndex( $statements[0], 9999 );
 	}
diff --git a/tests/unit/Entity/BasicEntityIdParserTest.php b/tests/unit/Entity/BasicEntityIdParserTest.php
@@ -42,7 +42,7 @@ public function entityIdProvider() {
 	public function testCannotParseInvalidId( $invalidIdSerialization ) {
 		$parser = new BasicEntityIdParser();
 
-		$this->setExpectedException( EntityIdParsingException::class );
+		$this->expectException( EntityIdParsingException::class );
 		$parser->parse( $invalidIdSerialization );
 	}
 
diff --git a/tests/unit/Entity/DispatchingEntityIdParserTest.php b/tests/unit/Entity/DispatchingEntityIdParserTest.php
@@ -51,7 +51,7 @@ public function entityIdProvider() {
 	public function testCannotParseInvalidId( $invalidIdSerialization ) {
 		$parser = $this->getBasicParser();
 
-		$this->setExpectedException( EntityIdParsingException::class );
+		$this->expectException( EntityIdParsingException::class );
 		$parser->parse( $invalidIdSerialization );
 	}
 
@@ -75,7 +75,7 @@ public function invalidIdSerializationProvider() {
 	public function testCannotParseWithoutBuilders() {
 		$parser = new DispatchingEntityIdParser( [] );
 
-		$this->setExpectedException( EntityIdParsingException::class );
+		$this->expectException( EntityIdParsingException::class );
 		$parser->parse( 'Q1' );
 	}
 
diff --git a/tests/unit/Entity/EntityIdTest.php b/tests/unit/Entity/EntityIdTest.php
@@ -120,7 +120,7 @@ public function testSplitSerialization( $serialization, $split ) {
 	 * @dataProvider invalidSerializationProvider
 	 */
 	public function testSplitSerializationFails_GivenInvalidSerialization( $serialization ) {
-		$this->setExpectedException( InvalidArgumentException::class );
+		$this->expectException( InvalidArgumentException::class );
 		EntityId::splitSerialization( $serialization );
 	}
 
@@ -135,7 +135,7 @@ public function testJoinSerialization( $serialization, $split ) {
 	 * @dataProvider invalidJoinSerializationDataProvider
 	 */
 	public function testJoinSerializationFails_GivenEmptyId( $parts ) {
-		$this->setExpectedException( InvalidArgumentException::class );
+		$this->expectException( InvalidArgumentException::class );
 		EntityId::joinSerialization( $parts );
 	}
 
@@ -184,13 +184,11 @@ public function invalidSerializationProvider() {
 	 * @dataProvider invalidSerializationProvider
 	 */
 	public function testConstructor( $serialization ) {
-		$this->setExpectedException( InvalidArgumentException::class );
-
-		$mock = $this->getMockBuilder( EntityId::class )
-			->disableOriginalConstructor()
-			->getMockForAbstractClass();
+		$mock = $this->createMock( EntityId::class );
 
 		$constructor = ( new ReflectionClass( EntityId::class ) )->getConstructor();
+
+		$this->expectException( InvalidArgumentException::class );
 		$constructor->invoke( $mock, $serialization );
 	}
 
diff --git a/tests/unit/Entity/EntityIdValueTest.php b/tests/unit/Entity/EntityIdValueTest.php
@@ -199,7 +199,7 @@ public function validArrayProvider() {
 	 * @dataProvider invalidArrayProvider
 	 */
 	public function testCannotDeserializeInvalidSerialization( $invalidArray ) {
-		$this->setExpectedException( IllegalValueException::class );
+		$this->expectException( IllegalValueException::class );
 
 		EntityIdValue::newFromArray( $invalidArray );
 	}
diff --git a/tests/unit/Entity/EntityRedirectTest.php b/tests/unit/Entity/EntityRedirectTest.php
@@ -29,7 +29,7 @@ public function testConstruction() {
 	}
 
 	public function testConstruction_baseType() {
-		$this->setExpectedException( InvalidArgumentException::class );
+		$this->expectException( InvalidArgumentException::class );
 
 		$entityId = new ItemId( 'Q123' );
 		$targetId = new PropertyId( 'P345' );
diff --git a/tests/unit/Entity/ItemIdParserTest.php b/tests/unit/Entity/ItemIdParserTest.php
@@ -38,7 +38,7 @@ public function entityIdProvider() {
 	public function testCannotParseInvalidId( $invalidIdSerialization ) {
 		$parser = new ItemIdParser();
 
-		$this->setExpectedException( EntityIdParsingException::class );
+		$this->expectException( EntityIdParsingException::class );
 		$parser->parse( $invalidIdSerialization );
 	}
 
diff --git a/tests/unit/Entity/ItemIdTest.php b/tests/unit/Entity/ItemIdTest.php
@@ -49,7 +49,7 @@ public function idSerializationProvider() {
 	 * @dataProvider invalidIdSerializationProvider
 	 */
 	public function testCannotConstructWithInvalidSerialization( $invalidSerialization ) {
-		$this->setExpectedException( InvalidArgumentException::class );
+		$this->expectException( InvalidArgumentException::class );
 		new ItemId( $invalidSerialization );
 	}
 
@@ -142,7 +142,7 @@ public function numericIdProvider() {
 	 * @dataProvider invalidNumericIdProvider
 	 */
 	public function testNewFromNumberWithInvalidNumericId( $number ) {
-		$this->setExpectedException( InvalidArgumentException::class );
+		$this->expectException( InvalidArgumentException::class );
 		ItemId::newFromNumber( $number );
 	}
 
@@ -162,7 +162,7 @@ public function testNewFromRepositoryAndNumber() {
 	}
 
 	public function testNewFromRepositoryAndNumberWithInvalidNumericId() {
-		$this->setExpectedException( InvalidArgumentException::class );
+		$this->expectException( InvalidArgumentException::class );
 		ItemId::newFromRepositoryAndNumber( '', 'Q1' );
 	}
 
diff --git a/tests/unit/Entity/ItemTest.php b/tests/unit/Entity/ItemTest.php
@@ -52,7 +52,7 @@ public function testGetId() {
 	public function testGetSiteLinkWithNonSetSiteId() {
 		$item = new Item();
 
-		$this->setExpectedException( OutOfBoundsException::class );
+		$this->expectException( OutOfBoundsException::class );
 		$item->getSiteLinkList()->getBySiteId( 'enwiki' );
 	}
 
diff --git a/tests/unit/Entity/PropertyIdTest.php b/tests/unit/Entity/PropertyIdTest.php
@@ -49,7 +49,7 @@ public function idSerializationProvider() {
 	 * @dataProvider invalidIdSerializationProvider
 	 */
 	public function testCannotConstructWithInvalidSerialization( $invalidSerialization ) {
-		$this->setExpectedException( InvalidArgumentException::class );
+		$this->expectException( InvalidArgumentException::class );
 		new PropertyId( $invalidSerialization );
 	}
 
@@ -142,7 +142,7 @@ public function numericIdProvider() {
 	 * @dataProvider invalidNumericIdProvider
 	 */
 	public function testNewFromNumberWithInvalidNumericId( $number ) {
-		$this->setExpectedException( InvalidArgumentException::class );
+		$this->expectException( InvalidArgumentException::class );
 		PropertyId::newFromNumber( $number );
 	}
 
@@ -162,7 +162,7 @@ public function testNewFromRepositoryAndNumber() {
 	}
 
 	public function testNewFromRepositoryAndNumberWithInvalidNumericId() {
-		$this->setExpectedException( InvalidArgumentException::class );
+		$this->expectException( InvalidArgumentException::class );
 		PropertyId::newFromRepositoryAndNumber( '', 'P1' );
 	}
 
diff --git a/tests/unit/Internal/MapValueHasherTest.php b/tests/unit/Internal/MapValueHasherTest.php
@@ -59,7 +59,7 @@ public function testHash() {
 	public function testHashThrowsExceptionOnInvalidArgument() {
 		$hasher = new MapValueHasher();
 
-		$this->setExpectedException( InvalidArgumentException::class );
+		$this->expectException( InvalidArgumentException::class );
 		$hasher->hash( null );
 	}
 
diff --git a/tests/unit/LegacyIdInterpreterTest.php b/tests/unit/LegacyIdInterpreterTest.php
@@ -39,7 +39,7 @@ public function idProvider() {
 	 * @dataProvider invalidInputProvider
 	 */
 	public function testNewIdFromTypeAndNumber_withInvalidInput( $type, $number ) {
-		$this->setExpectedException( InvalidArgumentException::class );
+		$this->expectException( InvalidArgumentException::class );
 		LegacyIdInterpreter::newIdFromTypeAndNumber( $type, $number );
 	}
 
diff --git a/tests/unit/ReferenceListTest.php b/tests/unit/ReferenceListTest.php
@@ -286,7 +286,7 @@ public function testAddReferenceAtNegativeIndex() {
 		$reference = new Reference( [ new PropertyNoValueSnak( 1 ) ] );
 		$referenceList = new ReferenceList();
 
-		$this->setExpectedException( InvalidArgumentException::class );
+		$this->expectException( InvalidArgumentException::class );
 		$referenceList->addReference( $reference, -1 );
 	}
 
@@ -491,7 +491,7 @@ public function testAddNewReferenceDoesNotIgnoreCopies() {
 	public function testGivenNoneSnak_addNewReferenceThrowsException() {
 		$references = new ReferenceList();
 
-		$this->setExpectedException( InvalidArgumentException::class );
+		$this->expectException( InvalidArgumentException::class );
 		$references->addNewReference( new PropertyNoValueSnak( 1 ), null );
 	}
 
diff --git a/tests/unit/SiteLinkListTest.php b/tests/unit/SiteLinkListTest.php
@@ -21,7 +21,7 @@ class SiteLinkListTest extends \PHPUnit_Framework_TestCase {
 	 * @dataProvider notSiteLinksProvider
 	 */
 	public function testGivenNonSiteLinks_constructorThrowsException( array $notSiteLinks ) {
-		$this->setExpectedException( InvalidArgumentException::class );
+		$this->expectException( InvalidArgumentException::class );
 		new SiteLinkList( $notSiteLinks );
 	}
 
@@ -89,7 +89,7 @@ public function testEmptyCollectionHasZeroSize() {
 	 * @dataProvider siteLinkArrayWithDuplicateSiteIdProvider
 	 */
 	public function testGivenSiteIdTwice_constructorThrowsException( array $siteLinkArray ) {
-		$this->setExpectedException( InvalidArgumentException::class );
+		$this->expectException( InvalidArgumentException::class );
 		new SiteLinkList( $siteLinkArray );
 	}
 
@@ -132,7 +132,7 @@ public function testGetIteratorReturnsTraversableWithSiteIdKeys() {
 	public function testGivenNonString_getBySiteIdThrowsException() {
 		$list = new SiteLinkList( [] );
 
-		$this->setExpectedException( InvalidArgumentException::class );
+		$this->expectException( InvalidArgumentException::class );
 		$list->getBySiteId( 32202 );
 	}
 
@@ -141,7 +141,7 @@ public function testGivenUnknownSiteId_getBySiteIdThrowsException() {
 
 		$list = new SiteLinkList( [ $link ] );
 
-		$this->setExpectedException( OutOfBoundsException::class );
+		$this->expectException( OutOfBoundsException::class );
 		$list->getBySiteId( 'foo' );
 	}
 
@@ -199,7 +199,7 @@ public function testGivenSetWithDifferentOrder_equalsReturnsTrue() {
 	public function testGivenNonSiteId_removeSiteWithIdThrowsException() {
 		$list = new SiteLinkList();
 
-		$this->setExpectedException( InvalidArgumentException::class );
+		$this->expectException( InvalidArgumentException::class );
 		$list->removeLinkWithSiteId( [] );
 	}
 
diff --git a/tests/unit/SiteLinkTest.php b/tests/unit/SiteLinkTest.php
@@ -217,7 +217,7 @@ public function testCanConstructWithItemIdSet() {
 	}
 
 	public function testGivenNonItemIdCollectionForBadges_constructorThrowsException() {
-		$this->setExpectedException( InvalidArgumentException::class );
+		$this->expectException( InvalidArgumentException::class );
 		new SiteLink( 'foo', 'bar', 42 );
 	}
 
diff --git a/tests/unit/Snak/TypedSnakTest.php b/tests/unit/Snak/TypedSnakTest.php
@@ -19,7 +19,7 @@ class TypedSnakTest extends \PHPUnit_Framework_TestCase {
 
 	public function testGettersReturnCorrectValues() {
 		/** @var Snak $snak */
-		$snak = $this->getMock( Snak::class );
+		$snak = $this->createMock( Snak::class );
 		$dataTypeId = 'awesome';
 
 		$typedSnak = new TypedSnak( $snak, $dataTypeId );
diff --git a/tests/unit/Statement/StatementByGuidMapTest.php b/tests/unit/Statement/StatementByGuidMapTest.php
@@ -44,7 +44,7 @@ private function newStatement( $propertyId, $guid ) {
 	public function testGivenNonStringGuid_hasStatementWithGuidThrowsException( $nonString ) {
 		$statements = new StatementByGuidMap();
 
-		$this->setExpectedException( InvalidArgumentException::class );
+		$this->expectException( InvalidArgumentException::class );
 		$statements->hasStatementWithGuid( $nonString );
 	}
 
@@ -78,7 +78,7 @@ public function testGivenGuidOfNotPresentStatement_getStatementByGuidReturnsNull
 	public function testGivenNonStringGuid_getStatementByGuidThrowsException( $nonString ) {
 		$statements = new StatementByGuidMap();
 
-		$this->setExpectedException( InvalidArgumentException::class );
+		$this->expectException( InvalidArgumentException::class );
 		$statements->getStatementByGuid( $nonString );
 	}
 
@@ -106,12 +106,12 @@ public function testGivenGuidOfNonPresentStatement_removeStatementWithGuidDoesNo
 	public function testGivenNonStringGuid_removeStatementWithGuidThrowsException( $nonString ) {
 		$statements = new StatementByGuidMap();
 
-		$this->setExpectedException( InvalidArgumentException::class );
+		$this->expectException( InvalidArgumentException::class );
 		$statements->removeStatementWithGuid( $nonString );
 	}
 
 	public function testGivenStatementWithNoGuid_constructorThrowsException() {
-		$this->setExpectedException( InvalidArgumentException::class );
+		$this->expectException( InvalidArgumentException::class );
 
 		new StatementByGuidMap( [
 			$this->newStatement( 1, null )
diff --git a/tests/unit/Statement/StatementGuidTest.php b/tests/unit/Statement/StatementGuidTest.php
@@ -52,7 +52,7 @@ public function provideConstructionData() {
 	 * @dataProvider provideBadConstruction
 	 */
 	public function testBadConstruction( EntityId $entityId, $guid ) {
-		$this->setExpectedException( InvalidArgumentException::class );
+		$this->expectException( InvalidArgumentException::class );
 		new StatementGuid( $entityId, $guid );
 	}
 
diff --git a/tests/unit/Statement/StatementListTest.php b/tests/unit/Statement/StatementListTest.php
diff --git a/tests/unit/Statement/StatementTest.php b/tests/unit/Statement/StatementTest.php
diff --git a/tests/unit/Term/AliasGroupListTest.php b/tests/unit/Term/AliasGroupListTest.php
diff --git a/tests/unit/Term/FingerprintTest.php b/tests/unit/Term/FingerprintTest.php
diff --git a/tests/unit/Term/TermListTest.php b/tests/unit/Term/TermListTest.php
diff --git a/tests/unit/Term/TermTest.php b/tests/unit/Term/TermTest.php

-Original file line number
+Diff line change
 dist: trusty
 php:
 -  - 5.5
   - 5.6
   - 7.0
   - 7.1
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ public function entityIdProvider() {`
`42`	`42`	`public function testCannotParseInvalidId( $invalidIdSerialization ) {`
`43`	`43`	`$parser = new BasicEntityIdParser();`
`44`	`44`
`45`		`- $this->setExpectedException( EntityIdParsingException::class );`
	`45`	`+ $this->expectException( EntityIdParsingException::class );`
`46`	`46`	`$parser->parse( $invalidIdSerialization );`
`47`	`47`	`}`
`48`	`48`
Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ public function entityIdProvider() {`
`51`	`51`	`public function testCannotParseInvalidId( $invalidIdSerialization ) {`
`52`	`52`	`$parser = $this->getBasicParser();`
`53`	`53`
`54`		`- $this->setExpectedException( EntityIdParsingException::class );`
	`54`	`+ $this->expectException( EntityIdParsingException::class );`
`55`	`55`	`$parser->parse( $invalidIdSerialization );`
`56`	`56`	`}`
`57`	`57`
`@@ -75,7 +75,7 @@ public function invalidIdSerializationProvider() {`
`75`	`75`	`public function testCannotParseWithoutBuilders() {`
`76`	`76`	`$parser = new DispatchingEntityIdParser( [] );`
`77`	`77`
`78`		`- $this->setExpectedException( EntityIdParsingException::class );`
	`78`	`+ $this->expectException( EntityIdParsingException::class );`
`79`	`79`	`$parser->parse( 'Q1' );`
`80`	`80`	`}`
`81`	`81`
Original file line number	Diff line number	Diff line change
`@@ -199,7 +199,7 @@ public function validArrayProvider() {`
`199`	`199`	`* @dataProvider invalidArrayProvider`
`200`	`200`	`*/`
`201`	`201`	`public function testCannotDeserializeInvalidSerialization( $invalidArray ) {`
`202`		`- $this->setExpectedException( IllegalValueException::class );`
	`202`	`+ $this->expectException( IllegalValueException::class );`
`203`	`203`
`204`	`204`	`EntityIdValue::newFromArray( $invalidArray );`
`205`	`205`	`}`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ public function testConstruction() {`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`public function testConstruction_baseType() {`
`32`		`- $this->setExpectedException( InvalidArgumentException::class );`
	`32`	`+ $this->expectException( InvalidArgumentException::class );`
`33`	`33`
`34`	`34`	`$entityId = new ItemId( 'Q123' );`
`35`	`35`	`$targetId = new PropertyId( 'P345' );`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ public function entityIdProvider() {`
`38`	`38`	`public function testCannotParseInvalidId( $invalidIdSerialization ) {`
`39`	`39`	`$parser = new ItemIdParser();`
`40`	`40`
`41`		`- $this->setExpectedException( EntityIdParsingException::class );`
	`41`	`+ $this->expectException( EntityIdParsingException::class );`
`42`	`42`	`$parser->parse( $invalidIdSerialization );`
`43`	`43`	`}`
`44`	`44`