INFRA-132 - Remove unused fn params

diff --git a/Civi/API/Subscriber/ChainSubscriber.php b/Civi/API/Subscriber/ChainSubscriber.php
index 74488e2d91d6db70482a9946437fd8189e7dd6b7..651229e67ba6ead5a69730753fd2ed1478cee01a 100644 (file)
--- 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 5b35cbc3589c8aecb411b98b389ef905500b1f21..4135224dacabdf7f242509abba4200edc8527e9b 100644 (file)
--- 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 5682e91a8951e45a571b6f777992b716687c57a5..0b3157ef6de3a0b43df920359c8ae14eed2b4cee 100644 (file)
--- 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']);