Skip to content

Commit 240f55c

Browse files
committed
Remove uagsges of Hashable interface
1 parent 3878d5a commit 240f55c

8 files changed

Lines changed: 5 additions & 33 deletions

File tree

src/Internal/MapValueHasher.php

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

33
namespace Wikibase\DataModel\Internal;
44

5-
use Hashable;
65
use InvalidArgumentException;
76
use Traversable;
87

@@ -27,7 +26,7 @@ public function __construct( $holdOrderIntoAccount = false ) {
2726
*
2827
* @since 0.1
2928
*
30-
* @param Traversable|Hashable[] $map
29+
* @param Traversable $map
3130
*
3231
* @return string
3332
* @throws InvalidArgumentException
@@ -39,9 +38,6 @@ public function hash( $map ) {
3938

4039
$hashes = [];
4140

42-
/**
43-
* @var Hashable $hashable
44-
*/
4541
foreach ( $map as $hashable ) {
4642
$hashes[] = $hashable->getHash();
4743
}

src/Reference.php

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44

55
use Comparable;
66
use Countable;
7-
use Hashable;
87
use Immutable;
98
use InvalidArgumentException;
109
use Wikibase\DataModel\Snak\Snak;
@@ -19,7 +18,7 @@
1918
* @license GPL-2.0-or-later
2019
* @author Jeroen De Dauw < jeroendedauw@gmail.com >
2120
*/
22-
class Reference implements Hashable, Comparable, Immutable, Countable {
21+
class Reference implements Comparable, Immutable, Countable {
2322

2423
/**
2524
* @var SnakList
@@ -77,8 +76,6 @@ public function isEmpty() {
7776
}
7877

7978
/**
80-
* @see Hashable::getHash
81-
*
8279
* @since 0.1
8380
*
8481
* @return string

src/Snak/Snak.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
namespace Wikibase\DataModel\Snak;
44

55
use Comparable;
6-
use Hashable;
76
use Immutable;
87
use Serializable;
98
use Wikibase\DataModel\PropertyIdProvider;
@@ -17,7 +16,7 @@
1716
* @license GPL-2.0-or-later
1817
* @author Jeroen De Dauw < jeroendedauw@gmail.com >
1918
*/
20-
interface Snak extends Serializable, Hashable, Immutable, Comparable, PropertyIdProvider {
19+
interface Snak extends Serializable, Immutable, Comparable, PropertyIdProvider {
2120

2221
/**
2322
* Returns a string that can be used to identify the type of snak.

src/Snak/SnakList.php

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44

55
use ArrayObject;
66
use Comparable;
7-
use Hashable;
87
use InvalidArgumentException;
98
use Traversable;
109
use Wikibase\DataModel\Internal\MapValueHasher;
@@ -19,7 +18,7 @@
1918
* @author Jeroen De Dauw < jeroendedauw@gmail.com >
2019
* @author Addshore
2120
*/
22-
class SnakList extends ArrayObject implements Comparable, Hashable {
21+
class SnakList extends ArrayObject implements Comparable {
2322

2423
/**
2524
* Maps snak hashes to their offsets.
@@ -144,8 +143,6 @@ public function equals( $target ) {
144143
}
145144

146145
/**
147-
* @see Hashable::getHash
148-
*
149146
* The hash is purely value based. Order of the elements in the array is not held into account.
150147
*
151148
* @since 0.1
@@ -211,9 +208,6 @@ private function getNewOffset() {
211208
*/
212209
public function offsetUnset( $index ) {
213210
if ( $this->offsetExists( $index ) ) {
214-
/**
215-
* @var Hashable $element
216-
*/
217211
$element = $this->offsetGet( $index );
218212
$hash = $element->getHash();
219213
unset( $this->offsetHashes[$hash] );

src/Snak/SnakObject.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,6 @@ public function getPropertyId() {
6767
}
6868

6969
/**
70-
* @see Hashable::getHash
71-
*
7270
* @return string
7371
*/
7472
public function getHash() {

src/Statement/Statement.php

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
namespace Wikibase\DataModel\Statement;
44

55
use Comparable;
6-
use Hashable;
76
use InvalidArgumentException;
87
use Wikibase\DataModel\Entity\PropertyId;
98
use Wikibase\DataModel\PropertyIdProvider;
@@ -22,7 +21,7 @@
2221
* @author Jeroen De Dauw < jeroendedauw@gmail.com >
2322
* @author Bene* < benestar.wikimedia@gmail.com >
2423
*/
25-
class Statement implements Hashable, Comparable, PropertyIdProvider {
24+
class Statement implements Comparable, PropertyIdProvider {
2625

2726
/**
2827
* Rank enum. Higher values are more preferred.
@@ -218,8 +217,6 @@ public function getRank() {
218217
}
219218

220219
/**
221-
* @see Hashable::getHash
222-
*
223220
* @since 0.1
224221
*
225222
* @return string

tests/unit/ReferenceListTest.php

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

33
namespace Wikibase\DataModel\Tests;
44

5-
use Hashable;
65
use InvalidArgumentException;
76
use Traversable;
87
use Wikibase\DataModel\Entity\PropertyId;
@@ -368,9 +367,6 @@ public function testGetValueHashIsTheSameForClone( ReferenceList $array ) {
368367
public function testHasReferenceHash( ReferenceList $references ) {
369368
$this->assertFalse( $references->hasReferenceHash( '~=[,,_,,]:3' ) );
370369

371-
/**
372-
* @var Hashable $reference
373-
*/
374370
foreach ( $references as $reference ) {
375371
$this->assertTrue( $references->hasReferenceHash( $reference->getHash() ) );
376372
}

tests/unit/Snak/SnakListTest.php

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

55
use Comparable;
66
use DataValues\StringValue;
7-
use Hashable;
87
use InvalidArgumentException;
98
use Wikibase\DataModel\Entity\PropertyId;
109
use Wikibase\DataModel\Snak\PropertyNoValueSnak;
@@ -347,10 +346,6 @@ public function equalsProvider() {
347346
];
348347
}
349348

350-
public function testHashableInterface() {
351-
$this->assertInstanceOf( Hashable::class, new SnakList() );
352-
}
353-
354349
public function testGetHash() {
355350
$snakList = new SnakList( [ new PropertyNoValueSnak( 1 ) ] );
356351
$hash = $snakList->getHash();

0 commit comments

Comments
 (0)