Skip to content

Commit af76a3f

Browse files
thiemowmdethiemowmde
committed
Make use of the …::class feature
1 parent 1624f27 commit af76a3f

29 files changed

Lines changed: 137 additions & 82 deletions

‎tests/integration/SnakSerializationRoundtripTest.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ private function getSnakDeserializer( array $dataValueClasses = array() ) {
4141
public function testSnakSerializationRoundtrips( Snak $snak ) {
4242
$serializer = $this->getSnakSerializer();
4343
$deserializer = $this->getSnakDeserializer( array (
44-
'string' => 'DataValues\StringValue',
44+
'string' => StringValue::class,
4545
) );
4646

4747
$serialization = $serializer->serialize( $snak );
@@ -67,7 +67,7 @@ public function snakProvider() {
6767
public function testUnDeserializableValueToStringValueRoundtrip() {
6868
$serializer = $this->getSnakSerializer();
6969
$deserializer = $this->getSnakDeserializer( array (
70-
'string' => 'DataValues\StringValue',
70+
'string' => StringValue::class,
7171
) );
7272

7373
$badSnak = new PropertyValueSnak( 42, new UnDeserializableValue( 'Yay', 'string', '' ) );

‎tests/unit/Deserializers/AliasGroupListDeserializerTest.php‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
namespace Tests\Wikibase\DataModel\Deserializers;
44

5+
use Deserializers\Exceptions\DeserializationException;
56
use PHPUnit_Framework_TestCase;
67
use Wikibase\DataModel\Deserializers\AliasGroupListDeserializer;
78
use Wikibase\DataModel\Term\AliasGroup;
@@ -21,7 +22,8 @@ class AliasGroupListDeserializerTest extends PHPUnit_Framework_TestCase {
2122
*/
2223
public function testDeserializeThrowsDeserializationException( $nonDeserializable ) {
2324
$deserializer = new AliasGroupListDeserializer();
24-
$this->setExpectedException( 'Deserializers\Exceptions\DeserializationException' );
25+
26+
$this->setExpectedException( DeserializationException::class );
2527
$deserializer->deserialize( $nonDeserializable );
2628
}
2729

‎tests/unit/Deserializers/DispatchableDeserializerTest.php‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
namespace Tests\Wikibase\DataModel\Deserializers;
44

55
use Deserializers\DispatchableDeserializer;
6+
use Deserializers\Exceptions\DeserializationException;
67
use PHPUnit_Framework_TestCase;
78

89
/**
@@ -18,7 +19,7 @@ abstract class DispatchableDeserializerTest extends PHPUnit_Framework_TestCase {
1819
protected abstract function buildDeserializer();
1920

2021
public function testImplementsDispatchableDeserializerInterface() {
21-
$this->assertInstanceOf( 'Deserializers\DispatchableDeserializer', $this->buildDeserializer() );
22+
$this->assertInstanceOf( DispatchableDeserializer::class, $this->buildDeserializer() );
2223
}
2324

2425
/**
@@ -45,7 +46,8 @@ public function testIsDeserializerForReturnsFalse( $nonDeserializable ) {
4546
*/
4647
public function testDeserializeThrowsDeserializationException( $nonDeserializable ) {
4748
$deserializer = $this->buildDeserializer();
48-
$this->setExpectedException( 'Deserializers\Exceptions\DeserializationException' );
49+
50+
$this->setExpectedException( DeserializationException::class );
4951
$deserializer->deserialize( $nonDeserializable );
5052
}
5153

‎tests/unit/Deserializers/EntityIdDeserializerTest.php‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,10 @@
22

33
namespace Tests\Wikibase\DataModel\Deserializers;
44

5+
use Deserializers\Exceptions\DeserializationException;
56
use PHPUnit_Framework_TestCase;
67
use Wikibase\DataModel\Deserializers\EntityIdDeserializer;
8+
use Wikibase\DataModel\Entity\EntityIdParser;
79
use Wikibase\DataModel\Entity\EntityIdParsingException;
810
use Wikibase\DataModel\Entity\ItemId;
911

@@ -16,7 +18,7 @@
1618
class EntityIdDeserializerTest extends PHPUnit_Framework_TestCase {
1719

1820
private function buildDeserializer() {
19-
$entityIdParserMock = $this->getMock( '\Wikibase\DataModel\Entity\EntityIdParser' );
21+
$entityIdParserMock = $this->getMock( EntityIdParser::class );
2022
$entityIdParserMock->expects( $this->any() )
2123
->method( 'parse' )
2224
->with( $this->equalTo( 'Q42' ) )
@@ -30,7 +32,8 @@ private function buildDeserializer() {
3032
*/
3133
public function testDeserializeThrowsDeserializationException( $nonDeserializable ) {
3234
$deserializer = $this->buildDeserializer();
33-
$this->setExpectedException( 'Deserializers\Exceptions\DeserializationException' );
35+
36+
$this->setExpectedException( DeserializationException::class );
3437
$deserializer->deserialize( $nonDeserializable );
3538
}
3639

@@ -63,13 +66,13 @@ public function deserializationProvider() {
6366
}
6467

6568
public function testDeserializeWithEntityIdParsingException() {
66-
$entityIdParserMock = $this->getMock( '\Wikibase\DataModel\Entity\EntityIdParser' );
69+
$entityIdParserMock = $this->getMock( EntityIdParser::class );
6770
$entityIdParserMock->expects( $this->any() )
6871
->method( 'parse' )
6972
->will( $this->throwException( new EntityIdParsingException() ) );
7073
$entityIdDeserializer = new EntityIdDeserializer( $entityIdParserMock );
7174

72-
$this->setExpectedException( '\Deserializers\Exceptions\DeserializationException' );
75+
$this->setExpectedException( DeserializationException::class );
7376
$entityIdDeserializer->deserialize( 'test' );
7477
}
7578

‎tests/unit/Deserializers/ItemDeserializerTest.php‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
namespace Tests\Wikibase\DataModel\Deserializers;
44

5+
use Deserializers\Deserializer;
56
use Wikibase\DataModel\Deserializers\ItemDeserializer;
67
use Wikibase\DataModel\Entity\Item;
78
use Wikibase\DataModel\Entity\ItemId;
@@ -24,13 +25,13 @@
2425
class ItemDeserializerTest extends DispatchableDeserializerTest {
2526

2627
protected function buildDeserializer() {
27-
$entityIdDeserializerMock = $this->getMock( '\Deserializers\Deserializer' );
28+
$entityIdDeserializerMock = $this->getMock( Deserializer::class );
2829
$entityIdDeserializerMock->expects( $this->any() )
2930
->method( 'deserialize' )
3031
->with( $this->equalTo( 'Q42' ) )
3132
->will( $this->returnValue( new ItemId( 'Q42' ) ) );
3233

33-
$termListDeserializerMock = $this->getMock( '\Deserializers\Deserializer' );
34+
$termListDeserializerMock = $this->getMock( Deserializer::class );
3435
$termListDeserializerMock->expects( $this->any() )
3536
->method( 'deserialize' )
3637
->with( $this->equalTo( array(
@@ -41,7 +42,7 @@ protected function buildDeserializer() {
4142
) ) )
4243
->will( $this->returnValue( new TermList( array( new Term( 'en', 'foo' ) ) ) ) );
4344

44-
$aliasGroupListDeserializerMock = $this->getMock( '\Deserializers\Deserializer' );
45+
$aliasGroupListDeserializerMock = $this->getMock( Deserializer::class );
4546
$aliasGroupListDeserializerMock->expects( $this->any() )
4647
->method( 'deserialize' )
4748
->with( $this->equalTo( array(
@@ -55,7 +56,7 @@ protected function buildDeserializer() {
5556
$statement = new Statement( new PropertyNoValueSnak( 42 ) );
5657
$statement->setGuid( 'test' );
5758

58-
$statementListDeserializerMock = $this->getMock( '\Deserializers\Deserializer' );
59+
$statementListDeserializerMock = $this->getMock( Deserializer::class );
5960
$statementListDeserializerMock->expects( $this->any() )
6061
->method( 'deserialize' )
6162
->with( $this->equalTo( array(
@@ -72,7 +73,7 @@ protected function buildDeserializer() {
7273
) ) )
7374
->will( $this->returnValue( new StatementList( array( $statement ) ) ) );
7475

75-
$siteLinkDeserializerMock = $this->getMock( '\Deserializers\Deserializer' );
76+
$siteLinkDeserializerMock = $this->getMock( Deserializer::class );
7677
$siteLinkDeserializerMock->expects( $this->any() )
7778
->method( 'deserialize' )
7879
->with( $this->equalTo( array(

‎tests/unit/Deserializers/PropertyDeserializerTest.php‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
namespace Tests\Wikibase\DataModel\Deserializers;
44

5+
use Deserializers\Deserializer;
56
use Wikibase\DataModel\Deserializers\PropertyDeserializer;
67
use Wikibase\DataModel\Entity\Property;
78
use Wikibase\DataModel\Entity\PropertyId;
@@ -23,13 +24,13 @@
2324
class PropertyDeserializerTest extends DispatchableDeserializerTest {
2425

2526
protected function buildDeserializer() {
26-
$entityIdDeserializerMock = $this->getMock( '\Deserializers\Deserializer' );
27+
$entityIdDeserializerMock = $this->getMock( Deserializer::class );
2728
$entityIdDeserializerMock->expects( $this->any() )
2829
->method( 'deserialize' )
2930
->with( $this->equalTo( 'P42' ) )
3031
->will( $this->returnValue( new PropertyId( 'P42' ) ) );
3132

32-
$termListDeserializerMock = $this->getMock( '\Deserializers\Deserializer' );
33+
$termListDeserializerMock = $this->getMock( Deserializer::class );
3334
$termListDeserializerMock->expects( $this->any() )
3435
->method( 'deserialize' )
3536
->with( $this->equalTo( array(
@@ -40,7 +41,7 @@ protected function buildDeserializer() {
4041
) ) )
4142
->will( $this->returnValue( new TermList( array( new Term( 'en', 'foo' ) ) ) ) );
4243

43-
$aliasGroupListDeserializerMock = $this->getMock( '\Deserializers\Deserializer' );
44+
$aliasGroupListDeserializerMock = $this->getMock( Deserializer::class );
4445
$aliasGroupListDeserializerMock->expects( $this->any() )
4546
->method( 'deserialize' )
4647
->with( $this->equalTo( array(
@@ -54,7 +55,7 @@ protected function buildDeserializer() {
5455
$statement = new Statement( new PropertyNoValueSnak( 42 ) );
5556
$statement->setGuid( 'test' );
5657

57-
$statementListDeserializerMock = $this->getMock( '\Deserializers\Deserializer' );
58+
$statementListDeserializerMock = $this->getMock( Deserializer::class );
5859
$statementListDeserializerMock->expects( $this->any() )
5960
->method( 'deserialize' )
6061
->with( $this->equalTo( array(

‎tests/unit/Deserializers/ReferenceDeserializerTest.php‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22

33
namespace Tests\Wikibase\DataModel\Deserializers;
44

5+
use Deserializers\Deserializer;
6+
use Deserializers\Exceptions\DeserializationException;
7+
use Deserializers\Exceptions\InvalidAttributeException;
58
use Wikibase\DataModel\Deserializers\ReferenceDeserializer;
69
use Wikibase\DataModel\Entity\PropertyId;
710
use Wikibase\DataModel\Reference;
@@ -18,7 +21,7 @@
1821
class ReferenceDeserializerTest extends DispatchableDeserializerTest {
1922

2023
protected function buildDeserializer() {
21-
$snaksDeserializerMock = $this->getMock( '\Deserializers\Deserializer' );
24+
$snaksDeserializerMock = $this->getMock( Deserializer::class );
2225
$snaksDeserializerMock->expects( $this->any() )
2326
->method( 'deserialize' )
2427
->with( $this->equalTo( array() ) )
@@ -68,7 +71,7 @@ public function deserializationProvider() {
6871
}
6972

7073
public function testSnaksOrderDeserialization() {
71-
$snaksDeserializerMock = $this->getMock( '\Deserializers\Deserializer' );
74+
$snaksDeserializerMock = $this->getMock( Deserializer::class );
7275
$snaksDeserializerMock->expects( $this->any() )
7376
->method( 'deserialize' )
7477
->with( $this->equalTo( array(
@@ -137,7 +140,7 @@ public function testSnaksOrderDeserialization() {
137140
* @dataProvider invalidDeserializationProvider
138141
*/
139142
public function testInvalidSerialization( $serialization ) {
140-
$this->setExpectedException( 'Deserializers\Exceptions\DeserializationException' );
143+
$this->setExpectedException( DeserializationException::class );
141144
$this->buildDeserializer()->deserialize( $serialization );
142145
}
143146

@@ -151,7 +154,7 @@ public function invalidDeserializationProvider() {
151154
}
152155

153156
public function testGivenInvalidSnaksOrderAttribute_exceptionIsThrown() {
154-
$this->setExpectedException( 'Deserializers\Exceptions\InvalidAttributeException' );
157+
$this->setExpectedException( InvalidAttributeException::class );
155158
$this->buildDeserializer()->deserialize( array(
156159
'hash' => 'foo',
157160
'snaks' => array(),

‎tests/unit/Deserializers/ReferenceListDeserializerTest.php‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
namespace Tests\Wikibase\DataModel\Deserializers;
44

5+
use Deserializers\Deserializer;
6+
use Deserializers\Exceptions\DeserializationException;
57
use PHPUnit_Framework_TestCase;
68
use Wikibase\DataModel\Deserializers\ReferenceListDeserializer;
79
use Wikibase\DataModel\Reference;
@@ -16,7 +18,7 @@
1618
class ReferenceListDeserializerTest extends PHPUnit_Framework_TestCase {
1719

1820
private function buildDeserializer() {
19-
$referenceDeserializerMock = $this->getMock( '\Deserializers\Deserializer' );
21+
$referenceDeserializerMock = $this->getMock( Deserializer::class );
2022

2123
$referenceDeserializerMock->expects( $this->any() )
2224
->method( 'deserialize' )
@@ -34,7 +36,8 @@ private function buildDeserializer() {
3436
*/
3537
public function testDeserializeThrowsDeserializationException( $nonDeserializable ) {
3638
$deserializer = $this->buildDeserializer();
37-
$this->setExpectedException( 'Deserializers\Exceptions\DeserializationException' );
39+
40+
$this->setExpectedException( DeserializationException::class );
3841
$deserializer->deserialize( $nonDeserializable );
3942
}
4043

‎tests/unit/Deserializers/SiteLinkDeserializerTest.php‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22

33
namespace Tests\Wikibase\DataModel\Deserializers;
44

5+
use Deserializers\Deserializer;
6+
use Deserializers\Exceptions\DeserializationException;
7+
use Deserializers\Exceptions\InvalidAttributeException;
58
use PHPUnit_Framework_TestCase;
69
use Wikibase\DataModel\Deserializers\SiteLinkDeserializer;
710
use Wikibase\DataModel\Entity\ItemId;
@@ -17,7 +20,7 @@
1720
class SiteLinkDeserializerTest extends PHPUnit_Framework_TestCase {
1821

1922
private function buildDeserializer() {
20-
$entityIdDeserializerMock = $this->getMock( '\Deserializers\Deserializer' );
23+
$entityIdDeserializerMock = $this->getMock( Deserializer::class );
2124
$entityIdDeserializerMock->expects( $this->any() )
2225
->method( 'deserialize' )
2326
->with( $this->equalTo( 'Q42' ) )
@@ -31,7 +34,8 @@ private function buildDeserializer() {
3134
*/
3235
public function testDeserializeThrowsDeserializationException( $nonDeserializable ) {
3336
$deserializer = $this->buildDeserializer();
34-
$this->setExpectedException( 'Deserializers\Exceptions\DeserializationException' );
37+
38+
$this->setExpectedException( DeserializationException::class );
3539
$deserializer->deserialize( $nonDeserializable );
3640
}
3741

@@ -91,14 +95,14 @@ public function deserializationProvider() {
9195
}
9296

9397
public function testDeserializeItemIdFilterPropertyId() {
94-
$entityIdDeserializerMock = $this->getMock( '\Deserializers\Deserializer' );
98+
$entityIdDeserializerMock = $this->getMock( Deserializer::class );
9599
$entityIdDeserializerMock->expects( $this->any() )
96100
->method( 'deserialize' )
97101
->with( $this->equalTo( 'P42' ) )
98102
->will( $this->returnValue( new PropertyId( 'P42' ) ) );
99103
$deserializer = new SiteLinkDeserializer( $entityIdDeserializerMock );
100104

101-
$this->setExpectedException( '\Deserializers\Exceptions\InvalidAttributeException' );
105+
$this->setExpectedException( InvalidAttributeException::class );
102106
$deserializer->deserialize( array(
103107
'site' => 'frwikisource',
104108
'title' => 'Nyan Cat',
@@ -107,10 +111,10 @@ public function testDeserializeItemIdFilterPropertyId() {
107111
}
108112

109113
public function testAssertBadgesIsArray() {
110-
$entityIdDeserializerMock = $this->getMock( '\Deserializers\Deserializer' );
114+
$entityIdDeserializerMock = $this->getMock( Deserializer::class );
111115
$deserializer = new SiteLinkDeserializer( $entityIdDeserializerMock );
112116

113-
$this->setExpectedException( '\Deserializers\Exceptions\InvalidAttributeException' );
117+
$this->setExpectedException( InvalidAttributeException::class );
114118
$deserializer->deserialize( array(
115119
'site' => 'frwikisource',
116120
'title' => 'Nyan Cat',

0 commit comments

Comments
 (0)