Addshore has uploaded a new change for review.
https://gerrit.wikimedia.org/r/92868
Change subject: Further cleanup of serlization classes
......................................................................
Further cleanup of serlization classes
Change-Id: Id1ce1564d99a6dbaa43a07f07f5eb9093969db40
---
M lib/includes/serializers/EntitySerializer.php
M lib/includes/serializers/SerializationOptions.php
M lib/includes/serializers/SerializerFactory.php
M lib/includes/serializers/SiteLinkSerializer.php
4 files changed, 29 insertions(+), 20 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/68/92868/1
diff --git a/lib/includes/serializers/EntitySerializer.php
b/lib/includes/serializers/EntitySerializer.php
index 1ae3604..3f1ece3 100644
--- a/lib/includes/serializers/EntitySerializer.php
+++ b/lib/includes/serializers/EntitySerializer.php
@@ -3,6 +3,7 @@
namespace Wikibase\Lib\Serializers;
use InvalidArgumentException;
+use Wikibase\Claims;
use Wikibase\DataModel\Entity\BasicEntityIdParser;
use Wikibase\Entity;
use Wikibase\EntityFactory;
@@ -92,8 +93,6 @@
}
/**
- * @see ApiSerializer::getSerialized
- *
* @since 0.2
*
* @param mixed $entity
@@ -132,7 +131,7 @@
break;
case 'claims':
$claimsSerializer = new
ClaimsSerializer( $this->options );
- $serialization['claims'] =
$claimsSerializer->getSerialized( new \Wikibase\Claims( $entity->getClaims() )
);
+ $serialization['claims'] =
$claimsSerializer->getSerialized( new Claims( $entity->getClaims() ) );
break;
}
}
diff --git a/lib/includes/serializers/SerializationOptions.php
b/lib/includes/serializers/SerializationOptions.php
index 8865ea4..b2a4a72 100644
--- a/lib/includes/serializers/SerializationOptions.php
+++ b/lib/includes/serializers/SerializationOptions.php
@@ -3,6 +3,7 @@
namespace Wikibase\Lib\Serializers;
use InvalidArgumentException;
+use RuntimeException;
use Wikibase\LanguageFallbackChainFactory;
/**
@@ -74,11 +75,11 @@
protected function checkKey( $key) {
if ( !is_string( $key ) ) {
- throw new \InvalidArgumentException( 'option keys must
be strings' );
+ throw new InvalidArgumentException( 'option keys must
be strings' );
}
if ( !preg_match( '/^[-.\/:_+*!$#@0-9a-zA-Z]+$/', $key ) ) {
- throw new \InvalidArgumentException( 'malformed option
key: ' . $key );
+ throw new InvalidArgumentException( 'malformed option
key: ' . $key );
}
}
@@ -140,7 +141,7 @@
* @param string $key
* @param mixed $value
*
- * @throws \RuntimeException
+ * @throws RuntimeException
*/
public function addToOption( $key, $value ) {
if ( !isset( $this->options[$key] ) ) {
@@ -148,7 +149,7 @@
}
if ( !is_array( $this->options[$key] ) ) {
- throw new \RuntimeException( 'option ' . $key . ' is
not a list!' );
+ throw new RuntimeException( 'option ' . $key . ' is not
a list!' );
}
if ( !in_array( $value, $this->options[$key] ) ) {
@@ -166,7 +167,7 @@
* @param string $key
* @param mixed $value
*
- * @throws \RuntimeException
+ * @throws RuntimeException
*/
public function removeFromOption( $key, $value ) {
if ( !isset( $this->options[$key] ) ) {
@@ -174,7 +175,7 @@
}
if ( !is_array( $this->options[$key] ) ) {
- throw new \RuntimeException( 'option ' . $key . ' is
not a list!' );
+ throw new RuntimeException( 'option ' . $key . ' is not
a list!' );
}
if ( in_array( $value, $this->options[$key] ) ) {
@@ -314,15 +315,16 @@
* @since 0.5
*
* @param int $mode a bit field using the ID_KEYS_XXX constants.
- * @throws \InvalidArgumentException
+ *
+*@throws InvalidArgumentException
*/
public function setIdKeyMode( $mode ) {
if ( ( $mode & self::ID_KEYS_BOTH ) === 0 ) {
- throw new \InvalidArgumentException( "At least one ID
key mode must be set in the bit field." );
+ throw new InvalidArgumentException( "At least one ID
key mode must be set in the bit field." );
}
if ( ( $mode & ~self::ID_KEYS_BOTH ) !== 0 ) {
- throw new \InvalidArgumentException( "Unknown bits set
in ID key mode, use the ID_KEYS_XXX constants." );
+ throw new InvalidArgumentException( "Unknown bits set
in ID key mode, use the ID_KEYS_XXX constants." );
}
$this->setOption( self::OPT_ID_KEY_MODE, $mode );
diff --git a/lib/includes/serializers/SerializerFactory.php
b/lib/includes/serializers/SerializerFactory.php
index a9e59dd..d856a87 100644
--- a/lib/includes/serializers/SerializerFactory.php
+++ b/lib/includes/serializers/SerializerFactory.php
@@ -4,6 +4,13 @@
use InvalidArgumentException;
use OutOfBoundsException;
+use Wikibase\Claim;
+use Wikibase\Claims;
+use Wikibase\Entity;
+use Wikibase\Item;
+use Wikibase\Property;
+use Wikibase\Reference;
+use Wikibase\Snak;
/**
* Factory for constructing Serializer and Unserializer objects.
@@ -37,19 +44,19 @@
}
switch ( true ) {
- case ( $object instanceof \Wikibase\Snak ):
+ case ( $object instanceof Snak ):
return new SnakSerializer( $options );
- case ( $object instanceof \Wikibase\Reference ):
+ case ( $object instanceof Reference ):
return new ReferenceSerializer( $options );
- case ( $object instanceof \Wikibase\Item ):
+ case ( $object instanceof Item ):
return new ItemSerializer( $options );
- case ( $object instanceof \Wikibase\Property ):
+ case ( $object instanceof Property ):
return new PropertySerializer( $options );
- case ( $object instanceof \Wikibase\Entity ):
+ case ( $object instanceof Entity ):
return new EntitySerializer( $options );
- case ( $object instanceof \Wikibase\Claim ):
+ case ( $object instanceof Claim ):
return new ClaimSerializer( $options );
- case ( $object instanceof \Wikibase\Claims ):
+ case ( $object instanceof Claims ):
return new ClaimsSerializer( $options );
}
diff --git a/lib/includes/serializers/SiteLinkSerializer.php
b/lib/includes/serializers/SiteLinkSerializer.php
index 348e25f..83970a6 100644
--- a/lib/includes/serializers/SiteLinkSerializer.php
+++ b/lib/includes/serializers/SiteLinkSerializer.php
@@ -54,7 +54,7 @@
*
* @since 0.4
*
- * @param array $sitelinks
+ * @param array $siteLinks
*
* @return array
* @throws InvalidArgumentException
@@ -178,6 +178,7 @@
throw new InvalidArgumentException( 'Site link
serialization is invalid.' );
}
+ $badges = array();
if ( array_key_exists( 'badges', $siteLink ) ) {
$badges = $this->extractBadges(
$siteLink['badges'] );
}
--
To view, visit https://gerrit.wikimedia.org/r/92868
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id1ce1564d99a6dbaa43a07f07f5eb9093969db40
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Addshore <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
