From f27ab61d175197abd3d4f7726f0120a9cc5dda4b Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Thu, 27 Feb 2020 08:05:02 -0500
Subject: [PATCH] Api code minor cleanup

---
 Civi/API/Request.php | 2 +-
 api/api.php          | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/Civi/API/Request.php b/Civi/API/Request.php
index 7a053e37c2..22fa382a71 100644
--- a/Civi/API/Request.php
+++ b/Civi/API/Request.php
@@ -34,7 +34,7 @@ class Request {
     switch ($params['version'] ?? NULL) {
       case 3:
         return [
-          'id' => self::$nextId++,
+          'id' => self::getNextId(),
           'version' => 3,
           'params' => $params,
           'fields' => NULL,
diff --git a/api/api.php b/api/api.php
index 4f6c4585c9..7cbc5d180d 100644
--- a/api/api.php
+++ b/api/api.php
@@ -15,12 +15,11 @@
  *   create, get, delete or some special action name.
  * @param array $params
  *   array to be passed to function
- * @param null $extra
  *
  * @return array|int
  */
-function civicrm_api(string $entity, string $action, array $params, $extra = NULL) {
-  return \Civi::service('civi_api_kernel')->runSafe($entity, $action, $params, $extra);
+function civicrm_api(string $entity, string $action, array $params) {
+  return \Civi::service('civi_api_kernel')->runSafe($entity, $action, $params);
 }
 
 /**
-- 
2.25.1