From 8e593ba83fef2b0df812d7f1c5f47bcc7996ff76 Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Thu, 9 Jan 2020 17:35:30 -0500
Subject: [PATCH] Test fix - legacy api4 wrapper should always return id

---
 Civi/Test/Api3TestTrait.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Civi/Test/Api3TestTrait.php b/Civi/Test/Api3TestTrait.php
index 98f993936e..fe95b3a947 100644
--- a/Civi/Test/Api3TestTrait.php
+++ b/Civi/Test/Api3TestTrait.php
@@ -411,6 +411,10 @@ trait Api3TestTrait {
       case 'get':
         if ($options['return'] && $v3Action !== 'getcount') {
           $v4Params['select'] = array_keys($options['return']);
+          // Ensure id field is returned as v3 always expects it
+          if ($v4Entity != 'Setting' && !in_array('id', $v4Params['select'])) {
+            $v4Params['select'][] = 'id';
+          }
           // Convert join syntax
           foreach ($v4Params['select'] as &$select) {
             if (strstr($select, '_id.')) {
-- 
2.25.1