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.
civicrm · Jul 14, 2021 · 0525019 · 0525019
1 parent 1f3f8af
commit 0525019
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git 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 @@ public static function &fields() {
         ],
         '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
@@ -262,7 +262,7 @@ public function testSubmitRecur(): void {
       '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 @@ public function testSubmitRecurCompleteInstant(): void {
       '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 @@ public function testSubmitRecurCompleteInstantWithMail(string $thousandSeparator
       '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
@@ -783,7 +783,7 @@ public function testSubmitRecur(): void {
       '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 @@ public function testSubmitRecurCompleteInstant(): void {
       '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
@@ -1088,7 +1088,7 @@ public function testSubmitMembershipPriceSetPaymentPaymentProcessorSeparatePayme
     $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
@@ -268,7 +268,7 @@
   </field>
   <field>
     <name>auto_renew</name>
-    <type>boolean</type>
+    <type>tinyint</type>
     <default>0</default>
     <html>
       <type>Radio</type>