Merge pull request #744 from wmde/classFeature

Make use of the …::class feature

Author: Ladsgroup

composer.json

@@ -23,7 +23,7 @@
 		"irc": "irc://irc.freenode.net/wikidata"
 	},
 	"require": {
-		"php": ">=5.5.0",
+		"php": ">=5.5.9",
 		"data-values/data-values": "~0.1|~1.0",
 		"wikimedia/assert": "~0.2.2"
 	},

src/Snak/SnakList.php

@@ -44,7 +44,7 @@ public function __construct( $snaks = [] ) {
 	 * @return string
 	 */
 	public function getObjectType() {
-		return 'Wikibase\DataModel\Snak\Snak';
+		return Snak::class;
 	}
 
 	/**

tests/fixtures/HashArrayWithoutDuplicates.php

@@ -2,6 +2,7 @@
 
 namespace Wikibase\DataModel\Fixtures;
 
+use Hashable;
 use Wikibase\DataModel\HashArray;
 
 /**
@@ -11,7 +12,7 @@
 class HashArrayWithoutDuplicates extends HashArray {
 
 	public function getObjectType() {
-		return '\Hashable';
+		return Hashable::class;
 	}
 
 }

tests/unit/ByPropertyIdArrayTest.php

@@ -4,9 +4,12 @@
 
 use ArrayObject;
 use DataValues\StringValue;
+use InvalidArgumentException;
+use OutOfBoundsException;
 use PHPUnit_Framework_TestCase;
 use ReflectionClass;
 use ReflectionMethod;
+use RuntimeException;
 use stdClass;
 use Wikibase\DataModel\ByPropertyIdArray;
 use Wikibase\DataModel\Entity\PropertyId;
@@ -39,7 +42,7 @@ public function testGivenNonTraversableObject_constructorDoesNotCastObjectToArra
 		$object = new stdClass();
 		$object->property = true;
 
-		$this->setExpectedException( 'InvalidArgumentException' );
+		$this->setExpectedException( InvalidArgumentException::class );
 		new ByPropertyIdArray( $object );
 	}
 
@@ -67,7 +70,7 @@ public function testArrayObjectNotConstructedFromObject() {
 	 * @return ReflectionMethod
 	 */
 	protected static function getMethod( $methodName ) {
-		$class = new ReflectionClass( 'Wikibase\DataModel\ByPropertyIdArray' );
+		$class = new ReflectionClass( ByPropertyIdArray::class );
 		$method = $class->getMethod( $methodName );
 		$method->setAccessible( true );
 		return $method;
@@ -209,22 +212,22 @@ public function testGetByNotSetIdThrowsException() {
 		$indexedArray = new ByPropertyIdArray();
 		$indexedArray->buildIndex();
 
-		$this->setExpectedException( 'OutOfBoundsException' );
+		$this->setExpectedException( OutOfBoundsException::class );
 
 		$indexedArray->getByPropertyId( new PropertyId( 'P9000' ) );
 	}
 
 	public function testNotBuildExceptionIsThrownForByPropertyId() {
 		$indexedArray = new ByPropertyIdArray();
 
-		$this->setExpectedException( 'RuntimeException' );
+		$this->setExpectedException( RuntimeException::class );
 		$indexedArray->getByPropertyId( new PropertyId( 'P9000' ) );
 	}
 
 	public function testNotBuildExceptionIsThrownForGetPropertyIds() {
 		$indexedArray = new ByPropertyIdArray();
 
-		$this->setExpectedException( 'RuntimeException' );
+		$this->setExpectedException( RuntimeException::class );
 		$indexedArray->getPropertyIds();
 	}
 
@@ -341,7 +344,7 @@ public function testMoveThrowingOutOfBoundsExceptionIfObjectNotPresent() {
 		$indexedArray = new ByPropertyIdArray( $statements );
 		$indexedArray->buildIndex();
 
-		$this->setExpectedException( 'OutOfBoundsException' );
+		$this->setExpectedException( OutOfBoundsException::class );
 
 		$indexedArray->moveObjectToIndex( new Statement( new PropertyNoValueSnak( new PropertyId( 'P9999' ) ) ), 0 );
 	}
@@ -351,7 +354,7 @@ public function testMoveThrowingOutOfBoundsExceptionOnInvalidIndex() {
 		$indexedArray = new ByPropertyIdArray( $statements );
 		$indexedArray->buildIndex();
 
-		$this->setExpectedException( 'OutOfBoundsException' );
+		$this->setExpectedException( OutOfBoundsException::class );
 
 		$indexedArray->moveObjectToIndex( $statements[0], 9999 );
 	}

tests/unit/Entity/BasicEntityIdParserTest.php

@@ -4,6 +4,7 @@
 
 use Wikibase\DataModel\Entity\BasicEntityIdParser;
 use Wikibase\DataModel\Entity\EntityId;
+use Wikibase\DataModel\Entity\EntityIdParsingException;
 use Wikibase\DataModel\Entity\ItemId;
 use Wikibase\DataModel\Entity\PropertyId;
 
@@ -41,7 +42,7 @@ public function entityIdProvider() {
 	public function testCannotParseInvalidId( $invalidIdSerialization ) {
 		$parser = new BasicEntityIdParser();
 
-		$this->setExpectedException( 'Wikibase\DataModel\Entity\EntityIdParsingException' );
+		$this->setExpectedException( EntityIdParsingException::class );
 		$parser->parse( $invalidIdSerialization );
 	}
 

tests/unit/Entity/DispatchingEntityIdParserTest.php

@@ -5,6 +5,7 @@
 use Wikibase\DataModel\Entity\BasicEntityIdParser;
 use Wikibase\DataModel\Entity\DispatchingEntityIdParser;
 use Wikibase\DataModel\Entity\EntityId;
+use Wikibase\DataModel\Entity\EntityIdParsingException;
 use Wikibase\DataModel\Entity\ItemId;
 use Wikibase\DataModel\Entity\PropertyId;
 
@@ -50,7 +51,7 @@ public function entityIdProvider() {
 	public function testCannotParseInvalidId( $invalidIdSerialization ) {
 		$parser = $this->getBasicParser();
 
-		$this->setExpectedException( 'Wikibase\DataModel\Entity\EntityIdParsingException' );
+		$this->setExpectedException( EntityIdParsingException::class );
 		$parser->parse( $invalidIdSerialization );
 	}
 
@@ -74,7 +75,7 @@ public function invalidIdSerializationProvider() {
 	public function testCannotParseWithoutBuilders() {
 		$parser = new DispatchingEntityIdParser( [] );
 
-		$this->setExpectedException( 'Wikibase\DataModel\Entity\EntityIdParsingException' );
+		$this->setExpectedException( EntityIdParsingException::class );
 		$parser->parse( 'Q1' );
 	}
 

tests/unit/Entity/EntityIdValueTest.php

@@ -2,6 +2,7 @@
 
 namespace Wikibase\DataModel\Tests\Entity;
 
+use DataValues\IllegalValueException;
 use PHPUnit_Framework_TestCase;
 use Wikibase\DataModel\Entity\EntityId;
 use Wikibase\DataModel\Entity\EntityIdValue;
@@ -200,7 +201,7 @@ public function validArrayProvider() {
 	 * @dataProvider invalidArrayProvider
 	 */
 	public function testCannotDeserializeInvalidSerialization( $invalidArray ) {
-		$this->setExpectedException( 'DataValues\IllegalValueException' );
+		$this->setExpectedException( IllegalValueException::class );
 
 		EntityIdValue::newFromArray( $invalidArray );
 	}

tests/unit/Entity/EntityRedirectTest.php

@@ -2,6 +2,7 @@
 
 namespace Wikibase\DataModel\Tests\Entity;
 
+use InvalidArgumentException;
 use Wikibase\DataModel\Entity\EntityRedirect;
 use Wikibase\DataModel\Entity\ItemId;
 use Wikibase\DataModel\Entity\PropertyId;
@@ -28,7 +29,7 @@ public function testConstruction() {
 	}
 
 	public function testConstruction_baseType() {
-		$this->setExpectedException( 'InvalidArgumentException' );
+		$this->setExpectedException( InvalidArgumentException::class );
 
 		$entityId = new ItemId( 'Q123' );
 		$targetId = new PropertyId( 'P345' );

tests/unit/Entity/ItemIdParserTest.php

@@ -3,6 +3,7 @@
 namespace Wikibase\DataModel\Tests\Entity;
 
 use PHPUnit_Framework_TestCase;
+use Wikibase\DataModel\Entity\EntityIdParsingException;
 use Wikibase\DataModel\Entity\ItemId;
 use Wikibase\DataModel\Entity\ItemIdParser;
 
@@ -37,7 +38,7 @@ public function entityIdProvider() {
 	public function testCannotParseInvalidId( $invalidIdSerialization ) {
 		$parser = new ItemIdParser();
 
-		$this->setExpectedException( 'Wikibase\DataModel\Entity\EntityIdParsingException' );
+		$this->setExpectedException( EntityIdParsingException::class );
 		$parser->parse( $invalidIdSerialization );
 	}
 

tests/unit/Entity/ItemIdSetTest.php

@@ -2,6 +2,7 @@
 
 namespace Wikibase\DataModel\Tests\Entity;
 
+use Traversable;
 use Wikibase\DataModel\Entity\ItemId;
 use Wikibase\DataModel\Entity\ItemIdSet;
 
@@ -18,7 +19,7 @@ class ItemIdSetTest extends \PHPUnit_Framework_TestCase {
 
 	public function testGetIterator() {
 		$set = new ItemIdSet();
-		$this->assertInstanceOf( 'Traversable', $set->getIterator() );
+		$this->assertInstanceOf( Traversable::class, $set->getIterator() );
 	}
 
 	/**