From ff797aa0699becfbecbc1b6e8530f41eb73dae76 Mon Sep 17 00:00:00 2001
From: Seamus Lee <seamuslee001@gmail.com>
Date: Fri, 9 Jul 2021 14:13:05 +1000
Subject: [PATCH] [REF] Add in APIv4 Product Entity and Fix APIv4 Syntax
 Conformance test failures on ContributionProduct and EntityBatch APIs

update version
---
 Civi/Api4/ContributionProduct.php             |  1 +
 Civi/Api4/EntityBatch.php                     |  1 +
 Civi/Api4/Product.php                         | 23 +++++++++++++++++++
 .../api/v4/DataSets/ConformanceTest.json      |  9 ++++++++
 .../phpunit/api/v4/Entity/ConformanceTest.php |  1 +
 5 files changed, 35 insertions(+)
 create mode 100644 Civi/Api4/Product.php

diff --git a/Civi/Api4/ContributionProduct.php b/Civi/Api4/ContributionProduct.php
index d18ff7fb92..de34bb0675 100644
--- a/Civi/Api4/ContributionProduct.php
+++ b/Civi/Api4/ContributionProduct.php
@@ -15,6 +15,7 @@ namespace Civi\Api4;
 /**
  * Contribution Product entity.
  *
+ * @since 5.41
  * @package Civi\Api4
  */
 class ContributionProduct extends Generic\DAOEntity {
diff --git a/Civi/Api4/EntityBatch.php b/Civi/Api4/EntityBatch.php
index 9952295beb..b85e64d0e5 100644
--- a/Civi/Api4/EntityBatch.php
+++ b/Civi/Api4/EntityBatch.php
@@ -22,6 +22,7 @@ namespace Civi\Api4;
 /**
  * EntityBatch entity.
  *
+ * @since 5.41
  * @searchable none
  * @package Civi\Api4
  */
diff --git a/Civi/Api4/Product.php b/Civi/Api4/Product.php
new file mode 100644
index 0000000000..9be31a61f7
--- /dev/null
+++ b/Civi/Api4/Product.php
@@ -0,0 +1,23 @@
+<?php
+
+/*
+ +--------------------------------------------------------------------+
+ | Copyright CiviCRM LLC. All rights reserved.                        |
+ |                                                                    |
+ | This work is published under the GNU AGPLv3 license with some      |
+ | permitted exceptions and without any warranty. For full license    |
+ | and copyright information, see https://civicrm.org/licensing       |
+ +--------------------------------------------------------------------+
+ */
+
+namespace Civi\Api4;
+
+/**
+ * Product entity.
+ *
+ * @since 5.41
+ * @package Civi\Api4
+ */
+class Product extends Generic\DAOEntity {
+
+}
diff --git a/tests/phpunit/api/v4/DataSets/ConformanceTest.json b/tests/phpunit/api/v4/DataSets/ConformanceTest.json
index 67eed06c4f..3d7918ecba 100644
--- a/tests/phpunit/api/v4/DataSets/ConformanceTest.json
+++ b/tests/phpunit/api/v4/DataSets/ConformanceTest.json
@@ -81,5 +81,14 @@
       "name": "Batch_433397",
       "status_id": "1"
     }
+  ],
+  "Product": [
+    {
+      "name": "Test Product",
+      "price": "10.00",
+      "sku": "Test SKU",
+      "financial_type_id:name": "Donation",
+      "min_contribution": "10.00"
+    }
   ]
 }
diff --git a/tests/phpunit/api/v4/Entity/ConformanceTest.php b/tests/phpunit/api/v4/Entity/ConformanceTest.php
index 4d2d024a40..c03933de96 100644
--- a/tests/phpunit/api/v4/Entity/ConformanceTest.php
+++ b/tests/phpunit/api/v4/Entity/ConformanceTest.php
@@ -54,6 +54,7 @@ class ConformanceTest extends UnitTestCase implements HookInterface {
       'civicrm_event',
       'civicrm_participant',
       'civicrm_batch',
+      'civicrm_product',
     ];
     $this->dropByPrefix('civicrm_value_myfavorite');
     $this->cleanup(['tablesToTruncate' => $tablesToTruncate]);
-- 
2.25.1