From 845d6d751749edc188bbc5d72baf83f315be6d1e Mon Sep 17 00:00:00 2001 From: Coleman Watts Date: Mon, 12 Jan 2015 10:42:02 -0500 Subject: [PATCH] INFRA-132 - Remove unused fn params --- Civi/API/Subscriber/ChainSubscriber.php | 4 ++-- api/api.php | 5 ++--- tests/phpunit/api/v3/APITest.php | 2 +- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/Civi/API/Subscriber/ChainSubscriber.php b/Civi/API/Subscriber/ChainSubscriber.php index 74488e2d91..651229e67b 100644 --- a/Civi/API/Subscriber/ChainSubscriber.php +++ b/Civi/API/Subscriber/ChainSubscriber.php @@ -158,7 +158,7 @@ class ChainSubscriber implements EventSubscriberInterface { // it is a numerically indexed array - ie. multiple creates foreach ($newparams as $entityparams) { $subParams = array_merge($genericParams, $entityparams); - _civicrm_api_replace_variables($subAPI[1], $subaction, $subParams, $result['values'][$idIndex], $separator); + _civicrm_api_replace_variables($subParams, $result['values'][$idIndex], $separator); $result['values'][$result['id']][$field][] = civicrm_api($subEntity, $subaction, $subParams); if ($result['is_error'] === 1) { throw new \Exception($subEntity . ' ' . $subaction . 'call failed with' . $result['error_message']); @@ -168,7 +168,7 @@ class ChainSubscriber implements EventSubscriberInterface { else { $subParams = array_merge($subParams, $newparams); - _civicrm_api_replace_variables($subAPI[1], $subaction, $subParams, $result['values'][$idIndex], $separator); + _civicrm_api_replace_variables($subParams, $result['values'][$idIndex], $separator); $result['values'][$idIndex][$field] = civicrm_api($subEntity, $subaction, $subParams); if (!empty($result['is_error'])) { throw new \Exception($subEntity . ' ' . $subaction . 'call failed with' . $result['error_message']); diff --git a/api/api.php b/api/api.php index 5b35cbc358..4135224dac 100644 --- a/api/api.php +++ b/api/api.php @@ -117,13 +117,12 @@ function _civicrm_api_get_camel_name($entity) { * 'activity_type_id' => '$value.testfield', * 'tag_id' => '$value.api.tag.create.id', * 'tag1_id' => '$value.api.entity.create.0.id' - * @param $entity - * @param $action + * * @param array $params * @param array $parentResult * @param string $separator */ -function _civicrm_api_replace_variables($entity, $action, &$params, &$parentResult, $separator = '.') { +function _civicrm_api_replace_variables(&$params, &$parentResult, $separator = '.') { foreach ($params as $field => $value) { diff --git a/tests/phpunit/api/v3/APITest.php b/tests/phpunit/api/v3/APITest.php index 5682e91a89..0b3157ef6d 100644 --- a/tests/phpunit/api/v3/APITest.php +++ b/tests/phpunit/api/v3/APITest.php @@ -58,7 +58,7 @@ class api_v3_APITest extends CiviUnitTestCase { 'big_rock' => '$value.api.tag.create.api.tag.create.values.0.display', 'villain' => '$value.api.tag.create.values.0.api_tag_get.display', ); - _civicrm_api_replace_variables('Activity', 'Get', $params, $result); + _civicrm_api_replace_variables($params, $result); $this->assertEquals(999, $params['number']); $this->assertEquals(8, $params['tag_id']); $this->assertEquals(6, $params['activity_type_id']); -- 2.25.1