From 6b513daf2316811c7db4408286f7b8f26e44d9d6 Mon Sep 17 00:00:00 2001
From: Eileen McNaughton <emcnaughton@wikimedia.org>
Date: Wed, 1 Mar 2023 11:31:22 +1300
Subject: [PATCH] Address portions of deprecated code replacement

---
 CRM/Core/BAO/Address.php | 6 ++++--
 CRM/Core/BAO/Block.php   | 4 ++--
 CRM/Core/BAO/Email.php   | 1 +
 CRM/Core/BAO/IM.php      | 1 +
 CRM/Core/BAO/Phone.php   | 1 +
 CRM/Core/BAO/Website.php | 4 +++-
 6 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/CRM/Core/BAO/Address.php b/CRM/Core/BAO/Address.php
index 122d3375ce..004922b0d3 100644
--- a/CRM/Core/BAO/Address.php
+++ b/CRM/Core/BAO/Address.php
@@ -15,6 +15,8 @@
  * @copyright CiviCRM LLC https://civicrm.org/licensing
  */
 
+use Civi\Api4\Address;
+
 /**
  * This is class to handle address related functions.
  */
@@ -1208,6 +1210,7 @@ SELECT is_primary,
    * @return bool
    */
   public static function del($id) {
+    CRM_Core_Error::deprecatedFunctionWarning('deleteRecord');
     return (bool) self::deleteRecord(['id' => $id]);
   }
 
@@ -1358,8 +1361,7 @@ SELECT is_primary,
       // BUT info is not present at this time, and therefore we should be really careful when deleting the block.
       // $updateBlankLocInfo will help take appropriate decision. CRM-5969
       if (isset($value['id']) && !$addressExists && $updateBlankLocInfo) {
-        //delete the existing record
-        CRM_Core_BAO_Block::blockDelete('Address', ['id' => $value['id']]);
+        Address::delete(FALSE)->addWhere('id', '=', $value['id'])->execute();
         continue;
       }
       elseif (!$addressExists) {
diff --git a/CRM/Core/BAO/Block.php b/CRM/Core/BAO/Block.php
index 9ad00682c2..506e951576 100644
--- a/CRM/Core/BAO/Block.php
+++ b/CRM/Core/BAO/Block.php
@@ -264,7 +264,7 @@ class CRM_Core_BAO_Block {
       // $updateBlankLocInfo will help take appropriate decision. CRM-5969
       if (!empty($value['id']) && !$dataExists && $updateBlankLocInfo) {
         //delete the existing record
-        $baoString::del($value['id']);
+        $baoString::deleteRecord($value);
         continue;
       }
       elseif (!$dataExists) {
@@ -307,7 +307,7 @@ class CRM_Core_BAO_Block {
     }
 
     $baoString = 'CRM_Core_BAO_' . $name;
-    $baoString::del($params['id']);
+    $baoString::deleteRecord($params);
   }
 
   /**
diff --git a/CRM/Core/BAO/Email.php b/CRM/Core/BAO/Email.php
index 0f5ce64671..e7e4eb9a1d 100644
--- a/CRM/Core/BAO/Email.php
+++ b/CRM/Core/BAO/Email.php
@@ -355,6 +355,7 @@ AND    reset_date IS NULL
    * @return bool
    */
   public static function del($id) {
+    CRM_Core_Error::deprecatedFunctionWarning('deleteRecord');
     return (bool) self::deleteRecord(['id' => $id]);
   }
 
diff --git a/CRM/Core/BAO/IM.php b/CRM/Core/BAO/IM.php
index a410e91274..b1a916c374 100644
--- a/CRM/Core/BAO/IM.php
+++ b/CRM/Core/BAO/IM.php
@@ -163,6 +163,7 @@ ORDER BY cim.is_primary DESC, im_id ASC ";
    * @return bool
    */
   public static function del($id) {
+    CRM_Core_Error::deprecatedFunctionWarning('deleteRecord');
     return (bool) self::deleteRecord(['id' => $id]);
   }
 
diff --git a/CRM/Core/BAO/Phone.php b/CRM/Core/BAO/Phone.php
index 3ed91d733b..cf095fa29a 100644
--- a/CRM/Core/BAO/Phone.php
+++ b/CRM/Core/BAO/Phone.php
@@ -236,6 +236,7 @@ ORDER BY ph.is_primary DESC, phone_id ASC ";
    * @return bool
    */
   public static function del($id) {
+    CRM_Core_Error::deprecatedFunctionWarning('deleteRecord');
     return (bool) self::deleteRecord(['id' => $id]);
   }
 
diff --git a/CRM/Core/BAO/Website.php b/CRM/Core/BAO/Website.php
index aafd8e8a51..14c740d694 100644
--- a/CRM/Core/BAO/Website.php
+++ b/CRM/Core/BAO/Website.php
@@ -31,6 +31,7 @@ class CRM_Core_BAO_Website extends CRM_Core_DAO_Website {
    * @throws \CRM_Core_Exception
    */
   public static function create($params) {
+    CRM_Core_Error::deprecatedFunctionWarning('writeRecord');
     return self::writeRecord($params);
   }
 
@@ -81,7 +82,7 @@ class CRM_Core_BAO_Website extends CRM_Core_DAO_Website {
       }
       if (!empty($values['url'])) {
         $values['contact_id'] = $contactID;
-        self::create($values);
+        self::writeRecord($values);
       }
       elseif ($skipDelete && !empty($values['id'])) {
         static::deleteRecord($values);
@@ -99,6 +100,7 @@ class CRM_Core_BAO_Website extends CRM_Core_DAO_Website {
    * @deprecated
    */
   public static function del($id) {
+    CRM_Core_Error::deprecatedFunctionWarning('deleteRecord');
     return (bool) static::deleteRecord(['id' => $id]);
   }
 
-- 
2.25.1