Civi - replace CRM_Utils_Array::value with ??

diff --git a/CRM/Event/Tokens.php b/CRM/Event/Tokens.php
index 5c6c685875ee8d9ecdbe52574f43fe6b3d11e83e..15784cd87289b3ff72e1ee10b49559e24495c0b6 100644 (file)
--- a/CRM/Event/Tokens.php
+++ b/CRM/Event/Tokens.php
@@ -93,7 +93,7 @@ LEFT JOIN civicrm_phone phone ON phone.id = lb.phone_id
       $stateProvince = \CRM_Core_PseudoConstant::stateProvince();
       $loc['street_address'] = $actionSearchResult->street_address;
       $loc['city'] = $actionSearchResult->city;
-      $loc['state_province'] = \CRM_Utils_Array::value($actionSearchResult->state_province_id, $stateProvince);
+      $loc['state_province'] = $stateProvince[$actionSearchResult->state_province_id] ?? NULL;
       $loc['postal_code'] = $actionSearchResult->postal_code;
       //$entityTokenParams[$tokenEntity][$field] = \CRM_Utils_Address::format($loc);
       $row->tokens($entity, $field, \CRM_Utils_Address::format($loc));
@@ -115,7 +115,7 @@ LEFT JOIN civicrm_phone phone ON phone.id = lb.phone_id
       }
       elseif (!empty($actionSearchResult->entityID)) {
         $info = \CRM_Contribute_BAO_Contribution::getPaymentInfo($actionSearchResult->entityID, 'event');
-        $balancePay = \CRM_Utils_Array::value('balance', $info);
+        $balancePay = $info['balance'] ?? NULL;
         $balancePay = \CRM_Utils_Money::format($balancePay);
       }
       $row->tokens($entity, $field, $balancePay);

diff --git a/CRM/Mailing/Page/View.php b/CRM/Mailing/Page/View.php
index 363c8efc89a550a55335f4dc47b87a354679fc84..29818074424277ba02f1c832a43fc262be3f3ae8 100644 (file)
--- a/CRM/Mailing/Page/View.php
+++ b/CRM/Mailing/Page/View.php
@@ -147,7 +147,7 @@ class CRM_Mailing_Page_View extends CRM_Core_Page {
       'id' => $this->_mailingID,
       'contact_id' => $contactId,
     ]);
