From 40ff1999b1a2cc35d255d3bcc298421339fa63c9 Mon Sep 17 00:00:00 2001
From: Eileen McNaughton <emcnaughton@wikimedia.org>
Date: Mon, 13 Mar 2023 13:10:12 +1300
Subject: [PATCH] Php8.2 declare deleteMessage on entityFormTrait

Php8.2 declare deleteMessage on the EntityFormTrait
---
 CRM/Admin/Form/RelationshipType.php      | 7 -------
 CRM/Core/Form/EntityFormTrait.php        | 7 +++++++
 CRM/Financial/Form/FinancialType.php     | 7 -------
 CRM/Member/Form/MembershipType.php       | 7 -------
 CRM/Price/Form/Set.php                   | 7 -------
 CRM/UF/Form/Group.php                    | 7 -------
 templates/CRM/Member/Form/Membership.tpl | 2 +-
 7 files changed, 8 insertions(+), 36 deletions(-)

diff --git a/CRM/Admin/Form/RelationshipType.php b/CRM/Admin/Form/RelationshipType.php
index c109a2835c..b6c02254fe 100644
--- a/CRM/Admin/Form/RelationshipType.php
+++ b/CRM/Admin/Form/RelationshipType.php
@@ -69,13 +69,6 @@ class CRM_Admin_Form_RelationshipType extends CRM_Admin_Form {
     self::setEntityFieldsMetadata();
   }
 
-  /**
-   * Deletion message to be assigned to the form.
-   *
-   * @var string
-   */
-  protected $deleteMessage;
-
   /**
    * Explicitly declare the entity api name.
    */
diff --git a/CRM/Core/Form/EntityFormTrait.php b/CRM/Core/Form/EntityFormTrait.php
index ccf5522788..d19fc48360 100644
--- a/CRM/Core/Form/EntityFormTrait.php
+++ b/CRM/Core/Form/EntityFormTrait.php
@@ -30,6 +30,13 @@ trait CRM_Core_Form_EntityFormTrait {
    */
   protected $_entitySubTypeId = NULL;
 
+  /**
+   * Deletion message to be assigned to the form.
+   *
+   * @var string
+   */
+  protected $deleteMessage;
+
   /**
    * Get entity fields for the entity to be added to the form.
    *
diff --git a/CRM/Financial/Form/FinancialType.php b/CRM/Financial/Form/FinancialType.php
index a9cd27ee26..3d9f046966 100644
--- a/CRM/Financial/Form/FinancialType.php
+++ b/CRM/Financial/Form/FinancialType.php
@@ -31,13 +31,6 @@ class CRM_Financial_Form_FinancialType extends CRM_Core_Form {
    */
   protected $entityFields = [];
 
-  /**
-   * Deletion message to be assigned to the form.
-   *
-   * @var string
-   */
-  protected $deleteMessage;
-
   /**
    * Set variables up before form is built.
    *
diff --git a/CRM/Member/Form/MembershipType.php b/CRM/Member/Form/MembershipType.php
index 686e2f36f9..17586c6478 100644
--- a/CRM/Member/Form/MembershipType.php
+++ b/CRM/Member/Form/MembershipType.php
@@ -121,13 +121,6 @@ class CRM_Member_Form_MembershipType extends CRM_Member_Form_MembershipConfig {
     }
   }
 
-  /**
-   * Deletion message to be assigned to the form.
-   *
-   * @var string
-   */
-  protected $deleteMessage;
-
   /**
    * Explicitly declare the entity api name.
    */
diff --git a/CRM/Price/Form/Set.php b/CRM/Price/Form/Set.php
index 88a24f76a4..a9c8af8017 100644
--- a/CRM/Price/Form/Set.php
+++ b/CRM/Price/Form/Set.php
@@ -76,13 +76,6 @@ class CRM_Price_Form_Set extends CRM_Core_Form {
     ];
   }
 
-  /**
-   * Deletion message to be assigned to the form.
-   *
-   * @var string
-   */
-  protected $deleteMessage;
-
   /**
    * Set the delete message.
    *
diff --git a/CRM/UF/Form/Group.php b/CRM/UF/Form/Group.php
index 87814ab22e..c3cdcc4b78 100644
--- a/CRM/UF/Form/Group.php
+++ b/CRM/UF/Form/Group.php
@@ -40,13 +40,6 @@ class CRM_UF_Form_Group extends CRM_Core_Form {
    */
   protected $entityFields = [];
 
-  /**
-   * Deletion message to be assigned to the form.
-   *
-   * @var string
-   */
-  protected $deleteMessage;
-
   /**
    * @var bool
    */
diff --git a/templates/CRM/Member/Form/Membership.tpl b/templates/CRM/Member/Form/Membership.tpl
index a7564b1520..7f8203b0a0 100644
--- a/templates/CRM/Member/Form/Membership.tpl
+++ b/templates/CRM/Member/Form/Membership.tpl
@@ -66,7 +66,7 @@
     {if $action eq 8}
     <div class="messages status no-popup">
       {icon icon="fa-info-circle"}{/icon}
-      {$deleteMessage}
+      {$deleteMessage|smarty:nodefaults}
     </div>
     {else}
       <table class="form-layout-compressed">
-- 
2.25.1