Jeroen De Dauw has uploaded a new change for review.
https://gerrit.wikimedia.org/r/245482
Change subject: Improve method name and make checks explicit
......................................................................
Improve method name and make checks explicit
Change-Id: I21472c4b2274011056ee00337381305685eec16e
---
M repo/includes/LinkedData/EntityDataSerializationService.php
1 file changed, 9 insertions(+), 9 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/82/245482/1
diff --git a/repo/includes/LinkedData/EntityDataSerializationService.php
b/repo/includes/LinkedData/EntityDataSerializationService.php
index 67155dd..c5bdccb 100644
--- a/repo/includes/LinkedData/EntityDataSerializationService.php
+++ b/repo/includes/LinkedData/EntityDataSerializationService.php
@@ -225,20 +225,20 @@
$serializer = $this->createApiSerializer( $formatName );
- if ( $serializer ) {
- $data = $this->apiSerialize( $entityRevision,
$serializer );
+ if ( $serializer !== null ) {
+ $data = $this->getApiSerialization( $entityRevision,
$serializer );
$contentType = $serializer->getIsHtml() ? 'text/html' :
$serializer->getMimeType();
} else {
$rdfBuilder = $this->createRdfBuilder( $formatName,
$flavor );
- if ( !$rdfBuilder ) {
+ if ( $rdfBuilder === null ) {
throw new MWException( "Could not create
serializer for $formatName" );
- } else {
- $data = $this->rdfSerialize( $entityRevision,
$followedRedirect, $incomingRedirects, $rdfBuilder, $flavor );
-
- $mimeTypes =
$this->rdfWriterFactory->getMimeTypes( $formatName );
- $contentType = reset( $mimeTypes );
}
+
+ $data = $this->rdfSerialize( $entityRevision,
$followedRedirect, $incomingRedirects, $rdfBuilder, $flavor );
+
+ $mimeTypes = $this->rdfWriterFactory->getMimeTypes(
$formatName );
+ $contentType = reset( $mimeTypes );
}
return array( $data, $contentType );
@@ -477,7 +477,7 @@
*
* @return string the serialized data
*/
- private function apiSerialize(
+ private function getApiSerialization(
EntityRevision $entityRevision,
ApiFormatBase $printer
) {
--
To view, visit https://gerrit.wikimedia.org/r/245482
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I21472c4b2274011056ee00337381305685eec16e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Jeroen De Dauw <jeroended...@gmail.com>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
