From e630b1bdb4e7f2a4fa9436c316ecd23949d3f503 Mon Sep 17 00:00:00 2001 From: Eileen McNaughton Date: Thu, 2 Mar 2023 08:48:57 +1300 Subject: [PATCH] Deprecations in Event, Membership Per https://github.com/civicrm/civicrm-core/pull/25677 --- CRM/Event/BAO/Event.php | 1 + CRM/Event/Form/ManageEvent/Delete.php | 2 +- CRM/Member/BAO/MembershipBlock.php | 2 ++ CRM/Member/BAO/MembershipPayment.php | 1 + CRM/Member/BAO/MembershipStatus.php | 1 + CRM/Member/BAO/MembershipType.php | 1 + CRM/Member/Form/MembershipBlock.php | 2 +- CRM/Member/Form/MembershipStatus.php | 2 +- CRM/Member/Form/MembershipType.php | 2 +- 9 files changed, 10 insertions(+), 4 deletions(-) diff --git a/CRM/Event/BAO/Event.php b/CRM/Event/BAO/Event.php index 23d26017fe..62c1a04389 100644 --- a/CRM/Event/BAO/Event.php +++ b/CRM/Event/BAO/Event.php @@ -172,6 +172,7 @@ class CRM_Event_BAO_Event extends CRM_Event_DAO_Event implements \Civi\Core\Hook * @deprecated */ public static function del($id) { + CRM_Core_Error::deprecatedFunctionWarning('deleteRecord'); return (bool) static::deleteRecord(['id' => $id]); } diff --git a/CRM/Event/Form/ManageEvent/Delete.php b/CRM/Event/Form/ManageEvent/Delete.php index 6260b2639a..8b6511aed7 100644 --- a/CRM/Event/Form/ManageEvent/Delete.php +++ b/CRM/Event/Form/ManageEvent/Delete.php @@ -81,7 +81,7 @@ class CRM_Event_Form_ManageEvent_Delete extends CRM_Event_Form_ManageEvent { ), ts('Deletion Error'), 'error'); return; } - CRM_Event_BAO_Event::del($this->_id); + CRM_Event_BAO_Event::deleteRecord(['id' => $this->_id]); if ($this->_isTemplate) { CRM_Core_Session::setStatus(ts("'%1' has been deleted.", [1 => $this->_title]), ts('Template Deleted'), 'success'); CRM_Utils_System::redirect(CRM_Utils_System::url('civicrm/admin/eventTemplate', 'reset=1')); diff --git a/CRM/Member/BAO/MembershipBlock.php b/CRM/Member/BAO/MembershipBlock.php index 6c208c9b4b..d89eae0d2a 100644 --- a/CRM/Member/BAO/MembershipBlock.php +++ b/CRM/Member/BAO/MembershipBlock.php @@ -24,6 +24,7 @@ class CRM_Member_BAO_MembershipBlock extends CRM_Member_DAO_MembershipBlock { * @return CRM_Member_DAO_MembershipBlock */ public static function create($params) { + CRM_Core_Error::deprecatedFunctionWarning('writeRecord'); return self::writeRecord($params); } @@ -35,6 +36,7 @@ class CRM_Member_BAO_MembershipBlock extends CRM_Member_DAO_MembershipBlock { * @return bool */ public static function del($id) { + CRM_Core_Error::deprecatedFunctionWarning('deleteRecord'); return (bool) self::deleteRecord(['id' => $id]); } diff --git a/CRM/Member/BAO/MembershipPayment.php b/CRM/Member/BAO/MembershipPayment.php index a87adb5f43..ae949586bd 100644 --- a/CRM/Member/BAO/MembershipPayment.php +++ b/CRM/Member/BAO/MembershipPayment.php @@ -81,6 +81,7 @@ class CRM_Member_BAO_MembershipPayment extends CRM_Member_DAO_MembershipPayment * @return bool */ public static function del($id) { + CRM_Core_Error::deprecatedFunctionWarning('deleteRecord'); return (bool) self::deleteRecord(['id' => $id]); } diff --git a/CRM/Member/BAO/MembershipStatus.php b/CRM/Member/BAO/MembershipStatus.php index 5f02f8c598..7c791d5812 100644 --- a/CRM/Member/BAO/MembershipStatus.php +++ b/CRM/Member/BAO/MembershipStatus.php @@ -151,6 +151,7 @@ class CRM_Member_BAO_MembershipStatus extends CRM_Member_DAO_MembershipStatus im * @throws CRM_Core_Exception */ public static function del($membershipStatusId) { + CRM_Core_Error::deprecatedFunctionWarning('deleteRecord'); static::deleteRecord(['id' => $membershipStatusId]); } diff --git a/CRM/Member/BAO/MembershipType.php b/CRM/Member/BAO/MembershipType.php index 59e52c960b..789eebe74d 100644 --- a/CRM/Member/BAO/MembershipType.php +++ b/CRM/Member/BAO/MembershipType.php @@ -123,6 +123,7 @@ class CRM_Member_BAO_MembershipType extends CRM_Member_DAO_MembershipType implem * @return bool */ public static function del($membershipTypeId) { + CRM_Core_Error::deprecatedFunctionWarning('deleteRecord'); try { static::deleteRecord(['id' => $membershipTypeId]); return TRUE; diff --git a/CRM/Member/Form/MembershipBlock.php b/CRM/Member/Form/MembershipBlock.php index a7a3abfac8..60ed1248bb 100644 --- a/CRM/Member/Form/MembershipBlock.php +++ b/CRM/Member/Form/MembershipBlock.php @@ -151,7 +151,7 @@ class CRM_Member_Form_MembershipBlock extends CRM_Contribute_Form_ContributionPa //CRM-15573 if (!empty($params['id'])) { $params['membership_types'] = serialize($membershipRequired); - CRM_Member_BAO_MembershipBlock::create($params); + CRM_Member_BAO_MembershipBlock::writeRecord($params); } $this->add('hidden', "mem_price_field_id", '', ['id' => "mem_price_field_id"]); $this->assign('is_recur', $isRecur); diff --git a/CRM/Member/Form/MembershipStatus.php b/CRM/Member/Form/MembershipStatus.php index 3791cbeaf3..967e81bfd2 100644 --- a/CRM/Member/Form/MembershipStatus.php +++ b/CRM/Member/Form/MembershipStatus.php @@ -150,7 +150,7 @@ class CRM_Member_Form_MembershipStatus extends CRM_Core_Form { public function postProcess() { if ($this->_action & CRM_Core_Action::DELETE) { try { - CRM_Member_BAO_MembershipStatus::del($this->_id); + CRM_Member_BAO_MembershipStatus::deleteRecord(['id' => $this->_id]); } catch (CRM_Core_Exception $e) { CRM_Core_Error::statusBounce($e->getMessage(), NULL, ts('Delete Failed')); diff --git a/CRM/Member/Form/MembershipType.php b/CRM/Member/Form/MembershipType.php index da1ee84059..686e2f36f9 100644 --- a/CRM/Member/Form/MembershipType.php +++ b/CRM/Member/Form/MembershipType.php @@ -383,7 +383,7 @@ class CRM_Member_Form_MembershipType extends CRM_Member_Form_MembershipConfig { public function postProcess() { if ($this->_action & CRM_Core_Action::DELETE) { try { - CRM_Member_BAO_MembershipType::del($this->_id); + CRM_Member_BAO_MembershipType::deleteRecord(['id' => $this->_id]); } catch (CRM_Core_Exception $e) { CRM_Core_Error::statusBounce($e->getMessage(), NULL, ts('Membership Type Not Deleted')); -- 2.25.1