CIVIEWAY-263 Refactor to remove calls to deprecated CRM_Utils_Array::…

…value
agileware · Dec 14, 2023 · 55551dc · 55551dc
1 parent 9372117
commit 55551dc
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git a/CRM/eWAYRecurring/Form/Settings.php b/CRM/eWAYRecurring/Form/Settings.php
@@ -40,7 +40,7 @@ public function addFormElements() {
       if (isset($setting['quick_form_type'])) {
         $add = 'add' . $setting['quick_form_type'];
         if ($add == 'addElement') {
-          $this->$add($setting['html_type'], $name, $setting['title'], CRM_Utils_Array::value('html_attributes', $setting, [], TRUE), TRUE);
+          $this->$add($setting['html_type'], $name, $setting['title'], $setting['html_attributes'], TRUE);
         }
         elseif ($setting['html_type'] == 'Select') {
           $optionValues = [];

diff --git a/eWAYRecurring.php b/eWAYRecurring.php
@@ -226,20 +226,20 @@ function ewayrecurring_civicrm_validateForm($formName, &$fields, &$files, &$form
 
   switch($formName) {
     case'CRM_Admin_Form_PaymentProcessor':
-      if(CRM_Utils_Array::value('payment_processor_type_id', $fields) != $paymentProcessorID) {
+      if($fields['payment_processor_type_id'] != $paymentProcessorID) {
         break;
       }
 
-      if (empty(CRM_Utils_Array::value('user_name', $fields, ''))) {
+      if (empty($fields['user_name')) {
         $errors['user_name'] = E::ts('API Key is a required field.');
       }
 
-      if (empty(CRM_Utils_Array::value('password', $fields, ''))) {
+      if (empty($fields['password')) {
         $errors['password'] = E::ts('API Password is a required field.');
       }
       break;
     case 'CRM_Contribute_Form_UpdateSubscription':
-      $submitted_nsd = strtotime(CRM_Utils_Array::value('next_scheduled_date', $fields) . ' ' . CRM_Utils_Array::value('next_scheduled_date_time', $fields));
+      $submitted_nsd = strtotime($fields['next_scheduled_date'] . ' ' . $fields['next_scheduled_date_time']);
 
       ($crid = $form->getVar('contributionRecurID')) || ($crid = $form->getVar('_crid'));
 

diff --git a/tests/phpunit/CRM/EwayRecurring/MyTest.php b/tests/phpunit/CRM/EwayRecurring/MyTest.php
@@ -144,8 +144,8 @@ public function testPaidSubmit($thousandSeparator) {
         ],
       ]
     );
-    $this->assertEquals(CRM_Utils_Array::value('payment_processor_id', $financialTrxn), $paymentProcessorID);
-    $this->assertEquals(CRM_Utils_Array::value('card_type_id.label', $financialTrxn), 'Visa');
-    $this->assertEquals(CRM_Utils_Array::value('pan_truncation', $financialTrxn), 1111);
+    $this->assertEquals($financialTrxn['payment_processor_id'], $paymentProcessorID);
+    $this->assertEquals($financialTrxn['card_type_id.label'], 'Visa');
+    $this->assertEquals($financialTrxn['pan_truncation'], 1111);
   }
 }
diff --git a/tests/phpunit/CRM/EwayRecurring/TestCase.php b/tests/phpunit/CRM/EwayRecurring/TestCase.php
@@ -69,8 +69,8 @@ protected function eventCreatePaid($params) {
     $this->priceSetID = $this->eventPriceSetCreate(55, 0, 'Radio');
     CRM_Price_BAO_PriceSet::addTo('civicrm_event', $event['id'], $this->priceSetID);
     $priceSet = CRM_Price_BAO_PriceSet::getSetDetail($this->priceSetID, TRUE, FALSE);
-    $priceSet = CRM_Utils_Array::value($this->priceSetID, $priceSet);
-    $this->eventFeeBlock = CRM_Utils_Array::value('fields', $priceSet);
+    $priceSet = $priceSet[$this->priceSetID];
+    $this->eventFeeBlock = $priceSet['fields'];
     return $event;
   }
 
@@ -154,7 +154,7 @@ public function eventCreate($params = []) {
   private function _contactCreate($params) {
     $result = $this->callAPISuccess('contact', 'create', $params);
     if (!empty($result['is_error']) || empty($result['id'])) {
-      throw new \Exception('Could not create test contact, with message: ' . \CRM_Utils_Array::value('error_message', $result) . "\nBacktrace:" . \CRM_Utils_Array::value('trace', $result));
+      throw new \Exception('Could not create test contact, with message: ' . $result['error_message'] . "\nBacktrace:" . $result['trace']);
     }
     return $result['id'];
   }