Make use of the …::class feature

DataValues · Sep 28, 2017 · f36bfd0 · f36bfd0
1 parent e0182d6
commit f36bfd0
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 12 deletions.
diff --git a/tests/DataValues/MonolingualTextValueTest.php b/tests/DataValues/MonolingualTextValueTest.php
@@ -2,6 +2,7 @@
 
 namespace DataValues\Tests;
 
+use DataValues\IllegalValueException;
 use DataValues\MonolingualTextValue;
 
 /**
@@ -23,7 +24,7 @@ class MonolingualTextValueTest extends DataValueTest {
 	 * @return string
 	 */
 	public function getClass() {
-		return 'DataValues\MonolingualTextValue';
+		return MonolingualTextValue::class;
 	}
 
 	public function validConstructorArgumentsProvider() {
@@ -58,7 +59,7 @@ public function testNewFromArray() {
 	 * @dataProvider invalidArrayProvider
 	 */
 	public function testNewFromArrayWithInvalidArray( array $array ) {
-		$this->setExpectedException( 'DataValues\IllegalValueException' );
+		$this->setExpectedException( IllegalValueException::class );
 		MonolingualTextValue::newFromArray( $array );
 	}
 

diff --git a/tests/DataValues/MultilingualTextValueTest.php b/tests/DataValues/MultilingualTextValueTest.php
@@ -2,6 +2,7 @@
 
 namespace DataValues\Tests;
 
+use DataValues\IllegalValueException;
 use DataValues\MonolingualTextValue;
 use DataValues\MultilingualTextValue;
 
@@ -24,7 +25,7 @@ class MultilingualTextValueTest extends DataValueTest {
 	 * @return string
 	 */
 	public function getClass() {
-		return 'DataValues\MultilingualTextValue';
+		return MultilingualTextValue::class;
 	}
 
 	public function validConstructorArgumentsProvider() {
@@ -90,7 +91,7 @@ public function testNewFromArray() {
 	 * @dataProvider invalidArrayProvider
 	 */
 	public function testNewFromArrayWithInvalidArray( array $array ) {
-		$this->setExpectedException( 'DataValues\IllegalValueException' );
+		$this->setExpectedException( IllegalValueException::class );
 		MultilingualTextValue::newFromArray( $array );
 	}
 
@@ -131,7 +132,7 @@ public function testGetTexts( MultilingualTextValue $texts, array $arguments ) {
 		$actual = $texts->getTexts();
 
 		$this->assertInternalType( 'array', $actual );
-		$this->assertContainsOnlyInstancesOf( '\DataValues\MonolingualTextValue', $actual );
+		$this->assertContainsOnlyInstancesOf( MonolingualTextValue::class, $actual );
 		$this->assertEquals( $arguments[0], array_values( $actual ) );
 	}
 

diff --git a/tests/ValueFormatters/StringFormatterTest.php b/tests/ValueFormatters/StringFormatterTest.php
@@ -3,6 +3,7 @@
 namespace ValueFormatters\Test;
 
 use DataValues\StringValue;
+use InvalidArgumentException;
 use ValueFormatters\FormatterOptions;
 use ValueFormatters\StringFormatter;
 
@@ -46,7 +47,7 @@ public function validProvider() {
 	 */
 	public function testInvalidFormat( $value ) {
 		$formatter = new StringFormatter();
-		$this->setExpectedException( 'InvalidArgumentException' );
+		$this->setExpectedException( InvalidArgumentException::class );
 		$formatter->format( $value );
 	}
 

diff --git a/tests/ValueParsers/DispatchingValueParserTest.php b/tests/ValueParsers/DispatchingValueParserTest.php
@@ -27,7 +27,7 @@ class DispatchingValueParserTest extends PHPUnit_Framework_TestCase {
 	 * @return ValueParser
 	 */
 	private function getParser( PHPUnit_Framework_MockObject_Matcher_Invocation $invocation ) {
-		$mock = $this->getMock( 'ValueParsers\ValueParser' );
+		$mock = $this->getMock( ValueParser::class );
 
 		$mock->expects( $invocation )
 			->method( 'parse' )
@@ -81,7 +81,7 @@ public function testParseThrowsException() {
 			'format'
 		);
 
-		$this->setExpectedException( 'ValueParsers\ParseException' );
+		$this->setExpectedException( ParseException::class );
 		$parser->parse( 'invalid' );
 	}
 

diff --git a/tests/ValueParsers/Normalizers/NullStringNormalizerTest.php b/tests/ValueParsers/Normalizers/NullStringNormalizerTest.php
@@ -3,6 +3,7 @@
 namespace ValueParsers\Normalizers\Test;
 
 use DataValues\StringValue;
+use InvalidArgumentException;
 use PHPUnit_Framework_TestCase;
 use ValueParsers\Normalizers\NullStringNormalizer;
 
@@ -38,7 +39,7 @@ public function stringProvider() {
 	 */
 	public function testNormalizeException( $value ) {
 		$normalizer = new NullStringNormalizer();
-		$this->setExpectedException( 'InvalidArgumentException' );
+		$this->setExpectedException( InvalidArgumentException::class );
 		$normalizer->normalize( $value );
 	}
 

diff --git a/tests/ValueParsers/StringParserTest.php b/tests/ValueParsers/StringParserTest.php
@@ -19,7 +19,7 @@
 class StringParserTest extends \PHPUnit_Framework_TestCase {
 
 	public function provideParse() {
-		$normalizer = $this->getMock( 'ValueParsers\Normalizers\StringNormalizer' );
+		$normalizer = $this->getMock( StringNormalizer::class );
 		$normalizer->expects( $this->once() )
 			->method( 'normalize' )
 			->will( $this->returnCallback( function( $value ) {
@@ -39,7 +39,7 @@ public function testParse( $input, StringNormalizer $normalizer = null, DataValu
 		$parser = new StringParser( $normalizer );
 		$value = $parser->parse( $input );
 
-		$this->assertInstanceOf( 'DataValues\StringValue', $value );
+		$this->assertInstanceOf( StringValue::class, $value );
 		$this->assertEquals( $expected->toArray(), $value->toArray() );
 	}
 

diff --git a/tests/ValueParsers/ValueParserTestBase.php b/tests/ValueParsers/ValueParserTestBase.php
@@ -5,6 +5,7 @@
 use Comparable;
 use DataValues\DataValue;
 use PHPUnit_Framework_TestCase;
+use ValueParsers\ParseException;
 use ValueParsers\ValueParser;
 
 /**
@@ -89,7 +90,7 @@ public function testParseWithInvalidInputs( $value, ValueParser $parser = null )
 			$parser = $this->getInstance();
 		}
 
-		$this->setExpectedException( 'ValueParsers\ParseException' );
+		$this->setExpectedException( ParseException::class );
 		$parser->parse( $value );
 	}