-    $mailing = \CRM_Utils_Array::value('values', $result);
+    $mailing = $result['values'] ?? NULL;
 
     $title = NULL;
     if (isset($mailing['body_html']) && empty($_GET['text'])) {

diff --git a/Civi/API/Kernel.php b/Civi/API/Kernel.php
index 188e2c3acbfb431c6cab35a0f70ec20da37d3f8b..13e55c34455d07a4fc502bac3643e9e29fe4b852 100644 (file)
--- a/Civi/API/Kernel.php
+++ b/Civi/API/Kernel.php
@@ -325,8 +325,8 @@ class Kernel {
    */
   public function formatApiException($e, $apiRequest) {
     $data = $e->getExtraParams();
-    $data['entity'] = \CRM_Utils_Array::value('entity', $apiRequest);
-    $data['action'] = \CRM_Utils_Array::value('action', $apiRequest);
+    $data['entity'] = $apiRequest['entity'] ?? NULL;
+    $data['action'] = $apiRequest['action'] ?? NULL;
 
     if (\CRM_Utils_Array::value('debug', \CRM_Utils_Array::value('params', $apiRequest))
       // prevent recursion

diff --git a/Civi/API/SelectQuery.php b/Civi/API/SelectQuery.php
index d7c6d3f12733f18d2c0ec4b8823137896a8e2bfc..cdd102278c3278009ce61b95e27a5a1feae8bbd4 100644 (file)
--- a/Civi/API/SelectQuery.php
+++ b/Civi/API/SelectQuery.php
@@ -210,7 +210,7 @@ abstract class SelectQuery {
       if (!isset($fkField['FKApiSpec'])) {
         $fkField['FKApiSpec'] = \_civicrm_api_get_fields($fkField['FKApiName']);
       }
-      $fieldInfo = \CRM_Utils_Array::value($fieldName, $fkField['FKApiSpec']);
+      $fieldInfo = $fkField['FKApiSpec'][$fieldName] ?? NULL;
 
       $keyColumn = \CRM_Utils_Array::value('FKKeyColumn', $fkField, 'id');
       if (!$fieldInfo || !isset($fkField['FKApiSpec'][$keyColumn])) {
@@ -259,7 +259,7 @@ abstract class SelectQuery {
   protected function getJoinInfo(&$fkField, $stack) {
     if ($fkField['name'] == 'entity_id') {
       $entityTableParam = substr(implode('.', $stack), 0, -2) . 'table';
-      $entityTable = \CRM_Utils_Array::value($entityTableParam, $this->where);
+      $entityTable = $this->where[$entityTableParam] ?? NULL;
       if ($entityTable && is_string($entityTable) && \CRM_Core_DAO_AllCoreTables::getClassForTable($entityTable)) {
         $fkField['FKClassName'] = \CRM_Core_DAO_AllCoreTables::getClassForTable($entityTable);
         $fkField['FKApiName'] = \CRM_Core_DAO_AllCoreTables::getBriefName($fkField['FKClassName']);

diff --git a/Civi/API/Subscriber/ChainSubscriber.php b/Civi/API/Subscriber/ChainSubscriber.php
index 932d78cbd0ee4799cd4242ba9abd574c78304940..8834495633819bb8504a4be195e92b7b7440faf9 100644 (file)
--- a/Civi/API/Subscriber/ChainSubscriber.php
+++ b/Civi/API/Subscriber/ChainSubscriber.php
@@ -106,7 +106,7 @@ class ChainSubscriber implements EventSubscriberInterface {
 
         $subaction = empty($subAPI[2]) ? $action : $subAPI[2];
         $subParams = [
-          'debug' => \CRM_Utils_Array::value('debug', $params),
+          'debug' => $params['debug'] ?? NULL,
         ];
         $subEntity = _civicrm_api_get_entity_name_from_camel($subAPI[1]);
 

diff --git a/Civi/API/Subscriber/I18nSubscriber.php b/Civi/API/Subscriber/I18nSubscriber.php
index cad932dd4e9f2381a358c67e6f98aea161b81bb8..f89964c0b2a2e893587e973f91c69d2c76d2b286 100644 (file)
--- a/Civi/API/Subscriber/I18nSubscriber.php
+++ b/Civi/API/Subscriber/I18nSubscriber.php
@@ -50,10 +50,10 @@ class I18nSubscriber implements EventSubscriberInterface {
 
     $params = $apiRequest['params'];
     if ($apiRequest['version'] < 4) {
-      $language = !empty($params['options']['language']) ? $params['options']['language'] : \CRM_Utils_Array::value('option.language', $params);
+      $language = $params['options']['language'] ?? $params['option.language'] ?? NULL;
     }
     else {
-      $language = \CRM_Utils_Array::value('language', $params);
+      $language = $params['language'] ?? NULL;
     }
     if ($language) {
       $this->setLocale($language, $apiRequest['id']);

diff --git a/Civi/Angular/Page/Modules.php b/Civi/Angular/Page/Modules.php
index aa3655b8c7ab2e96f675e88b4e9e66d3c2db1652..96d78867c44d8def951f7d825a6a6d537c38946d 100644 (file)
--- a/Civi/Angular/Page/Modules.php
+++ b/Civi/Angular/Page/Modules.php
@@ -77,19 +77,19 @@ class Modules extends \CRM_Core_Page {
 
     switch ($event->asset) {
       case 'angular-modules.json':
-        $moduleNames = $page->parseModuleNames(\CRM_Utils_Array::value('modules', $event->params), $angular);
+        $moduleNames = $page->parseModuleNames($event->params['modules'] ?? NULL, $angular);
         $event->mimeType = 'application/json';
         $event->content = json_encode($page->getMetadata($moduleNames, $angular));
         break;
 
       case 'angular-modules.js':
-        $moduleNames = $page->parseModuleNames(\CRM_Utils_Array::value('modules', $event->params), $angular);
+        $moduleNames = $page->parseModuleNames($event->params['modules'] ?? NULL, $angular);
         $event->mimeType = 'application/javascript';
         $event->content = $page->digestJs($angular->getResources($moduleNames, 'js', 'path'));
         break;
 
       case 'angular-modules.css':
-        $moduleNames = $page->parseModuleNames(\CRM_Utils_Array::value('modules', $event->params), $angular);
+        $moduleNames = $page->parseModuleNames($event->params['modules'] ?? NULL, $angular);
         $event->mimeType = 'text/css';
         $event->content = \CRM_Utils_File::concat($angular->getResources($moduleNames, 'css', 'path'), "\n");
 

diff --git a/Civi/Core/SettingsManager.php b/Civi/Core/SettingsManager.php
index 4970ff93ad0e587af65a4282f665c0cf40efc767..1bd096758a0a576ec080b51ed21e46d0514fdeff 100644 (file)
--- a/Civi/Core/SettingsManager.php
+++ b/Civi/Core/SettingsManager.php
@@ -221,7 +221,7 @@ class SettingsManager {
       ]);
       $defaults = [];
       foreach ($specs as $key => $spec) {
-        $defaults[$key] = \CRM_Utils_Array::value('default', $spec);
+        $defaults[$key] = $spec['default'] ?? NULL;
       }
       \CRM_Utils_Array::extend($defaults, self::getSystemDefaults($entity));
       $this->cache->set($cacheKey, $defaults);