Merge pull request #17157 from eileenmcnaughton/ids

[civicrm-core.git] / tests / phpunit / CRM / Utils / AddressTest.php

diff --git a/tests/phpunit/CRM/Utils/AddressTest.php b/tests/phpunit/CRM/Utils/AddressTest.php
index 6fa80cabafd228ae77e235417e53b9d9e875006a..3ce0a367fc5676a7a14b5557a8bcf96d8e523cd2 100644 (file)
--- a/tests/phpunit/CRM/Utils/AddressTest.php
+++ b/tests/phpunit/CRM/Utils/AddressTest.php
@@ -11,12 +11,12 @@ class CRM_Utils_AddressTest extends CiviUnitTestCase {
   }
 
   public function testAddressFormat() {
-    $contact = $this->callAPISuccess('contact', 'create', array(
+    $contact = $this->callAPISuccess('contact', 'create', [
       'first_name' => 'Micky',
       'last_name' => 'mouse',
       'contact_type' => 'Individual',
-    ));
-    $address = $this->callAPISuccess('address', 'create', array(
+    ]);
+    $address = $this->callAPISuccess('address', 'create', [
       'street_address' => '1 Happy Place',
       'city' => 'Miami',
       'state_province' => 'Flordia',
@@ -25,7 +25,7 @@ class CRM_Utils_AddressTest extends CiviUnitTestCase {
       'contact_id' => $contact['id'],
       'location_type_id' => 5,
       'is_primary' => 1,
-    ));
+    ]);
     $addressDetails = $address['values'][$address['id']];
     $countries = CRM_Core_PseudoConstant::country();
     $addressDetails['country'] = $countries[$addressDetails['country_id']];
@@ -38,13 +38,14 @@ class CRM_Utils_AddressTest extends CiviUnitTestCase {
    * and test using alternate names for state_province field
    */
   public function testStateProvinceFormattedBillingAddress() {
-    $params = array(
+    $params = [
       'billing_street_address-99' => '123 Happy Place',
       'billing_city-99' => 'Miami',
       'billing_postal_code-99' => 33101,
-      'state_province-99' => '1000', // 1000 => Alabama (AL)
+      // 1000 => Alabama (AL)
+      'state_province-99' => '1000',
       'country-99' => 'United States',
-    );
+    ];
 
     // set address_format (we are only interested in state_province & state_province_name)
     $addFormat = '{contact.state_province}';
@@ -59,14 +60,16 @@ class CRM_Utils_AddressTest extends CiviUnitTestCase {
 
     // test using alternate names for state/province field
     unset($params['state_province-99']);
-    $params['billing_state_province-99'] = '1000'; // alternate name 1
+    // alternate name 1
+    $params['billing_state_province-99'] = '1000';
     $addFormat = '{contact.state_province_name}';
     Civi::settings()->set('address_format', $addFormat);
     $formatted_address = CRM_Utils_Address::getFormattedBillingAddressFieldsFromParameters($params, '99');
     $this->assertTrue((bool) $formatted_address == 'Alabama');
 
     unset($params['state_province-99']);
-    $params['billing_state_province_id-99'] = '1000'; // alternate name 2
+    // alternate name 2
+    $params['billing_state_province_id-99'] = '1000';
     $addFormat = '{contact.state_province_name}';
     Civi::settings()->set('address_format', $addFormat);
     $formatted_address = CRM_Utils_Address::getFormattedBillingAddressFieldsFromParameters($params, '99');