From 65c45021eff335e59854a86d2697f1ba7d742675 Mon Sep 17 00:00:00 2001 From: Coleman Watts Date: Mon, 14 Mar 2022 11:18:25 -0400 Subject: [PATCH] Rename SoftDeleteEntity -> SoftDeleteActionTrait The trait is used by actions, not by entities. --- Civi/Api4/Action/Contact/Delete.php | 2 +- .../{SoftDeleteEntity.php => SoftDeleteActionTrait.php} | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) rename Civi/Api4/Generic/Traits/{SoftDeleteEntity.php => SoftDeleteActionTrait.php} (88%) 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? -- 2.25.1