Merge pull request #31 from DataValues/classFeature

Make use of the …::class feature
DataValues · Jun 23, 2017 · 00a3424 · 00a3424
2 parents 956328a + d5c60e7
commit 00a3424
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 8 deletions.
diff --git a/src/Deserializers/DataValueDeserializer.php b/src/Deserializers/DataValueDeserializer.php
@@ -61,7 +61,7 @@ private function assertAreDataValueClasses( array $builders ) {
 	private function isDataValueClass( $class ) {
 		return is_string( $class )
 			&& class_exists( $class )
-			&& in_array( 'DataValues\DataValue', class_implements( $class ) );
+			&& in_array( DataValue::class, class_implements( $class ) );
 	}
 
 	/**

diff --git a/tests/Deserializers/DataValueDeserializerTest.php b/tests/Deserializers/DataValueDeserializerTest.php
@@ -3,6 +3,7 @@
 namespace Tests\DataValues\Deserializers;
 
 use DataValues\BooleanValue;
+use DataValues\DataValue;
 use DataValues\Deserializers\DataValueDeserializer;
 use DataValues\NumberValue;
 use DataValues\StringValue;
@@ -31,8 +32,8 @@ private function newDeserializer() {
 			'boolean' => function( $bool ) {
 				return new BooleanValue( $bool );
 			},
-			'number' => 'DataValues\NumberValue',
-			'string' => 'DataValues\StringValue',
+			'number' => NumberValue::class,
+			'string' => StringValue::class,
 		) );
 	}
 
@@ -81,13 +82,13 @@ public function notADataValuesListProvider() {
 			),
 			array(
 				array(
-					'string' => 'DataValues\StringValue',
+					'string' => StringValue::class,
 					'number' => 42,
 				)
 			),
 			array(
 				array(
-					'string' => 'DataValues\StringValue',
+					'string' => StringValue::class,
 					'object' => 'stdClass',
 				)
 			)
@@ -185,7 +186,7 @@ public function testGivenDataValueSerialization_deserializeReturnsDataValue( $dv
 
 		$dataValue = $deserializer->deserialize( $dvSerialization );
 
-		$this->assertInstanceOf( 'DataValues\DataValue', $dataValue );
+		$this->assertInstanceOf( DataValue::class, $dataValue );
 		$this->assertEquals( $expectedType, $dataValue->getType() );
 	}
 

diff --git a/tests/Serializers/DataValueSerializerTest.php b/tests/Serializers/DataValueSerializerTest.php
@@ -7,6 +7,7 @@
 use DataValues\Serializers\DataValueSerializer;
 use DataValues\StringValue;
 use PHPUnit_Framework_TestCase;
+use Serializers\Exceptions\SerializationException;
 
 /**
  * @covers DataValues\Serializers\DataValueSerializer
@@ -60,7 +61,7 @@ public function dataValueProvider() {
 	public function testWhenGivenNonDataValue_SerializeThrowsException( $notAnObject ) {
 		$serializer = new DataValueSerializer();
 
-		$this->setExpectedException( 'Serializers\Exceptions\SerializationException' );
+		$this->setExpectedException( SerializationException::class );
 		$serializer->serialize( $notAnObject );
 	}
 
@@ -69,7 +70,7 @@ public function testWhenGivenDataValue_SerializeCallsToArray() {
 
 		$serializer = new DataValueSerializer();
 
-		$dataValue = $this->getMock( 'DataValues\DataValue' );
+		$dataValue = $this->getMock( DataValue::class );
 		$dataValue->expects( $this->once() )
 			->method( 'toArray' )
 			->will( $this->returnValue( $returnValue ) );