Make use of the …::class feature

thiemowmde · thiemowmde · commit 2714084745ca · 2017-09-28T19:47:22.000+02:00
diff --git a/tests/Modules/DataTypesModuleTest.php b/tests/Modules/DataTypesModuleTest.php
@@ -4,6 +4,7 @@
 
 use DataTypes\DataTypeFactory;
 use DataTypes\Modules\DataTypesModule;
+use Exception;
 use ResourceLoaderContext;
 
 /**
@@ -52,10 +53,7 @@ public function provideDataTypesModuleAndResourceDefinition() {
 	 * @param DataTypesModule $module
 	 */
 	public function testGetDataTypeFactory( DataTypesModule $module ) {
-		$this->assertInstanceOf(
-			'DataTypes\DataTypeFactory',
-			$module->getDataTypeFactory()
-		);
+		$this->assertInstanceOf( DataTypeFactory::class, $module->getDataTypeFactory() );
 	}
 
 	/**
@@ -136,7 +134,7 @@ public function testGetConfigVarName( DataTypesModule $module, array $definition
 	 */
 	public function testConstructorErrors( array $definition, $caseDescription ) {
 		$this->setName( 'Instantiation raises exception in case ' . $caseDescription );
-		$this->setExpectedException( 'Exception' );
+		$this->setExpectedException( Exception::class );
 
 		new DataTypesModule( $definition );
 	}
@@ -186,7 +184,7 @@ private function makeDefinition( array $dataTypes ) {
 	 * @return ResourceLoaderContext
 	 */
 	private function getContext() {
-		return $this->getMockBuilder( 'ResourceLoaderContext' )
+		return $this->getMockBuilder( ResourceLoaderContext::class )
 			->disableOriginalConstructor()
 			->getMock();
 	}
diff --git a/tests/Phpunit/DataTypeFactoryTest.php b/tests/Phpunit/DataTypeFactoryTest.php
@@ -4,6 +4,8 @@
 
 use DataTypes\DataType;
 use DataTypes\DataTypeFactory;
+use InvalidArgumentException;
+use OutOfBoundsException;
 use PHPUnit_Framework_TestCase;
 
 /**
@@ -23,7 +25,7 @@ class DataTypeFactoryTest extends PHPUnit_Framework_TestCase {
 	 */
 	public function testConstructor( array $valueTypes ) {
 		$instance = new DataTypeFactory( $valueTypes );
-		$this->assertInstanceOf( 'DataTypes\DataTypeFactory', $instance );
+		$this->assertInstanceOf( DataTypeFactory::class, $instance );
 	}
 
 	public function valueTypesProvider() {
@@ -38,7 +40,7 @@ public function valueTypesProvider() {
 	 * @dataProvider invalidConstructorArgumentProvider
 	 */
 	public function testConstructorThrowsException( array $argument ) {
-		$this->setExpectedException( 'InvalidArgumentException' );
+		$this->setExpectedException( InvalidArgumentException::class );
 		new DataTypeFactory( $argument );
 	}
 
@@ -70,7 +72,7 @@ public function testGetType() {
 	public function testGetUnknownType() {
 		$instance = new DataTypeFactory( [] );
 
-		$this->setExpectedException( 'OutOfBoundsException' );
+		$this->setExpectedException( OutOfBoundsException::class );
 		$instance->getType( 'unknownTypeId' );
 	}
 
diff --git a/tests/Phpunit/DataTypeTest.php b/tests/Phpunit/DataTypeTest.php
@@ -3,6 +3,7 @@
 namespace DataTypes\Tests\Phpunit;
 
 use DataTypes\DataType;
+use InvalidArgumentException;
 use PHPUnit_Framework_TestCase;
 
 /**
@@ -20,7 +21,7 @@ class DataTypeTest extends PHPUnit_Framework_TestCase {
 	 * @dataProvider invalidConstructorArgumentsProvider
 	 */
 	public function testConstructorThrowsException( $propertyType, $valueType ) {
-		$this->setExpectedException( 'InvalidArgumentException' );
+		$this->setExpectedException( InvalidArgumentException::class );
 		new DataType( $propertyType, $valueType );
 	}
 
