jenkins-bot has submitted this change and it was merged.
Change subject: Invert conditionals for better readability, coding style
......................................................................
Invert conditionals for better readability, coding style
Change-Id: I2efe4f541002646761e8913a05ae441b7a72756b
---
M repo/includes/View/ClaimHtmlGenerator.php
M repo/includes/View/SectionEditLinkGenerator.php
2 files changed, 42 insertions(+), 45 deletions(-)
Approvals:
Hoo man: Looks good to me, approved
Thiemo Mättig (WMDE): Looks good to me, approved
jenkins-bot: Verified
diff --git a/repo/includes/View/ClaimHtmlGenerator.php
b/repo/includes/View/ClaimHtmlGenerator.php
index 8bb040b..a446a1b 100644
--- a/repo/includes/View/ClaimHtmlGenerator.php
+++ b/repo/includes/View/ClaimHtmlGenerator.php
@@ -79,23 +79,14 @@
// TODO: Resolve if-statement after concept of Claim has been
removed
// (see https://github.com/wmde/WikibaseDataModel/pull/317)
- if ( !( $claim instanceof Statement ) ) {
- $claimHtml = $this->templateFactory->render(
'wikibase-statementview',
- $claim->getGuid(),
- '',
- $mainSnakHtml,
- $this->getHtmlForQualifiers(
$claim->getQualifiers() ),
- $editSectionHtml,
- '',
- ''
- );
- } else {
+ if ( $claim instanceof Statement ) {
/** @var Statement $claim */
$serializedRank = ClaimSerializer::serializeRank(
$claim->getRank() );
// Messages: wikibase-statementview-rank-preferred,
wikibase-statementview-rank-normal,
// wikibase-statementview-rank-deprecated
- $rankHtml = $this->templateFactory->render(
'wikibase-rankselector',
+ $rankHtml = $this->templateFactory->render(
+ 'wikibase-rankselector',
'ui-state-disabled',
'wikibase-rankselector-' . $serializedRank,
$this->getStatementRankText( $serializedRank )
@@ -106,17 +97,23 @@
$referencesHtml = $this->getHtmlForReferences(
$claim->getReferences()
);
-
- $claimHtml = $this->templateFactory->render(
'wikibase-statementview',
- $claim->getGuid(),
- $rankHtml,
- $mainSnakHtml,
- $this->getHtmlForQualifiers(
$claim->getQualifiers() ),
- $editSectionHtml,
- $referencesHeading,
- $referencesHtml
- );
+ } else {
+ $rankHtml = '';
+ $referencesHeading = '';
+ $referencesHtml = '';
}
+
+ $claimHtml = $this->templateFactory->render(
+ 'wikibase-statementview',
+ $claim->getGuid(),
+ $rankHtml,
+ $mainSnakHtml,
+ $this->getHtmlForQualifiers( $claim->getQualifiers() ),
+ $editSectionHtml,
+ $referencesHeading,
+ $referencesHtml
+ );
+
wfProfileOut( __METHOD__ );
return $claimHtml;
@@ -135,7 +132,7 @@
$snaklistviewsHtml = '';
- foreach( $qualifiersByProperty->getPropertyIds() as $propertyId
) {
+ foreach ( $qualifiersByProperty->getPropertyIds() as
$propertyId ) {
$snaklistviewsHtml .= $this->getSnaklistviewHtml(
$qualifiersByProperty->getByPropertyId(
$propertyId )
);
@@ -154,7 +151,7 @@
protected function getHtmlForReferences( ReferenceList $referenceList )
{
$referencesHtml = '';
- foreach( $referenceList as $reference ) {
+ foreach ( $referenceList as $reference ) {
$referencesHtml .= $this->getHtmlForReference(
$reference );
}
@@ -162,7 +159,7 @@
}
private function wrapInListview( $listviewContent ) {
- if( $listviewContent !== '' ) {
+ if ( $listviewContent !== '' ) {
return $this->templateFactory->render(
'wikibase-listview', $listviewContent );
} else {
return '';
@@ -184,13 +181,14 @@
$snaklistviewsHtml = '';
- foreach( $referenceSnaksByProperty->getPropertyIds() as
$propertyId ) {
+ foreach ( $referenceSnaksByProperty->getPropertyIds() as
$propertyId ) {
$snaklistviewsHtml .= $this->getSnaklistviewHtml(
$referenceSnaksByProperty->getByPropertyId(
$propertyId )
);
}
- return $this->templateFactory->render( 'wikibase-referenceview',
+ return $this->templateFactory->render(
+ 'wikibase-referenceview',
'wikibase-referenceview-' . $reference->getHash(),
$snaklistviewsHtml
);
@@ -207,14 +205,11 @@
$snaksHtml = '';
$i = 0;
- foreach( $snaks as $snak ) {
+ foreach ( $snaks as $snak ) {
$snaksHtml .= $this->snakHtmlGenerator->getSnakHtml(
$snak, ( $i++ === 0 ) );
}
- return $this->templateFactory->render(
- 'wikibase-snaklistview',
- $snaksHtml
- );
+ return $this->templateFactory->render( 'wikibase-snaklistview',
$snaksHtml );
}
/**
@@ -226,7 +221,7 @@
$referenceCount = count( $statement->getReferences() );
if ( !array_key_exists( $referenceCount,
$this->referenceHeadings ) ) {
- $this->referenceHeadings[$referenceCount] = wfMessage(
+ $this->referenceHeadings[ $referenceCount ] = wfMessage(
'wikibase-ui-pendingquantitycounter-nonpending',
wfMessage(
'wikibase-statementview-referencesheading-pendingcountersubject'
@@ -234,7 +229,7 @@
)->numParams( $referenceCount )->text();
}
- return $this->referenceHeadings[$referenceCount];
+ return $this->referenceHeadings[ $referenceCount ];
}
/**
@@ -245,10 +240,10 @@
private function getStatementRankText( $serializedRank ) {
if ( !array_key_exists( $serializedRank,
$this->statementRankText ) ) {
$rankText = wfMessage( 'wikibase-statementview-rank-' .
$serializedRank )->text();
- $this->statementRankText[$serializedRank] = $rankText;
+ $this->statementRankText[ $serializedRank ] = $rankText;
}
- return $this->statementRankText[$serializedRank];
+ return $this->statementRankText[ $serializedRank ];
}
}
diff --git a/repo/includes/View/SectionEditLinkGenerator.php
b/repo/includes/View/SectionEditLinkGenerator.php
index c5513fc..5a077bc 100644
--- a/repo/includes/View/SectionEditLinkGenerator.php
+++ b/repo/includes/View/SectionEditLinkGenerator.php
@@ -129,17 +129,19 @@
* @return string
*/
private function getToolbarButton( $cssClassSuffix, $buttonLabel,
$editUrl = null ) {
- if ( $editUrl !== null ) {
- return $this->templateFactory->render(
'wikibase-toolbar-bracketed',
- $this->templateFactory->render(
'wikibase-toolbar-button',
- 'wikibase-toolbar-button-' .
$cssClassSuffix,
- $editUrl,
- $buttonLabel
- )
- );
+ if ( $editUrl === null ) {
+ return '';
}
- return '';
+ return $this->templateFactory->render(
+ 'wikibase-toolbar-bracketed',
+ $this->templateFactory->render(
+ 'wikibase-toolbar-button',
+ 'wikibase-toolbar-button-' . $cssClassSuffix,
+ $editUrl,
+ $buttonLabel
+ )
+ );
}
}
--
To view, visit https://gerrit.wikimedia.org/r/191299
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2efe4f541002646761e8913a05ae441b7a72756b
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Adrian Lang <[email protected]>
Gerrit-Reviewer: Hoo man <[email protected]>
Gerrit-Reviewer: Thiemo Mättig (WMDE) <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
