Thiemo Mättig (WMDE) has uploaded a new change for review.
https://gerrit.wikimedia.org/r/151596
Change subject: Cleanup Entity Serializer code
......................................................................
Cleanup Entity Serializer code
Rename an $Uppercase variable.
Remove some unused protected variables, just use the one from the
parent object.
Change-Id: I90b643b1812f759e4066310ad7c4669162d1bb4a
---
M lib/includes/serializers/EntitySerializer.php
M repo/includes/serializers/EntityRevisionSerializationOptions.php
M repo/includes/serializers/EntityRevisionSerializer.php
3 files changed, 24 insertions(+), 37 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/96/151596/1
diff --git a/lib/includes/serializers/EntitySerializer.php
b/lib/includes/serializers/EntitySerializer.php
index f4ab8a9..f9461f0 100644
--- a/lib/includes/serializers/EntitySerializer.php
+++ b/lib/includes/serializers/EntitySerializer.php
@@ -48,26 +48,14 @@
const OPT_SORT_FIELDS = 'entitySortFields';
/**
- * @see ApiSerializerObject::$options
- *
- * @since 0.2
- *
- * @var SerializationOptions
- */
- protected $options;
-
- /**
- * @since 0.4
- *
* @var EntityFactory
*/
- protected $entityFactory;
-
+ private $entityFactory;
/**
* @var ClaimSerializer
*/
- protected $claimSerializer;
+ private $claimSerializer;
/**
* Constructor.
diff --git a/repo/includes/serializers/EntityRevisionSerializationOptions.php
b/repo/includes/serializers/EntityRevisionSerializationOptions.php
index ad7fd21..1c58b66 100644
--- a/repo/includes/serializers/EntityRevisionSerializationOptions.php
+++ b/repo/includes/serializers/EntityRevisionSerializationOptions.php
@@ -12,16 +12,16 @@
* @author Daniel Werner < daniel.a.r.wer...@gmail.com >
*/
class EntityRevisionSerializationOptions extends SerializationOptions {
+
/**
- * @since 0.5
* @var SerializationOptions|null
*/
- protected $contentSerializer;
+ private $contentSerializer;
/**
* @since 0.5
*
- * @param SerializationOptions|null $SerializationOptions The
serializer options which
+ * @param SerializationOptions|null $serializationOptions The
serializer options which
* will be used when serializing the Entity contained by the
EntityContent instance.
*
* NOTE: Originally a "contentSerializer" option has been intended
without some refactoring
@@ -30,8 +30,8 @@
* The whole serializer system is quite ugly, this just adds up
to this, the whole thing
* should be refactored in one go.
*/
- public function __construct( SerializationOptions $SerializationOptions
= null ) {
- $this->setSerializationOptions( $SerializationOptions );
+ public function __construct( SerializationOptions $serializationOptions
= null ) {
+ $this->setSerializationOptions( $serializationOptions );
}
/**
@@ -55,4 +55,5 @@
public function setSerializationOptions( SerializationOptions $options
= null ) {
$this->contentSerializer = $options;
}
+
}
diff --git a/repo/includes/serializers/EntityRevisionSerializer.php
b/repo/includes/serializers/EntityRevisionSerializer.php
index 3ce5875..54a3cd0 100644
--- a/repo/includes/serializers/EntityRevisionSerializer.php
+++ b/repo/includes/serializers/EntityRevisionSerializer.php
@@ -3,7 +3,6 @@
namespace Wikibase\Serializers;
use InvalidArgumentException;
-use Wikibase\Entity;
use Wikibase\EntityRevision;
use Wikibase\EntityTitleLookup;
use Wikibase\LanguageFallbackChain;
@@ -22,11 +21,6 @@
* @author Daniel Werner < daniel.a.r.wer...@gmail.com >
*/
class EntityRevisionSerializer extends SerializerObject {
- /**
- * @see SerializerObject::$options
- * @var EntityRevisionSerializationOptions
- */
- protected $options;
/**
* @var EntityTitleLookup
@@ -34,14 +28,15 @@
protected $titleLookup;
/**
- * Constructor.
- *
* @since 0.5
*
* @param EntityTitleLookup $titleLookup
* @param EntityRevisionSerializationOptions $options
*/
- public function __construct( EntityTitleLookup $titleLookup,
EntityRevisionSerializationOptions $options = null ) {
+ public function __construct(
+ EntityTitleLookup $titleLookup,
+ EntityRevisionSerializationOptions $options = null
+ ) {
if( $options === null ) {
$options = new EntityRevisionSerializationOptions();
}
@@ -66,15 +61,14 @@
'EntityRevisionSerializer can only serialize
EntityRevision objects' );
}
- /** @var $entity Entity */
$entity = $entityRevision->getEntity();
$entityTitle = $this->titleLookup->getTitleForId(
$entity->getId() );
- $SerializationOptions =
$this->options->getSerializationOptions();
+ $serializationOptions =
$this->options->getSerializationOptions();
$serializerFactory = new SerializerFactory(); //TODO: inject
$entitySerializer = $serializerFactory->newSerializerForObject(
$entity,
- $SerializationOptions
+ $serializationOptions
);
$serialization['content'] = $entitySerializer->getSerialized(
$entity );
$serialization['title'] = $entityTitle->getPrefixedText();
@@ -95,17 +89,21 @@
*
* @return EntityRevisionSerializer
*/
- public static function newForFrontendStore( EntityTitleLookup
$titleLookup, $primaryLanguage, LanguageFallbackChain $languageFallbackChain ) {
- $SerializationOptions =
- new SerializationOptions();
+ public static function newForFrontendStore(
+ EntityTitleLookup $titleLookup,
+ $primaryLanguage,
+ LanguageFallbackChain $languageFallbackChain
+ ) {
+ $serializationOptions = new SerializationOptions();
- $SerializationOptions->setOption( EntitySerializer::OPT_PARTS,
array( 'labels', 'descriptions', 'datatype' ) );
- $SerializationOptions->setLanguages( array( $primaryLanguage =>
$languageFallbackChain ) );
+ $serializationOptions->setOption( EntitySerializer::OPT_PARTS,
array( 'labels', 'descriptions', 'datatype' ) );
+ $serializationOptions->setLanguages( array( $primaryLanguage =>
$languageFallbackChain ) );
$entityRevisionSerializationOptions =
- new EntityRevisionSerializationOptions(
$SerializationOptions );
+ new EntityRevisionSerializationOptions(
$serializationOptions );
$serializer = new EntityRevisionSerializer( $titleLookup,
$entityRevisionSerializationOptions );
return $serializer;
}
+
}
--
To view, visit https://gerrit.wikimedia.org/r/151596
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I90b643b1812f759e4066310ad7c4669162d1bb4a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Thiemo Mättig (WMDE) <thiemo.maet...@wikimedia.de>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
