Merge pull request #21836 from eileenmcnaughton/hook_toke

Fix hookTokens to be clearable outside the class
civicrm · Oct 15, 2021 · 5b6ef63 · 5b6ef63
2 parents 0f0fc39 + 15ed06b
commit 5b6ef63
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 18 deletions.
diff --git a/CRM/Contact/Tokens.php b/CRM/Contact/Tokens.php
@@ -32,13 +32,6 @@ protected function getApiEntityName(): string {
     return 'Contact';
   }
 
-  /**
-   * Tokens defined by the legacy hook.
-   *
-   * @var array
-   */
-  protected $hookTokens;
-
   /**
    * @inheritDoc
    */
@@ -249,7 +242,7 @@ protected function getRelatedEntityTokenMetadata(): array {
    */
   public function evaluateLegacyHookTokens(TokenValueEvent $e): void {
     $messageTokens = $e->getTokenProcessor()->getMessageTokens();
-    if (!array_intersect(array_keys($this->getHookTokens()), array_keys($messageTokens))) {
+    if (empty($messageTokens) || !array_intersect(array_keys($this->getHookTokens()), array_keys($messageTokens))) {
       return;
     }
 
@@ -694,17 +687,13 @@ protected function getBespokeTokens(): array {
    * @return array
    */
   protected function getHookTokens(): array {
-    if ($this->hookTokens === NULL) {
-      if (isset(Civi::$statics[__CLASS__]['hook_tokens'])) {
-        $this->hookTokens = Civi::$statics[__CLASS__]['hook_tokens'];
-      }
-      else {
-        $this->hookTokens = [];
-        \CRM_Utils_Hook::tokens($this->hookTokens);
-        Civi::$statics[__CLASS__]['hook_tokens'] = $this->hookTokens;
-      }
+    if (isset(Civi::$statics[__CLASS__]['hook_tokens'])) {
+      return Civi::$statics[__CLASS__]['hook_tokens'];
     }
-    return $this->hookTokens;
+    $tokens = [];
+    \CRM_Utils_Hook::tokens($tokens);
+    Civi::$statics[__CLASS__]['hook_tokens'] = $tokens;
+    return $tokens;
   }
 
 }
diff --git a/CRM/Utils/Hook/UnitTests.php b/CRM/Utils/Hook/UnitTests.php
@@ -55,6 +55,9 @@ public function setMock($mockObject): void {
    */
   public function setHook(string $hook, $callable): void {
     $this->adhocHooks[$hook] = $callable;
+    if (strpos($hook, 'token') !== FALSE) {
+      unset(Civi::$statics['CRM_Contact_Tokens']['hook_tokens']);
+    }
   }
 
   /**