Merge pull request #17058 from eileenmcnaughton/mem

[civicrm-core.git] / CRM / SMS / Provider.php

diff --git a/CRM/SMS/Provider.php b/CRM/SMS/Provider.php
index 18976e184865e5bdbfc63b51a1bff61c7beeb797..387092876d51067ec63f60e403ff3775bcd9de89 100644 (file)
--- a/CRM/SMS/Provider.php
+++ b/CRM/SMS/Provider.php
@@ -35,9 +35,9 @@ abstract class CRM_SMS_Provider {
    * @throws CRM_Core_Exception
    */
   public static function &singleton($providerParams = array(), $force = FALSE) {
-    $mailingID = CRM_Utils_Array::value('mailing_id', $providerParams);
-    $providerID = CRM_Utils_Array::value('provider_id', $providerParams);
-    $providerName = CRM_Utils_Array::value('provider', $providerParams);
+    $mailingID = $providerParams['mailing_id'] ?? NULL;
+    $providerID = $providerParams['provider_id'] ?? NULL;
+    $providerName = $providerParams['provider'] ?? NULL;
 
     if (!$providerID && $mailingID) {
       $providerID = CRM_Core_DAO::getFieldValue('CRM_Mailing_DAO_Mailing', $mailingID, 'sms_provider_id', 'id');
@@ -141,7 +141,7 @@ INNER JOIN civicrm_mailing_job mj ON mj.mailing_id = m.id AND mj.id = %1";
     }
 
     if (!$sourceContactID) {
-      $sourceContactID = CRM_Utils_Array::value('Contact', $headers);
+      $sourceContactID = $headers['Contact'] ?? NULL;
     }
     if (!$sourceContactID) {
       return FALSE;