From 052501990e4cd85b573897425a0667ecf20179a5 Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Tue, 13 Jul 2021 10:44:29 -0400
Subject: [PATCH] APIv4 - Fix output of membershipType auto_renew field.

The field had been declared a "boolean" in the schema, which at a SQL level
is exactly the same as "tinyint" but it was resulting in incorrect API output.
---
 CRM/Member/DAO/MembershipType.php                       | 6 +++---
 tests/phpunit/CRM/Member/Form/MembershipRenewalTest.php | 6 +++---
 tests/phpunit/CRM/Member/Form/MembershipTest.php        | 4 ++--
 tests/phpunit/api/v3/ContributionPageTest.php           | 2 +-
 xml/schema/Member/MembershipType.xml                    | 2 +-
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/CRM/Member/DAO/MembershipType.php b/CRM/Member/DAO/MembershipType.php
index c81123e029..5bd91e8e80 100644
--- a/CRM/Member/DAO/MembershipType.php
+++ b/CRM/Member/DAO/MembershipType.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Member/MembershipType.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:e989278865fbeabd9f3d6efc7271a2d1)
+ * (GenCodeChecksum:89dc1a77c01ca0255a2dad8637f5e835)
  */
 
 /**
@@ -168,7 +168,7 @@ class CRM_Member_DAO_MembershipType extends CRM_Core_DAO {
   /**
    * 0 = No auto-renew option; 1 = Give option, but not required; 2 = Auto-renew required;
    *
-   * @var bool
+   * @var int
    */
   public $auto_renew;
 
@@ -557,7 +557,7 @@ class CRM_Member_DAO_MembershipType extends CRM_Core_DAO {
         ],
         'auto_renew' => [
           'name' => 'auto_renew',
-          'type' => CRM_Utils_Type::T_BOOLEAN,
+          'type' => CRM_Utils_Type::T_INT,
           'title' => ts('Auto Renew'),
           'description' => ts('0 = No auto-renew option; 1 = Give option, but not required; 2 = Auto-renew required;'),
           'where' => 'civicrm_membership_type.auto_renew',
diff --git a/tests/phpunit/CRM/Member/Form/MembershipRenewalTest.php b/tests/phpunit/CRM/Member/Form/MembershipRenewalTest.php
index 2c9c3c0013..f1dbc3df9f 100644
--- a/tests/phpunit/CRM/Member/Form/MembershipRenewalTest.php
+++ b/tests/phpunit/CRM/Member/Form/MembershipRenewalTest.php
@@ -262,7 +262,7 @@ class CRM_Member_Form_MembershipRenewalTest extends CiviUnitTestCase {
       'id' => $this->membershipTypeAnnualFixedID,
       'duration_unit' => 'month',
       'duration_interval' => 1,
-      'auto_renew' => TRUE,
+      'auto_renew' => 1,
     ]);
     $form = $this->getForm([
       'contact_id' => $this->_individualId,
@@ -359,7 +359,7 @@ class CRM_Member_Form_MembershipRenewalTest extends CiviUnitTestCase {
       'id' => $this->membershipTypeAnnualFixedID,
       'duration_unit' => 'month',
       'duration_interval' => 1,
-      'auto_renew' => TRUE,
+      'auto_renew' => 1,
     ]);
     $this->createLoggedInUser();
     $form = $this->getForm(array_merge($this->getBaseSubmitParams(), ['is_recur' => 1, 'auto_renew' => '1']));
@@ -446,7 +446,7 @@ class CRM_Member_Form_MembershipRenewalTest extends CiviUnitTestCase {
       'id' => $this->membershipTypeAnnualFixedID,
       'duration_unit' => 'month',
       'duration_interval' => 1,
-      'auto_renew' => TRUE,
+      'auto_renew' => 1,
     ]);
     $this->createLoggedInUser();
     $form = $this->getForm(array_merge($this->getBaseSubmitParams(), [
diff --git a/tests/phpunit/CRM/Member/Form/MembershipTest.php b/tests/phpunit/CRM/Member/Form/MembershipTest.php
index 4a16b367bc..a7fc936ec0 100644
--- a/tests/phpunit/CRM/Member/Form/MembershipTest.php
+++ b/tests/phpunit/CRM/Member/Form/MembershipTest.php
@@ -783,7 +783,7 @@ class CRM_Member_Form_MembershipTest extends CiviUnitTestCase {
       'id' => $this->ids['membership_type']['AnnualFixed'],
       'duration_unit' => 'month',
       'duration_interval' => 1,
-      'auto_renew' => TRUE,
+      'auto_renew' => 1,
     ]);
     $params = $this->getBaseSubmitParams();
     // Change financial_type_id to test our override flows through to the line item.
@@ -1064,7 +1064,7 @@ class CRM_Member_Form_MembershipTest extends CiviUnitTestCase {
       'id' => $this->ids['membership_type']['AnnualFixed'],
       'duration_unit' => 'month',
       'duration_interval' => 1,
-      'auto_renew' => TRUE,
+      'auto_renew' => 1,
     ]);
     $form = $this->getForm($this->getBaseSubmitParams());
     $this->createLoggedInUser();
diff --git a/tests/phpunit/api/v3/ContributionPageTest.php b/tests/phpunit/api/v3/ContributionPageTest.php
index 8a9bffd26a..f4f7a66abc 100644
--- a/tests/phpunit/api/v3/ContributionPageTest.php
+++ b/tests/phpunit/api/v3/ContributionPageTest.php
@@ -1088,7 +1088,7 @@ class api_v3_ContributionPageTest extends CiviUnitTestCase {
     $dummyPP->setDoDirectPaymentResult(['payment_status_id' => 1, 'trxn_id' => 'create_first_success']);
     $submitParams = array_merge($this->getSubmitParamsContributionPlusMembership(TRUE), [
       'is_recur' => 1,
-      'auto_renew' => TRUE,
+      'auto_renew' => 1,
       'frequency_interval' => 1,
       'frequency_unit' => 'month',
     ]);
diff --git a/xml/schema/Member/MembershipType.xml b/xml/schema/Member/MembershipType.xml
index 755a7b1908..47e28d4642 100644
--- a/xml/schema/Member/MembershipType.xml
+++ b/xml/schema/Member/MembershipType.xml
@@ -268,7 +268,7 @@
   </field>
   <field>
     <name>auto_renew</name>
-    <type>boolean</type>
+    <type>tinyint</type>
     <default>0</default>
     <html>
       <type>Radio</type>
-- 
2.25.1