From 07a1bc45aebc3e3b30188cb6245a08d67ca4b5ca Mon Sep 17 00:00:00 2001
From: Ahed <ahed@compucorp.co.uk>
Date: Tue, 8 Jun 2021 15:48:57 +0300
Subject: [PATCH] dev/core#1744 - Simplify afform event naming

---
 ext/afform/core/Civi/Api4/Action/Afform/Submit.php | 5 ++++-
 ext/afform/core/afform.php                         | 5 ++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/ext/afform/core/Civi/Api4/Action/Afform/Submit.php b/ext/afform/core/Civi/Api4/Action/Afform/Submit.php
index 17818184be83..c33cb29bb470 100644
--- a/ext/afform/core/Civi/Api4/Action/Afform/Submit.php
+++ b/ext/afform/core/Civi/Api4/Action/Afform/Submit.php
@@ -10,6 +10,9 @@
  */
 class Submit extends AbstractProcessor {
 
+  /**
+   * @deprecated - You may simply use the event name directly. dev/core#1744
+   */
   const EVENT_NAME = 'civi.afform.submit';
 
   /**
@@ -53,7 +56,7 @@ protected function processForm() {
       $records = $this->replaceReferences($entityName, $entityValues[$entityName]);
       $this->fillIdFields($records, $entityName);
       $event = new AfformSubmitEvent($this->_afform, $this->_formDataModel, $this, $records, $entityType, $entityName, $this->_entityIds);
-      \Civi::dispatcher()->dispatch(self::EVENT_NAME, $event);
+      \Civi::dispatcher()->dispatch('civi.afform.submit', $event);
     }
 
     // What should I return?
diff --git a/ext/afform/core/afform.php b/ext/afform/core/afform.php
index c568e0af1369..a4e3bd27a5cb 100644
--- a/ext/afform/core/afform.php
+++ b/ext/afform/core/afform.php
@@ -2,7 +2,6 @@
 
 require_once 'afform.civix.php';
 use CRM_Afform_ExtensionUtil as E;
-use Civi\Api4\Action\Afform\Submit;
 
 /**
  * Filter the content of $params to only have supported afform fields.
@@ -50,8 +49,8 @@ function afform_civicrm_config(&$config) {
   Civi::$statics[__FUNCTION__] = 1;
 
   $dispatcher = Civi::dispatcher();
-  $dispatcher->addListener(Submit::EVENT_NAME, [Submit::class, 'processGenericEntity'], 0);
-  $dispatcher->addListener(Submit::EVENT_NAME, [Submit::class, 'preprocessContact'], 10);
+  $dispatcher->addListener('civi.afform.submit', ['\Civi\Api4\Action\Afform\Submit', 'processGenericEntity'], 0);
+  $dispatcher->addListener('civi.afform.submit', ['\Civi\Api4\Action\Afform\Submit', 'preprocessContact'], 10);
   $dispatcher->addListener('hook_civicrm_angularModules', ['\Civi\Afform\AngularDependencyMapper', 'autoReq'], -1000);
   $dispatcher->addListener('hook_civicrm_alterAngular', ['\Civi\Afform\AfformMetadataInjector', 'preprocess']);
   $dispatcher->addListener('hook_civicrm_check', ['\Civi\Afform\StatusChecks', 'hook_civicrm_check']);