From: Coleman Watts <coleman@civicrm.org>
Date: Mon, 14 Mar 2022 15:18:25 +0000 (-0400)
Subject: Rename SoftDeleteEntity -> SoftDeleteActionTrait
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=65c45021eff335e59854a86d2697f1ba7d742675;p=civicrm-core.git

Rename SoftDeleteEntity -> SoftDeleteActionTrait

The trait is used by actions, not by entities.
---

diff --git a/Civi/Api4/Action/Contact/Delete.php b/Civi/Api4/Action/Contact/Delete.php
index 158e9dce33..2bc03ba4c1 100644
--- a/Civi/Api4/Action/Contact/Delete.php
+++ b/Civi/Api4/Action/Contact/Delete.php
@@ -17,7 +17,7 @@ namespace Civi\Api4\Action\Contact;
  * @inheritDoc
  */
 class Delete extends \Civi\Api4\Generic\DAODeleteAction {
-  use \Civi\Api4\Generic\Traits\SoftDeleteEntity;
+  use \Civi\Api4\Generic\Traits\SoftDeleteActionTrait;
 
   /**
    * @param $items
diff --git a/Civi/Api4/Generic/Traits/SoftDeleteEntity.php b/Civi/Api4/Generic/Traits/SoftDeleteActionTrait.php
similarity index 88%
rename from Civi/Api4/Generic/Traits/SoftDeleteEntity.php
rename to Civi/Api4/Generic/Traits/SoftDeleteActionTrait.php
index 4ddb288487..3db6838afe 100644
--- a/Civi/Api4/Generic/Traits/SoftDeleteEntity.php
+++ b/Civi/Api4/Generic/Traits/SoftDeleteActionTrait.php
@@ -12,11 +12,11 @@
 namespace Civi\Api4\Generic\Traits;
 
 /**
- * This trait is used by entities with a "move to trash" option.
+ * This trait is used by delete actions with a "move to trash" option.
  * @method $this setUseTrash(bool $useTrash) Pass FALSE to force delete and bypass trash
  * @method bool getUseTrash()
  */
-trait SoftDeleteEntity {
+trait SoftDeleteActionTrait {
 
   /**
    * Should $ENTITY be moved to the trash instead of permanently deleted?