From 78fae000de6dc20c6ed9769d310c205cadc40d8e Mon Sep 17 00:00:00 2001 From: Coleman Watts Date: Fri, 1 Jan 2021 20:45:44 -0500 Subject: [PATCH] Fix pseudoconstant lookup when running APIv4 from APIv3 tests --- Civi/Test/Api3TestTrait.php | 4 ++-- tests/phpunit/api/v3/RelationshipTest.php | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Civi/Test/Api3TestTrait.php b/Civi/Test/Api3TestTrait.php index f84c4c2f98..d09b4f6a17 100644 --- a/Civi/Test/Api3TestTrait.php +++ b/Civi/Test/Api3TestTrait.php @@ -404,8 +404,8 @@ trait Api3TestTrait { $v3Params['option_group.name'] = $v3Params['option_group_id']; unset($v3Params['option_group_id']); } - if (isset($field['pseudoconstant'], $v3Params[$name]) && $field['type'] === \CRM_Utils_Type::T_INT && !is_numeric($v3Params[$name])) { - $v3Params[$name] = \CRM_Core_PseudoConstant::getKey(\CRM_Core_DAO_AllCoreTables::getFullName($v3Entity), $name, $v3Params[$name]); + if (isset($field['pseudoconstant'], $v3Params[$name]) && $field['type'] === \CRM_Utils_Type::T_INT && !is_numeric($v3Params[$name]) && is_string($v3Params[$name])) { + $v3Params[$name] = \CRM_Core_PseudoConstant::getKey(\CRM_Core_DAO_AllCoreTables::getFullName($v4Entity), $name, $v3Params[$name]); } } diff --git a/tests/phpunit/api/v3/RelationshipTest.php b/tests/phpunit/api/v3/RelationshipTest.php index cea32782d0..94b2899a04 100644 --- a/tests/phpunit/api/v3/RelationshipTest.php +++ b/tests/phpunit/api/v3/RelationshipTest.php @@ -1041,7 +1041,7 @@ class api_v3_RelationshipTest extends CiviUnitTestCase { $this->assertEquals(1, $result['count']); $result = $this->callAPISuccess($this->entity, 'get', [ 'contact_id' => $this->_cId_a, - 'relationship_type_id' => $this->_relTypeID + 1, + 'relationship_type_id' => 1, ]); $this->assertEquals(0, $result['count']); $this->callAPISuccess($this->entity, 'delete', ['id' => $created['id']]); @@ -1070,7 +1070,7 @@ class api_v3_RelationshipTest extends CiviUnitTestCase { $this->assertEquals(1, $result['count']); $result = $this->callAPISuccess($this->entity, 'get', [ 'contact_id_a' => $this->_cId_a, - 'relationship_type_id' => $this->_relTypeID + 1, + 'relationship_type_id' => 1, ]); $this->assertEquals(0, $result['count']); } -- 2.25.1