Skip to content

Commit e5fa48c

Browse files
thiemowmdethiemowmde
committed
Remove optional SnakList construction
1 parent f4ced16 commit e5fa48c

4 files changed

Lines changed: 46 additions & 60 deletions

File tree

‎tests/unit/Entity/ItemTest.php‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -62,13 +62,13 @@ public function makeClaims() {
6262
$claims[] = new Statement(
6363
new Claim( new PropertyNoValueSnak( 42 ), null ),
6464
new ReferenceList( array(
65-
new Reference( new SnakList( array(
65+
new Reference( array(
6666
new PropertyNoValueSnak( 24 ),
67-
new PropertyValueSnak( 1, new StringValue( 'onoez' ) ) ) )
68-
),
69-
new Reference( new SnakList( array(
70-
new PropertyValueSnak( 1, $id9001 ) ) )
71-
)
67+
new PropertyValueSnak( 1, new StringValue( 'onoez' ) ),
68+
) ),
69+
new Reference( array(
70+
new PropertyValueSnak( 1, $id9001 ),
71+
) )
7272
) )
7373
);
7474

‎tests/unit/ReferenceListTest.php‎

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
use Wikibase\DataModel\Reference;
99
use Wikibase\DataModel\ReferenceList;
1010
use Wikibase\DataModel\Snak\PropertyNoValueSnak;
11-
use Wikibase\DataModel\Snak\PropertyValueSnak;
1211
use Wikibase\DataModel\Snak\SnakList;
1312

1413
/**
@@ -37,8 +36,8 @@ public function instanceProvider() {
3736
public function getElementInstances() {
3837
return array(
3938
new Reference(),
40-
new Reference( new SnakList( array( new PropertyNoValueSnak( 2 ) ) ) ),
41-
new Reference( new SnakList( array( new PropertyNoValueSnak( 3 ) ) ) ),
39+
new Reference( array( new PropertyNoValueSnak( 2 ) ) ),
40+
new Reference( array( new PropertyNoValueSnak( 3 ) ) ),
4241
);
4342
}
4443

@@ -101,7 +100,7 @@ public function testHasReferenceBeforeRemoveButNotAfter( ReferenceList $array )
101100
public function testGivenCloneOfReferenceInList_hasReferenceReturnsTrue() {
102101
$list = new ReferenceList();
103102

104-
$reference = new Reference( new SnakList( array( new PropertyNoValueSnak( 42 ) ) ) );
103+
$reference = new Reference( array( new PropertyNoValueSnak( 42 ) ) );
105104
$sameReference = unserialize( serialize( $reference ) );
106105

107106
$list->addReference( $reference );
@@ -306,7 +305,7 @@ public function testGivenOneSnak_addNewReferenceAddsSnak() {
306305
$snak = new PropertyNoValueSnak( 1 );
307306

308307
$references->addNewReference( $snak );
309-
$this->assertTrue( $references->hasReference( new Reference( new SnakList( array( $snak ) ) ) ) );
308+
$this->assertTrue( $references->hasReference( new Reference( array( $snak ) ) ) );
310309
}
311310

312311
public function testGivenMultipleSnaks_addNewReferenceAddsThem() {
@@ -339,14 +338,10 @@ public function testSerializeRoundtrip() {
339338

340339
$references->addReference( new Reference() );
341340

342-
$references->addReference( new Reference(
343-
new SnakList(
344-
array(
345-
new PropertyNoValueSnak( 2 ),
346-
new PropertyNoValueSnak( 3 )
347-
)
348-
)
349-
) );
341+
$references->addReference( new Reference( array(
342+
new PropertyNoValueSnak( 2 ),
343+
new PropertyNoValueSnak( 3 ),
344+
) ) );
350345

351346
$serialized = serialize( $references );
352347
$this->assertTrue( $references->equals( unserialize( $serialized ) ) );

‎tests/unit/ReferenceTest.php‎

Lines changed: 31 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -53,22 +53,14 @@ public function instanceProvider() {
5353

5454
$references[] = new Reference();
5555

56-
$references[] = new Reference( new SnakList( array(
57-
new PropertyValueSnak(
58-
new PropertyId( 'P1' ),
59-
new StringValue( 'a' )
60-
)
61-
) ) );
62-
63-
$references[] = new Reference( new SnakList( array(
64-
new PropertyValueSnak(
65-
new PropertyId( 'P1' ),
66-
new StringValue( 'a' )
67-
),
68-
new PropertySomeValueSnak(
69-
new PropertyId( 'P2' )
70-
)
71-
) ) );
56+
$references[] = new Reference( array(
57+
new PropertyValueSnak( new PropertyId( 'P1' ), new StringValue( 'a' ) ),
58+
) );
59+
60+
$references[] = new Reference( array(
61+
new PropertyValueSnak( new PropertyId( 'P1' ), new StringValue( 'a' ) ),
62+
new PropertySomeValueSnak( new PropertyId( 'P2' ) ),
63+
) );
7264

7365
$argLists = array();
7466

@@ -188,53 +180,53 @@ public function testUnorderedReference( Reference $unorderedReference, Reference
188180
}
189181

190182
public function testReferenceEqualsItself() {
191-
$reference = new Reference( new SnakList( array( new PropertyNoValueSnak( 42 ) ) ) );
183+
$reference = new Reference( array( new PropertyNoValueSnak( 42 ) ) );
192184
$this->assertTrue( $reference->equals( $reference ) );
193185
}
194186

195187
public function testReferenceDoesNotEqualReferenceWithDifferentSnakProperty() {
196-
$reference0 = new Reference( new SnakList( array( new PropertyNoValueSnak( 42 ) ) ) );
197-
$reference1 = new Reference( new SnakList( array( new PropertyNoValueSnak( 1337 ) ) ) );
188+
$reference0 = new Reference( array( new PropertyNoValueSnak( 42 ) ) );
189+
$reference1 = new Reference( array( new PropertyNoValueSnak( 1337 ) ) );
198190
$this->assertFalse( $reference0->equals( $reference1 ) );
199191
}
200192

201193
public function testReferenceDoesNotEqualReferenceWithMoreSnaks() {
202-
$reference0 = new Reference( new SnakList( array( new PropertyNoValueSnak( 42 ) ) ) );
194+
$reference0 = new Reference( array( new PropertyNoValueSnak( 42 ) ) );
203195

204-
$reference1 = new Reference( new SnakList( array(
196+
$reference1 = new Reference( array(
205197
new PropertyNoValueSnak( 42 ),
206-
new PropertySomeValueSnak( 42 )
207-
) ) );
198+
new PropertySomeValueSnak( 42 ),
199+
) );
208200

209201
$this->assertFalse( $reference0->equals( $reference1 ) );
210202
}
211203

212204
public function testReferenceEqualsReferenceWithDifferentSnakOrder() {
213-
$reference0 = new Reference( new SnakList( array(
205+
$reference0 = new Reference( array(
214206
new PropertyNoValueSnak( 1337 ),
215-
new PropertyNoValueSnak( 42 )
216-
) ) );
207+
new PropertyNoValueSnak( 42 ),
208+
) );
217209

218-
$reference1 = new Reference( new SnakList( array(
210+
$reference1 = new Reference( array(
219211
new PropertyNoValueSnak( 42 ),
220-
new PropertyNoValueSnak( 1337 )
221-
) ) );
212+
new PropertyNoValueSnak( 1337 ),
213+
) );
222214

223215
$this->assertTrue( $reference0->equals( $reference1 ) );
224216
}
225217

226218
public function testReferencesWithDifferentSnakOrderHaveTheSameHash() {
227-
$reference0 = new Reference( new SnakList( array(
219+
$reference0 = new Reference( array(
228220
new PropertySomeValueSnak( 1337 ),
229221
new PropertyNoValueSnak( 1337 ),
230-
new PropertyNoValueSnak( 42 )
231-
) ) );
222+
new PropertyNoValueSnak( 42 ),
223+
) );
232224

233-
$reference1 = new Reference( new SnakList( array(
225+
$reference1 = new Reference( array(
234226
new PropertyNoValueSnak( 1337 ),
235227
new PropertyNoValueSnak( 42 ),
236-
new PropertySomeValueSnak( 1337 )
237-
) ) );
228+
new PropertySomeValueSnak( 1337 ),
229+
) );
238230

239231
$this->assertSame( $reference0->getHash(), $reference1->getHash() );
240232
}
@@ -282,12 +274,14 @@ public function testIsEmpty() {
282274
$emptyReference = new Reference();
283275
$this->assertTrue( $emptyReference->isEmpty() );
284276

285-
$referenceWithSnak = new Reference( array( new PropertyNoValueSnak( 1 ) ) );
277+
$referenceWithSnak = new Reference( array(
278+
new PropertyNoValueSnak( 1 ),
279+
) );
286280
$this->assertFalse( $referenceWithSnak->isEmpty() );
287281

288282
$referenceWithSnaks = new Reference( array(
289283
new PropertyNoValueSnak( 1 ),
290-
new PropertyNoValueSnak( 2 )
284+
new PropertyNoValueSnak( 2 ),
291285
) );
292286
$this->assertFalse( $referenceWithSnaks->isEmpty() );
293287
}

‎tests/unit/Statement/StatementTest.php‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -146,10 +146,7 @@ public function testGetReferences( Statement $statement ) {
146146
public function testSetReferences( Statement $statement ) {
147147
$references = new ReferenceList( array(
148148
new Reference( array(
149-
new PropertyValueSnak(
150-
new PropertyId( 'P1' ),
151-
new StringValue( 'a' )
152-
)
149+
new PropertyValueSnak( new PropertyId( 'P1' ), new StringValue( 'a' ) ),
153150
) )
154151
) );
155152

0 commit comments

Comments
 (0)