From 17cfbd1a0177e2285a00db1692e96d137c6b41ff Mon Sep 17 00:00:00 2001
From: Demian Katz <demian.katz@villanova.edu>
Date: Fri, 6 Apr 2018 10:17:27 -0400
Subject: [PATCH] Null coalescing.
---
.../src/VuFind/Controller/CombinedController.php | 3 +--
.../Hierarchy/Driver/ConfigurationBasedFactory.php | 3 +--
module/VuFind/src/VuFind/ILS/Driver/NoILS.php | 6 ++----
module/VuFind/src/VuFind/ILS/Driver/Symphony.php | 14 ++++----------
.../VuFind/src/VuFind/View/Helper/Root/Factory.php | 9 +++------
.../VuFindSearch/Backend/WorldCat/Connector.php | 2 +-
6 files changed, 12 insertions(+), 25 deletions(-)
diff --git a/module/VuFind/src/VuFind/Controller/CombinedController.php b/module/VuFind/src/VuFind/Controller/CombinedController.php
index c54d9b8b066..9caa23b02a0 100644
--- a/module/VuFind/src/VuFind/Controller/CombinedController.php
+++ b/module/VuFind/src/VuFind/Controller/CombinedController.php
@@ -209,8 +209,7 @@ class CombinedController extends AbstractSearch
'results' => $results,
'supportsCart' => $supportsCart,
'supportsCartOptions' => $supportsCartOptions,
- 'showBulkOptions' => isset($settings->Site->showBulkOptions)
- && $settings->Site->showBulkOptions
+ 'showBulkOptions' => $settings->Site->showBulkOptions ?? false
]
);
}
diff --git a/module/VuFind/src/VuFind/Hierarchy/Driver/ConfigurationBasedFactory.php b/module/VuFind/src/VuFind/Hierarchy/Driver/ConfigurationBasedFactory.php
index e0a28567c6c..4a55c3fcb38 100644
--- a/module/VuFind/src/VuFind/Hierarchy/Driver/ConfigurationBasedFactory.php
+++ b/module/VuFind/src/VuFind/Hierarchy/Driver/ConfigurationBasedFactory.php
@@ -68,8 +68,7 @@ class ConfigurationBasedFactory
$configReader = $sm->get('VuFind\Config\PluginManager');
$globalConfig = $configReader->get('config');
$options = [
- 'enabled' => isset($globalConfig->Hierarchy->showTree)
- ? $globalConfig->Hierarchy->showTree : false
+ 'enabled' => $globalConfig->Hierarchy->showTree ?? false
];
// Load driver-specific configuration:
diff --git a/module/VuFind/src/VuFind/ILS/Driver/NoILS.php b/module/VuFind/src/VuFind/ILS/Driver/NoILS.php
index 9b84fd5587d..2a82ba87d08 100644
--- a/module/VuFind/src/VuFind/ILS/Driver/NoILS.php
+++ b/module/VuFind/src/VuFind/ILS/Driver/NoILS.php
@@ -225,10 +225,8 @@ class NoILS extends AbstractBase implements TranslatorAwareInterface
$this->config['Holdings']['callnumber']
),
'barcode' => $this->config['Holdings']['barcode'],
- 'notes' => isset($this->config['Holdings']['notes'])
- ? $this->config['Holdings']['notes'] : [],
- 'summary' => isset($this->config['Holdings']['summary'])
- ? $this->config['Holdings']['summary'] : []
+ 'notes' => $this->config['Holdings']['notes'] ?? [],
+ 'summary' => $this->config['Holdings']['summary'] ?? []
]
];
} elseif ($useHoldings == "marc") {
diff --git a/module/VuFind/src/VuFind/ILS/Driver/Symphony.php b/module/VuFind/src/VuFind/ILS/Driver/Symphony.php
index 2970f93f91b..153fb4691b4 100644
--- a/module/VuFind/src/VuFind/ILS/Driver/Symphony.php
+++ b/module/VuFind/src/VuFind/ILS/Driver/Symphony.php
@@ -1369,18 +1369,12 @@ class Symphony extends AbstractBase implements LoggerAwareInterface
foreach ($fees as $fee) {
$fineList[] = [
'amount' => $fee->amount->_ * 100,
- 'checkout' =>
- isset($fee->feeItemInfo->checkoutDate) ?
- $fee->feeItemInfo->checkoutDate : null,
+ 'checkout' => $fee->feeItemInfo->checkoutDate ?? null,
'fine' => $fee->billReasonDescription,
'balance' => $fee->amountOutstanding->_ * 100,
- 'createdate' =>
- isset($fee->dateBilled) ? $fee->dateBilled : null,
- 'duedate' =>
- isset($fee->feeItemInfo->dueDate) ?
- $fee->feeItemInfo->dueDate : null,
- 'id' => isset($fee->feeItemInfo->titleKey) ?
- $fee->feeItemInfo->titleKey : null
+ 'createdate' => $fee->dateBilled ?? null,
+ 'duedate' => $fee->feeItemInfo->dueDate ?? null,
+ 'id' => $fee->feeItemInfo->titleKey ?? null
];
}
}
diff --git a/module/VuFind/src/VuFind/View/Helper/Root/Factory.php b/module/VuFind/src/VuFind/View/Helper/Root/Factory.php
index 95143e45cbe..a92deba34c8 100644
--- a/module/VuFind/src/VuFind/View/Helper/Root/Factory.php
+++ b/module/VuFind/src/VuFind/View/Helper/Root/Factory.php
@@ -267,13 +267,10 @@ class Factory
$config = $sm->get('VuFind\Config\PluginManager')->get('config');
$url = isset($config->Piwik->url) ? $config->Piwik->url : false;
$options = [
- 'siteId' => isset($config->Piwik->site_id) ? $config->Piwik->site_id : 1,
- 'searchPrefix' => isset($config->Piwik->searchPrefix)
- ? $config->Piwik->searchPrefix : null
+ 'siteId' => $config->Piwik->site_id ?? 1,
+ 'searchPrefix' => $config->Piwik->searchPrefix ?? null
];
- $customVars = isset($config->Piwik->custom_variables)
- ? $config->Piwik->custom_variables
- : false;
+ $customVars = $config->Piwik->custom_variables ?? false;
$request = $sm->get('Request');
$router = $sm->get('Router');
return new Piwik($url, $options, $customVars, $router, $request);
diff --git a/module/VuFindSearch/src/VuFindSearch/Backend/WorldCat/Connector.php b/module/VuFindSearch/src/VuFindSearch/Backend/WorldCat/Connector.php
index 6b08713fcd3..6101c590cf8 100644
--- a/module/VuFindSearch/src/VuFindSearch/Backend/WorldCat/Connector.php
+++ b/module/VuFindSearch/src/VuFindSearch/Backend/WorldCat/Connector.php
@@ -164,7 +164,7 @@ class Connector extends \VuFindSearch\Backend\SRU\Connector
return [
'docs' => $finalDocs,
'offset' => $offset,
- 'total' => isset($xml->numberOfRecords) ? (int)$xml->numberOfRecords : 0
+ 'total' => (int) ($xml->numberOfRecords ?? 0)
];
}
}
--
GitLab