X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=Civi%2FCCase%2FAnalyzer.php;h=d167b6b6a2e582ed4ccf750ea39ac4397f78ece0;hb=4f902dd1f9749368b6f65e79cba9b7f8e8c58695;hp=f4d1569bb1ea01f07b0140924a7e4d9a1d9c7b12;hpb=b7fe18b45e8a71e1a24f775e72720d4bcfe27392;p=civicrm-core.git diff --git a/Civi/CCase/Analyzer.php b/Civi/CCase/Analyzer.php index f4d1569bb1..d167b6b6a2 100644 --- a/Civi/CCase/Analyzer.php +++ b/Civi/CCase/Analyzer.php @@ -1,27 +1,11 @@ + * A list of activity indices, which sort the various activities by some set of keys. + * + * Each index is identified by its key-set - e.g. "activity_type_id;source_contact_id" would be a + * two-dimensional index listing activities by their type ID and their source. + * + * @var array */ private $indices; @@ -80,20 +73,20 @@ class Analyzer { * @return bool */ public function hasActivity($type, $status = NULL) { - $idx = $this->getActivityIndex(array('activity_type_id', 'status_id')); - $activityTypeGroup = civicrm_api3('option_group', 'get', array('name' => 'activity_type')); - $activityType = array( + $idx = $this->getActivityIndex(['activity_type_id', 'status_id']); + $activityTypeGroup = civicrm_api3('option_group', 'get', ['name' => 'activity_type']); + $activityType = [ 'name' => $type, 'option_group_id' => $activityTypeGroup['id'], - ); + ]; $activityTypeID = civicrm_api3('option_value', 'get', $activityType); $activityTypeID = $activityTypeID['values'][$activityTypeID['id']]['value']; if ($status) { - $activityStatusGroup = civicrm_api3('option_group', 'get', array('name' => 'activity_status')); - $activityStatus = array( + $activityStatusGroup = civicrm_api3('option_group', 'get', ['name' => 'activity_status']); + $activityStatus = [ 'name' => $status, 'option_group_id' => $activityStatusGroup['id'], - ); + ]; $activityStatusID = civicrm_api3('option_value', 'get', $activityStatus); $activityStatusID = $activityStatusID['values'][$activityStatusID['id']]['value']; } @@ -115,13 +108,13 @@ class Analyzer { if ($this->activities === NULL) { // TODO find batch-oriented API for getting all activities in a case $case = $this->getCase(); - $activities = array(); + $activities = []; if (isset($case['activities'])) { foreach ($case['activities'] as $actId) { - $result = civicrm_api3('Activity', 'get', array( + $result = civicrm_api3('Activity', 'get', [ 'id' => $actId, 'is_current_revision' => 1, - )); + ]); $activities = array_merge($activities, $result['values']); } } @@ -139,7 +132,7 @@ class Analyzer { * @return array|NULL, activity record (api/v3) */ public function getSingleActivity($type) { - $idx = $this->getActivityIndex(array('activity_type_id', 'id')); + $idx = $this->getActivityIndex(['activity_type_id', 'id']); $actTypes = array_flip(\CRM_Activity_BAO_Activity::buildOptions('activity_type_id', 'validate')); $typeId = $actTypes[$type]; $count = isset($idx[$typeId]) ? count($idx[$typeId]) : 0; @@ -169,7 +162,7 @@ class Analyzer { */ public function getCase() { if ($this->case === NULL) { - $this->case = civicrm_api3('case', 'getsingle', array('id' => $this->caseId)); + $this->case = civicrm_api3('case', 'getsingle', ['id' => $this->caseId]); } return $this->case; } @@ -223,7 +216,7 @@ class Analyzer { $this->case = NULL; $this->caseType = NULL; $this->activities = NULL; - $this->indices = array(); + $this->indices = []; } }