[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: Make use of PHPs shortcut "$truthy ?: $else" operator

2017-02-24 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/339630 )

Change subject: Make use of PHPs shortcut "$truthy ?: $else" operator
..


Make use of PHPs shortcut "$truthy ?: $else" operator

Change-Id: I614bdb628546661b970dc605f41bc990e6aadad0
---
M client/tests/phpunit/includes/DataAccess/Scribunto/EntityAccessorTest.php
M repo/includes/Specials/SpecialModifyTerm.php
M repo/includes/Specials/SpecialSetLabelDescriptionAliases.php
3 files changed, 3 insertions(+), 3 deletions(-)

Approvals:
  WMDE-Fisch: Looks good to me, approved
  jenkins-bot: Verified



diff --git 
a/client/tests/phpunit/includes/DataAccess/Scribunto/EntityAccessorTest.php 
b/client/tests/phpunit/includes/DataAccess/Scribunto/EntityAccessorTest.php
index 2d5ead9..025ef18 100644
--- a/client/tests/phpunit/includes/DataAccess/Scribunto/EntityAccessorTest.php
+++ b/client/tests/phpunit/includes/DataAccess/Scribunto/EntityAccessorTest.php
@@ -70,7 +70,7 @@
return new EntityAccessor(
new ItemIdParser(),
$entityLookup ?: new MockRepository(),
-   $usageAccumulator ? $usageAccumulator : new 
HashUsageAccumulator(),
+   $usageAccumulator ?: new HashUsageAccumulator(),
$entitySerializer,
$propertyDataTypeLookup,
$fallbackChain,
diff --git a/repo/includes/Specials/SpecialModifyTerm.php 
b/repo/includes/Specials/SpecialModifyTerm.php
index 8b57b93..2ce4e47 100644
--- a/repo/includes/Specials/SpecialModifyTerm.php
+++ b/repo/includes/Specials/SpecialModifyTerm.php
@@ -186,7 +186,7 @@
'cssclass' => 'wb-input',
'id' => 'wb-modifyterm-value',
'type' => 'text',
-   'default' => $this->getRequest()->getVal( 'value' ) ? 
$this->getRequest()->getVal( 'value' ) : $this->value,
+   'default' => $this->getRequest()->getVal( 'value' ) ?: 
$this->value,
'nodata' => true
);
 
diff --git a/repo/includes/Specials/SpecialSetLabelDescriptionAliases.php 
b/repo/includes/Specials/SpecialSetLabelDescriptionAliases.php
index 476c857..7b489d5 100644
--- a/repo/includes/Specials/SpecialSetLabelDescriptionAliases.php
+++ b/repo/includes/Specials/SpecialSetLabelDescriptionAliases.php
@@ -184,7 +184,7 @@
} else {
$intro = $this->msg( 
'wikibase-setlabeldescriptionaliases-intro' )->parse();
$fieldId = 
'wikibase-setlabeldescriptionaliases-language';
-   $languageCode = $this->languageCode ? : 
$this->getLanguage()->getCode();
+   $languageCode = $this->languageCode ?: 
$this->getLanguage()->getCode();
 
$formDescriptor = $this->getFormElements( $entity );
$formDescriptor['language'] = array(

-- 
To view, visit https://gerrit.wikimedia.org/r/339630
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I614bdb628546661b970dc605f41bc990e6aadad0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Thiemo Mättig (WMDE) 
Gerrit-Reviewer: Addshore 
Gerrit-Reviewer: WMDE-Fisch 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: Make use of PHPs shortcut "$truthy ?: $else" operator

2017-02-24 Thread WMDE 
Thiemo Mättig (WMDE) has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/339630 )

Change subject: Make use of PHPs shortcut "$truthy ?: $else" operator
..

Make use of PHPs shortcut "$truthy ?: $else" operator

Change-Id: I614bdb628546661b970dc605f41bc990e6aadad0
---
M client/tests/phpunit/includes/DataAccess/Scribunto/EntityAccessorTest.php
M repo/includes/Specials/SpecialModifyTerm.php
M repo/includes/Specials/SpecialSetLabelDescriptionAliases.php
3 files changed, 3 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase 
refs/changes/30/339630/1

diff --git 
a/client/tests/phpunit/includes/DataAccess/Scribunto/EntityAccessorTest.php 
b/client/tests/phpunit/includes/DataAccess/Scribunto/EntityAccessorTest.php
index 2d5ead9..025ef18 100644
--- a/client/tests/phpunit/includes/DataAccess/Scribunto/EntityAccessorTest.php
+++ b/client/tests/phpunit/includes/DataAccess/Scribunto/EntityAccessorTest.php
@@ -70,7 +70,7 @@
return new EntityAccessor(
new ItemIdParser(),
$entityLookup ?: new MockRepository(),
-   $usageAccumulator ? $usageAccumulator : new 
HashUsageAccumulator(),
+   $usageAccumulator ?: new HashUsageAccumulator(),
$entitySerializer,
$propertyDataTypeLookup,
$fallbackChain,
diff --git a/repo/includes/Specials/SpecialModifyTerm.php 
b/repo/includes/Specials/SpecialModifyTerm.php
index 8b57b93..2ce4e47 100644
--- a/repo/includes/Specials/SpecialModifyTerm.php
+++ b/repo/includes/Specials/SpecialModifyTerm.php
@@ -186,7 +186,7 @@
'cssclass' => 'wb-input',
'id' => 'wb-modifyterm-value',
'type' => 'text',
-   'default' => $this->getRequest()->getVal( 'value' ) ? 
$this->getRequest()->getVal( 'value' ) : $this->value,
+   'default' => $this->getRequest()->getVal( 'value' ) ?: 
$this->value,
'nodata' => true
);
 
diff --git a/repo/includes/Specials/SpecialSetLabelDescriptionAliases.php 
b/repo/includes/Specials/SpecialSetLabelDescriptionAliases.php
index 476c857..7b489d5 100644
--- a/repo/includes/Specials/SpecialSetLabelDescriptionAliases.php
+++ b/repo/includes/Specials/SpecialSetLabelDescriptionAliases.php
@@ -184,7 +184,7 @@
} else {
$intro = $this->msg( 
'wikibase-setlabeldescriptionaliases-intro' )->parse();
$fieldId = 
'wikibase-setlabeldescriptionaliases-language';
-   $languageCode = $this->languageCode ? : 
$this->getLanguage()->getCode();
+   $languageCode = $this->languageCode ?: 
$this->getLanguage()->getCode();
 
$formDescriptor = $this->getFormElements( $entity );
$formDescriptor['language'] = array(

-- 
To view, visit https://gerrit.wikimedia.org/r/339630
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I614bdb628546661b970dc605f41bc990e6aadad0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Thiemo Mättig (WMDE) 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits