[MediaWiki-commits] [Gerrit] Factor Rank (De)Serialization out of Lib - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged.
Change subject: Factor Rank (De)Serialization out of Lib
..
Factor Rank (De)Serialization out of Lib
This could in turn be moved to DataModelSerialization
Change-Id: I80baa29f474d97e3290e30b990e08cd977101c90
---
M lib/includes/serializers/ClaimSerializer.php
M lib/tests/phpunit/serializers/ClaimSerializerTest.php
M repo/includes/ChangeOp/ChangeOpStatementRank.php
M repo/includes/Diff/ClaimDifferenceVisualizer.php
A repo/includes/StatementRankSerializer.php
M repo/includes/api/GetClaims.php
A repo/tests/phpunit/includes/StatementRankSerializerTest.php
M repo/tests/phpunit/includes/api/GetClaimsTest.php
M view/src/ClaimHtmlGenerator.php
9 files changed, 151 insertions(+), 63 deletions(-)
Approvals:
Bene: Looks good to me, approved
Addshore: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/lib/includes/serializers/ClaimSerializer.php
b/lib/includes/serializers/ClaimSerializer.php
index 269445a..6e85618 100644
--- a/lib/includes/serializers/ClaimSerializer.php
+++ b/lib/includes/serializers/ClaimSerializer.php
@@ -50,19 +50,7 @@
);
/**
-* Returns the available ranks in serialized form.
-*
-* @since 0.3
-*
-* @return string[]
-*/
- public static function getRanks() {
- return array_values( self::$rankMap );
- }
-
- /**
* Unserializes the rank and returns an element from the
Statement::RANK_ enum.
-* Roundtrips with @see ClaimSerializer::serializeRank
*
* @since 0.3
*
@@ -70,23 +58,9 @@
*
* @return integer
*/
- public static function unserializeRank( $serializedRank ) {
+ private static function unserializeRank( $serializedRank ) {
$ranks = array_flip( self::$rankMap );
return $ranks[$serializedRank];
- }
-
- /**
-* Serializes the rank.
-* Roundtrips with @see ClaimSerializer::unserializeRank
-*
-* @since 0.3
-*
-* @param integer $rank
-*
-* @return string
-*/
- public static function serializeRank( $rank ) {
- return self::$rankMap[$rank];
}
/**
diff --git a/lib/tests/phpunit/serializers/ClaimSerializerTest.php
b/lib/tests/phpunit/serializers/ClaimSerializerTest.php
index 96921cc..7417d78 100644
--- a/lib/tests/phpunit/serializers/ClaimSerializerTest.php
+++ b/lib/tests/phpunit/serializers/ClaimSerializerTest.php
@@ -124,34 +124,4 @@
return $validArgs;
}
- public function rankProvider() {
- $ranks = array(
- Statement::RANK_NORMAL,
- Statement::RANK_PREFERRED,
- Statement::RANK_DEPRECATED,
- );
-
- return $this-arrayWrap( $ranks );
- }
-
- /**
-* @dataProvider rankProvider
-*/
- public function testRankSerialization( $rank ) {
- $id = new PropertyId( 'P42' );
- $statement = new Statement( new PropertyNoValueSnak( $id ) );
-
- $statement-setRank( $rank );
-
- $serializer = new ClaimSerializer( new SnakSerializer() );
-
- $serialization = $serializer-getSerialized( $statement );
-
- $this-assertEquals(
- $rank,
- ClaimSerializer::unserializeRank(
$serialization['rank'] ),
- 'Roundtrip between rank serialization and
unserialization'
- );
- }
-
}
diff --git a/repo/includes/ChangeOp/ChangeOpStatementRank.php
b/repo/includes/ChangeOp/ChangeOpStatementRank.php
index ce11a44..10f3c43 100644
--- a/repo/includes/ChangeOp/ChangeOpStatementRank.php
+++ b/repo/includes/ChangeOp/ChangeOpStatementRank.php
@@ -8,6 +8,7 @@
use Wikibase\DataModel\Snak\Snak;
use Wikibase\DataModel\Statement\StatementListHolder;
use Wikibase\Lib\Serializers\ClaimSerializer;
+use Wikibase\StatementRankSerializer;
use Wikibase\Summary;
/**
@@ -76,8 +77,12 @@
$this-updateSummary( $summary, null, '',
$this-getSnakSummaryArgs( $statement-getMainSnak() ) );
if ( $summary !== null ) {
+ $statementRankSerializer = new
StatementRankSerializer();
$summary-addAutoCommentArgs(
- array( ClaimSerializer::serializeRank( $oldRank
), ClaimSerializer::serializeRank( $this-rank ) )
+ array(
+ $statementRankSerializer-serialize(
$oldRank ),
+ $statementRankSerializer-serialize(
$this-rank )
+ )
);
}
diff --git
[MediaWiki-commits] [Gerrit] Factor Rank (De)Serialization out of Lib - change (mediawiki...Wikibase)
Addshore has uploaded a new change for review.
https://gerrit.wikimedia.org/r/227425
Change subject: Factor Rank (De)Serialization out of Lib
..
Factor Rank (De)Serialization out of Lib
This could in turn be moved to DataModelSerialization
Change-Id: I80baa29f474d97e3290e30b990e08cd977101c90
---
M lib/includes/serializers/ClaimSerializer.php
M lib/tests/phpunit/serializers/ClaimSerializerTest.php
M repo/includes/ChangeOp/ChangeOpStatementRank.php
M repo/includes/Diff/ClaimDifferenceVisualizer.php
A repo/includes/StatementRankSerializer.php
M repo/includes/api/GetClaims.php
A repo/tests/phpunit/includes/StatementRankSerializerTest.php
M repo/tests/phpunit/includes/api/GetClaimsTest.php
M view/src/ClaimHtmlGenerator.php
9 files changed, 151 insertions(+), 63 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/25/227425/1
diff --git a/lib/includes/serializers/ClaimSerializer.php
b/lib/includes/serializers/ClaimSerializer.php
index 269445a..6e85618 100644
--- a/lib/includes/serializers/ClaimSerializer.php
+++ b/lib/includes/serializers/ClaimSerializer.php
@@ -50,19 +50,7 @@
);
/**
-* Returns the available ranks in serialized form.
-*
-* @since 0.3
-*
-* @return string[]
-*/
- public static function getRanks() {
- return array_values( self::$rankMap );
- }
-
- /**
* Unserializes the rank and returns an element from the
Statement::RANK_ enum.
-* Roundtrips with @see ClaimSerializer::serializeRank
*
* @since 0.3
*
@@ -70,23 +58,9 @@
*
* @return integer
*/
- public static function unserializeRank( $serializedRank ) {
+ private static function unserializeRank( $serializedRank ) {
$ranks = array_flip( self::$rankMap );
return $ranks[$serializedRank];
- }
-
- /**
-* Serializes the rank.
-* Roundtrips with @see ClaimSerializer::unserializeRank
-*
-* @since 0.3
-*
-* @param integer $rank
-*
-* @return string
-*/
- public static function serializeRank( $rank ) {
- return self::$rankMap[$rank];
}
/**
diff --git a/lib/tests/phpunit/serializers/ClaimSerializerTest.php
b/lib/tests/phpunit/serializers/ClaimSerializerTest.php
index 96921cc..7417d78 100644
--- a/lib/tests/phpunit/serializers/ClaimSerializerTest.php
+++ b/lib/tests/phpunit/serializers/ClaimSerializerTest.php
@@ -124,34 +124,4 @@
return $validArgs;
}
- public function rankProvider() {
- $ranks = array(
- Statement::RANK_NORMAL,
- Statement::RANK_PREFERRED,
- Statement::RANK_DEPRECATED,
- );
-
- return $this-arrayWrap( $ranks );
- }
-
- /**
-* @dataProvider rankProvider
-*/
- public function testRankSerialization( $rank ) {
- $id = new PropertyId( 'P42' );
- $statement = new Statement( new PropertyNoValueSnak( $id ) );
-
- $statement-setRank( $rank );
-
- $serializer = new ClaimSerializer( new SnakSerializer() );
-
- $serialization = $serializer-getSerialized( $statement );
-
- $this-assertEquals(
- $rank,
- ClaimSerializer::unserializeRank(
$serialization['rank'] ),
- 'Roundtrip between rank serialization and
unserialization'
- );
- }
-
}
diff --git a/repo/includes/ChangeOp/ChangeOpStatementRank.php
b/repo/includes/ChangeOp/ChangeOpStatementRank.php
index ce11a44..10f3c43 100644
--- a/repo/includes/ChangeOp/ChangeOpStatementRank.php
+++ b/repo/includes/ChangeOp/ChangeOpStatementRank.php
@@ -8,6 +8,7 @@
use Wikibase\DataModel\Snak\Snak;
use Wikibase\DataModel\Statement\StatementListHolder;
use Wikibase\Lib\Serializers\ClaimSerializer;
+use Wikibase\StatementRankSerializer;
use Wikibase\Summary;
/**
@@ -76,8 +77,12 @@
$this-updateSummary( $summary, null, '',
$this-getSnakSummaryArgs( $statement-getMainSnak() ) );
if ( $summary !== null ) {
+ $statementRankSerializer = new
StatementRankSerializer();
$summary-addAutoCommentArgs(
- array( ClaimSerializer::serializeRank( $oldRank
), ClaimSerializer::serializeRank( $this-rank ) )
+ array(
+ $statementRankSerializer-serialize(
$oldRank ),
+ $statementRankSerializer-serialize(
$this-rank )
+ )
);
}
diff --git
