From 78ce6ebbbf1410d55f70b2603a7c853b527403d0 Mon Sep 17 00:00:00 2001
From: Eileen McNaughton <emcnaughton@wikimedia.org>
Date: Wed, 8 Sep 2021 14:10:28 +1200
Subject: [PATCH] dev/core#2823 Extract code to load the declarations and call
 from the constructor

The declarations are only used in object context so it makes sense to load
them in the constructor. In addition they are ALWAYS loaded except in test usage
(it does seem a bit silly having the option to pass them in only for tests
but we can ignore that for now - I commented it)
---
 CRM/Core/ManagedEntities.php | 28 +++++++++++++++++-----------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/CRM/Core/ManagedEntities.php b/CRM/Core/ManagedEntities.php
index 0d77755664..b7d44b35a6 100644
--- a/CRM/Core/ManagedEntities.php
+++ b/CRM/Core/ManagedEntities.php
@@ -64,7 +64,8 @@ class CRM_Core_ManagedEntities {
    * @param array $modules
    *   CRM_Core_Module.
    * @param array $declarations
-   *   Per hook_civicrm_managed.
+   *   Per hook_civicrm_managed. Only ever passed in in unit tests - otherwise
+   *   calculated.
    */
   public function __construct($modules, $declarations) {
     $this->moduleIndex = $this->createModuleIndex($modules);
@@ -73,7 +74,7 @@ class CRM_Core_ManagedEntities {
       $this->declarations = $this->cleanDeclarations($declarations);
     }
     else {
-      $this->declarations = NULL;
+      $this->loadDeclarations();
     }
   }
 
@@ -379,15 +380,6 @@ class CRM_Core_ManagedEntities {
    * @return array|null
    */
   protected function getDeclarations() {
-    if ($this->declarations === NULL) {
-      $this->declarations = [];
-      foreach (CRM_Core_Component::getEnabledComponents() as $component) {
-        /** @var CRM_Core_Component_Info $component */
-        $this->declarations = array_merge($this->declarations, $component->getManagedEntities());
-      }
-      CRM_Utils_Hook::managed($this->declarations);
-      $this->declarations = $this->cleanDeclarations($this->declarations);
-    }
     return $this->declarations;
   }
 
@@ -537,4 +529,18 @@ class CRM_Core_ManagedEntities {
     return Civi::$statics[__CLASS__][__FUNCTION__][$entity_type];
   }
 
+  /**
+   * Load declarations into the class property.
+   *
+   * This picks it up from hooks and enabled components.
+   */
+  protected function loadDeclarations(): void {
+    $this->declarations = [];
+    foreach (CRM_Core_Component::getEnabledComponents() as $component) {
+      $this->declarations = array_merge($this->declarations, $component->getManagedEntities());
+    }
+    CRM_Utils_Hook::managed($this->declarations);
+    $this->declarations = $this->cleanDeclarations($this->declarations);
+  }
+
 }
-- 
2.25.1