PCHR-3544: PR Feedback - Code refactoring

compucorp · Jun 21, 2018 · f3b4a6f · f3b4a6f
1 parent 0991390
commit f3b4a6f
Showing 1 changed file with 12 additions and 12 deletions.
diff --git a/uk.co.compucorp.civicrm.hrcore/CRM/HRCore/Upgrader/Steps/1022.php b/uk.co.compucorp.civicrm.hrcore/CRM/HRCore/Upgrader/Steps/1022.php
@@ -4,12 +4,14 @@ trait CRM_HRCore_Upgrader_Steps_1022 {
 
   /**
    * Hide Fields For Contact Summary
+   *
+   * @return bool
    */
   public function upgrade_1022() {
-    $valuesRemoved = $this->up1022_getContactEditOptionValues();
-    $optionValues = $this->up1022_getActiveContactEditOptionValues();
+    $valuesToRemove = $this->up1022_getContactEditOptionValuesToRemove();
+    $activeOptionValues = $this->up1022_getActiveContactEditOptionValues();
 
-    $activeOptionValues = array_diff($optionValues, $valuesRemoved);
+    $activeOptionValues = array_diff($activeOptionValues, $valuesToRemove);
     civicrm_api3('Setting', 'create', [
       'contact_edit_options' => $activeOptionValues,
     ]);
@@ -24,33 +26,31 @@ public function upgrade_1022() {
    */
   private function up1022_getActiveContactEditOptionValues() {
     $result = civicrm_api3('Setting', 'get', [
-      'sequential' => 1,
       'return' => ['contact_edit_options'],
     ]);
 
-    return $result['values'][0]['contact_edit_options'];
+    return $result['values'][$result['id']]['contact_edit_options'];
   }
 
   /**
    * Retrieves value for contact edit options to be removed
    *
    * @return array
    */
-  private function up1022_getContactEditOptionValues() {
+  private function up1022_getContactEditOptionValuesToRemove() {
     $values = [];
     $names = $this->up1022_getUnusedContactEditOptionNames();
 
     $params = [
-      'sequential' => 1,
       'return' => ['value', 'name'],
       'option_group_id' => 'contact_edit_options',
       'is_active' => 1,
       'name' => ['IN' => $names]
     ];
 
-    $optionValues = civicrm_api3('OptionValue', 'get', $params);
-    foreach ($optionValues['values'] as $optionValue) {
-      array_push($values, $optionValue['value']);
+    $results = civicrm_api3('OptionValue', 'get', $params);
+    foreach ($results['values'] as $result) {
+      array_push($values, $result['value']);
     }
 
     return $values;
@@ -66,13 +66,13 @@ private function up1022_getUnusedContactEditOptionNames() {
 
     foreach (['Contact', 'IM', 'Website'] as $name) {
       $params = ['return' => ['id']];
-      if ($name == 'Contact') {
+      if ($name === 'Contact') {
         $params['suffix_id'] = ['IS NOT NULL' => 1];
       }
 
       $result = civicrm_api3($name, 'get', $params);
       if ($result['count'] == 0) {
-        array_push($names, $name == 'Contact' ? 'Suffix' : $name);
+        array_push($names, $name === 'Contact' ? 'Suffix' : $name);
       }
     }