ManagedEntities - Always delete managed record when deleting an entity

This uses hooks to ensure managed records are always cleared out when an entity is deleted.
Fixes OptionValue::delete which was previously not calling hooks.

CRM/Core/BAO/Managed.php

@@ -0,0 +1,46 @@
+<?php
+/*
+ +--------------------------------------------------------------------+
+ | Copyright CiviCRM LLC. All rights reserved.                        |
+ |                                                                    |
+ | This work is published under the GNU AGPLv3 license with some      |
+ | permitted exceptions and without any warranty. For full license    |
+ | and copyright information, see https://civicrm.org/licensing       |
+ +--------------------------------------------------------------------+
+ */
+
+/**
+ *
+ * @package CRM
+ * @copyright CiviCRM LLC https://civicrm.org/licensing
+ */
+
+/**
+ * This class contains functions for managed entities.
+ */
+class CRM_Core_BAO_Managed extends CRM_Core_DAO_Managed implements Civi\Test\HookInterface {
+
+  /**
+   * Callback for hook_civicrm_post().
+   * @param \Civi\Core\Event\PostEvent $event
+   */
+  public static function on_hook_civicrm_post(\Civi\Core\Event\PostEvent $event) {
+    // When an entity is deleted, delete the corresponding Managed record
+    if ($event->action === 'delete' && $event->id && $event->entity !== 'Managed') {
+      $entityName = [$event->entity];
+      // Legacy support for strangely-named v3 entities
+      if ($event->entity === 'OptionValue') {
+        $entityName[] = 'CustomSearch';
+        $entityName[] = 'ActivityType';
+      }
+      if (in_array($event->entity, ['Individual', 'Household', 'Organization'], TRUE)) {
+        $entityName[] = 'Contact';
+      }
+      \Civi\Api4\Managed::delete(FALSE)
+        ->addWhere('entity_type', 'IN', $entityName)
+        ->addWhere('entity_id', '=', $event->id)
+        ->execute();
+    }
+  }
+
+}

CRM/Core/BAO/OptionValue.php

@@ -264,9 +264,12 @@ public static function del($optionValueId) {
     if (!$optionValue->find()) {
       return FALSE;
     }
+    $hookParams = ['id' => $optionValueId];
+    CRM_Utils_Hook::pre('delete', 'OptionValue', $optionValueId, $hookParams);
     if (self::updateRecords($optionValueId, CRM_Core_Action::DELETE)) {
       CRM_Core_PseudoConstant::flush();
       $optionValue->delete();
+      CRM_Utils_Hook::post('delete', 'OptionValue', $optionValueId, $optionValue);
       return TRUE;
     }
     return FALSE;

CRM/Core/ManagedEntities.php

@@ -445,7 +445,7 @@ protected function removeStaleEntity($dao) {
         'id' => $dao->entity_id,
       ];
       $check = civicrm_api3($dao->entity_type, 'get', $params);
-      if ((bool) $check['count']) {
+      if ($check['count']) {
         $result = civicrm_api($dao->entity_type, 'delete', $params);
         if ($result['is_error']) {
           if (isset($dao->name)) {
@@ -454,9 +454,6 @@ protected function removeStaleEntity($dao) {
           $this->onApiError($dao->entity_type, 'delete', $params, $result);
         }
       }
-      CRM_Core_DAO::executeQuery('DELETE FROM civicrm_managed WHERE id = %1', [
-        1 => [$dao->id, 'Integer'],
-      ]);
     }
   }
 

tests/phpunit/CRM/Core/ManagedEntitiesTest.php

@@ -263,8 +263,8 @@ public function testRemoveDeclaration_CleanupNever(): void {
 
   /**
    * Set up an active module with one managed-entity using the
-   * policy "cleanup=>never". When the managed-entity goes away,
-   * ensure that the policy is followed (ie the entity is not
+   * policy "cleanup=>unused". When the managed-entity goes away,
+   * ensure that the policy is followed (ie the entity is conditionally
    * deleted).
    *
    * @throws \CRM_Core_Exception