Add setEntityId() to entityForm

civicrm · Feb 10, 2020 · e9f6567 · e9f6567
1 parent e9ada0a
commit e9f6567
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 14 deletions.
diff --git a/CRM/Contribute/Form/AbstractEditPayment.php b/CRM/Contribute/Form/AbstractEditPayment.php
@@ -77,13 +77,6 @@ class CRM_Contribute_Form_AbstractEditPayment extends CRM_Contact_Form_Task {
    */
   protected $_paymentObject;
 
-  /**
-   * The id of the contribution that we are processing.
-   *
-   * @var int
-   */
-  public $_id;
-
   /**
    * Entity that $this->_id relates to.
    *

diff --git a/CRM/Core/Form/EntityFormTrait.php b/CRM/Core/Form/EntityFormTrait.php
@@ -16,6 +16,13 @@
  */
 trait CRM_Core_Form_EntityFormTrait {
 
+  /**
+   * The id of the object being edited / created. This should be protected but on some forms it was previously public
+   *
+   * @var int
+   */
+  public $_id;
+
   /**
    * The entity subtype ID (eg. for Relationship / Activity)
    *
@@ -71,6 +78,15 @@ public function getEntityId() {
     return $this->_id;
   }
 
+  /**
+   * Set the entity ID
+   *
+   * @param int $id The entity ID
+   */
+  public function setEntityId($id) {
+    $this->_id = $id;
+  }
+
   /**
    * Should custom data be suppressed on this form.
    *

diff --git a/CRM/Member/Form.php b/CRM/Member/Form.php
@@ -22,12 +22,6 @@
 class CRM_Member_Form extends CRM_Contribute_Form_AbstractEditPayment {
 
   use CRM_Core_Form_EntityFormTrait;
-  /**
-   * The id of the object being edited / created
-   *
-   * @var int
-   */
-  public $_id;
 
   /**
    * Membership Type ID

diff --git a/CRM/Member/Form/MembershipConfig.php b/CRM/Member/Form/MembershipConfig.php
@@ -28,7 +28,7 @@ class CRM_Member_Form_MembershipConfig extends CRM_Core_Form {
    *
    * @var int
    */
-  public $_id;
+  protected $_id;
 
   /**
    * The name of the BAO object for this form.