From 016aae2817f607b4b30c0863bf876307d6c0b96b Mon Sep 17 00:00:00 2001 From: Eileen McNaughton Date: Thu, 9 Mar 2023 13:20:41 +1300 Subject: [PATCH] More deprecations --- CRM/Admin/Form/MessageTemplates.php | 3 ++- CRM/Admin/Form/PaymentProcessor.php | 2 +- CRM/Core/BAO/Extension.php | 1 + CRM/Core/BAO/Job.php | 1 + CRM/Core/BAO/MessageTemplate.php | 8 +------- CRM/Core/BAO/Note.php | 2 +- CRM/Core/BAO/OptionGroup.php | 1 + CRM/Core/BAO/OptionValue.php | 1 + CRM/Core/BAO/RecurringEntity.php | 1 + CRM/Core/BAO/Tag.php | 1 + CRM/Financial/BAO/PaymentProcessor.php | 4 +--- 11 files changed, 12 insertions(+), 13 deletions(-) diff --git a/CRM/Admin/Form/MessageTemplates.php b/CRM/Admin/Form/MessageTemplates.php index d4be6aaa9b..b38f1ff5a2 100644 --- a/CRM/Admin/Form/MessageTemplates.php +++ b/CRM/Admin/Form/MessageTemplates.php @@ -272,7 +272,8 @@ class CRM_Admin_Form_MessageTemplates extends CRM_Core_Form { */ public function postProcess() { if ($this->_action & CRM_Core_Action::DELETE) { - CRM_Core_BAO_MessageTemplate::del($this->_id); + CRM_Core_BAO_MessageTemplate::deleteRecord(['id' => $this->_id]); + CRM_Core_Session::setStatus(ts('Selected message template has been deleted.'), ts('Deleted'), 'success'); $this->postProcessHook(); } diff --git a/CRM/Admin/Form/PaymentProcessor.php b/CRM/Admin/Form/PaymentProcessor.php index 014727e76b..1e04b95497 100644 --- a/CRM/Admin/Form/PaymentProcessor.php +++ b/CRM/Admin/Form/PaymentProcessor.php @@ -407,7 +407,7 @@ class CRM_Admin_Form_PaymentProcessor extends CRM_Admin_Form { public function postProcess() { if ($this->_action & CRM_Core_Action::DELETE) { - CRM_Financial_BAO_PaymentProcessor::del($this->_id); + CRM_Financial_BAO_PaymentProcessor::deleteRecord(['id' => $this->_id]); CRM_Core_Session::setStatus("", ts('Payment Processor Deleted.'), "success"); return NULL; } diff --git a/CRM/Core/BAO/Extension.php b/CRM/Core/BAO/Extension.php index 351db0f8b1..4bb87024ed 100644 --- a/CRM/Core/BAO/Extension.php +++ b/CRM/Core/BAO/Extension.php @@ -48,6 +48,7 @@ class CRM_Core_BAO_Extension extends CRM_Core_DAO_Extension { * @deprecated */ public static function del($id) { + CRM_Core_Error::deprecatedFunctionWarning('deleteRecord'); return (bool) static::deleteRecord(['id' => $id]); } diff --git a/CRM/Core/BAO/Job.php b/CRM/Core/BAO/Job.php index aecf92d79d..c8c849d381 100644 --- a/CRM/Core/BAO/Job.php +++ b/CRM/Core/BAO/Job.php @@ -76,6 +76,7 @@ class CRM_Core_BAO_Job extends CRM_Core_DAO_Job { * @throws CRM_Core_Exception */ public static function del($jobID) { + CRM_Core_Error::deprecatedFunctionWarning('deleteRecord'); self::deleteRecord(['id' => $jobID]); return TRUE; } diff --git a/CRM/Core/BAO/MessageTemplate.php b/CRM/Core/BAO/MessageTemplate.php index 12fe6914c7..be77c649dd 100644 --- a/CRM/Core/BAO/MessageTemplate.php +++ b/CRM/Core/BAO/MessageTemplate.php @@ -165,14 +165,8 @@ class CRM_Core_BAO_MessageTemplate extends CRM_Core_DAO_MessageTemplate implemen * @throws \CRM_Core_Exception */ public static function del($messageTemplatesID) { - // make sure messageTemplatesID is an integer - if (!CRM_Utils_Rule::positiveInteger($messageTemplatesID)) { - throw new CRM_Core_Exception(ts('Invalid Message template')); - } - + CRM_Core_Error::deprecatedFunctionWarning('deleteRecord'); static::deleteRecord(['id' => $messageTemplatesID]); - // Yikes - bad idea setting status messages in BAO CRUD functions. Don't do this. - CRM_Core_Session::setStatus(ts('Selected message template has been deleted.'), ts('Deleted'), 'success'); } /** diff --git a/CRM/Core/BAO/Note.php b/CRM/Core/BAO/Note.php index b8abef965f..f2eb16f1b6 100644 --- a/CRM/Core/BAO/Note.php +++ b/CRM/Core/BAO/Note.php @@ -276,7 +276,7 @@ class CRM_Core_BAO_Note extends CRM_Core_DAO_Note implements \Civi\Core\HookInte * @return int */ public static function del($id) { - // CRM_Core_Error::deprecatedFunctionWarning('deleteRecord'); + CRM_Core_Error::deprecatedFunctionWarning('deleteRecord'); self::deleteRecord(['id' => $id]); return 1; diff --git a/CRM/Core/BAO/OptionGroup.php b/CRM/Core/BAO/OptionGroup.php index c7de6d7eea..ff28aacc77 100644 --- a/CRM/Core/BAO/OptionGroup.php +++ b/CRM/Core/BAO/OptionGroup.php @@ -82,6 +82,7 @@ class CRM_Core_BAO_OptionGroup extends CRM_Core_DAO_OptionGroup implements \Civi * @param int $optionGroupId */ public static function del($optionGroupId) { + CRM_Core_Error::deprecatedFunctionWarning('deleteRecord'); static::deleteRecord(['id' => $optionGroupId]); } diff --git a/CRM/Core/BAO/OptionValue.php b/CRM/Core/BAO/OptionValue.php index aeff6e50a4..cd9c7e0fd9 100644 --- a/CRM/Core/BAO/OptionValue.php +++ b/CRM/Core/BAO/OptionValue.php @@ -230,6 +230,7 @@ class CRM_Core_BAO_OptionValue extends CRM_Core_DAO_OptionValue implements \Civi * @deprecated */ public static function del($optionValueId) { + CRM_Core_Error::deprecatedFunctionWarning('deleteRecord'); return (bool) static::deleteRecord(['id' => $optionValueId]); } diff --git a/CRM/Core/BAO/RecurringEntity.php b/CRM/Core/BAO/RecurringEntity.php index 5e3e4c2d4b..c34c25bdaf 100644 --- a/CRM/Core/BAO/RecurringEntity.php +++ b/CRM/Core/BAO/RecurringEntity.php @@ -149,6 +149,7 @@ class CRM_Core_BAO_RecurringEntity extends CRM_Core_DAO_RecurringEntity implemen * @return CRM_Core_DAO_RecurringEntity */ public static function add($params) { + CRM_Core_Error::deprecatedFunctionWarning('writeRecord'); return self::writeRecord($params); } diff --git a/CRM/Core/BAO/Tag.php b/CRM/Core/BAO/Tag.php index e2c8422f19..7991e8cb73 100644 --- a/CRM/Core/BAO/Tag.php +++ b/CRM/Core/BAO/Tag.php @@ -350,6 +350,7 @@ class CRM_Core_BAO_Tag extends CRM_Core_DAO_Tag { * @return bool */ public static function del($id) { + CRM_Core_Error::deprecatedFunctionWarning('deleteRecord'); return (bool) static::deleteRecord(['id' => $id]); } diff --git a/CRM/Financial/BAO/PaymentProcessor.php b/CRM/Financial/BAO/PaymentProcessor.php index 99ad17f8cf..d15066d9ce 100644 --- a/CRM/Financial/BAO/PaymentProcessor.php +++ b/CRM/Financial/BAO/PaymentProcessor.php @@ -180,9 +180,7 @@ class CRM_Financial_BAO_PaymentProcessor extends CRM_Financial_DAO_PaymentProces * @deprecated */ public static function del($paymentProcessorID) { - if (!$paymentProcessorID) { - throw new CRM_Core_Exception(ts('Invalid value passed to delete function.')); - } + CRM_Core_Error::deprecatedFunctionWarning('deleteRecord'); static::deleteRecord(['id' => $paymentProcessorID]); } -- 2.25.1