From c4838b3d4231ef37f2fffca642ac36eb0a40caf2 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Wed, 10 Feb 2021 17:39:06 -0800
Subject: [PATCH] (REF) AfformSubmitEvent - Provide $afform, $formDataModel,
 and $apiRequest

---
 .../Civi/Afform/Event/AfformBaseEvent.php     | 43 +++++++++++++++++++
 .../Civi/Afform/Event/AfformSubmitEvent.php   | 14 ++++--
 .../core/Civi/Api4/Action/Afform/Submit.php   |  3 +-
 3 files changed, 54 insertions(+), 6 deletions(-)
 create mode 100644 ext/afform/core/Civi/Afform/Event/AfformBaseEvent.php

diff --git a/ext/afform/core/Civi/Afform/Event/AfformBaseEvent.php b/ext/afform/core/Civi/Afform/Event/AfformBaseEvent.php
new file mode 100644
index 0000000000..805cb5b4dd
--- /dev/null
+++ b/ext/afform/core/Civi/Afform/Event/AfformBaseEvent.php
@@ -0,0 +1,43 @@
+<?php
+namespace Civi\Afform\Event;
+
+use Symfony\Component\EventDispatcher\Event;
+
+class AfformBaseEvent extends Event {
+
+  /**
+   * @var array
+   *   The main 'Afform' record/configuration.
+   */
+  public $afform;
+
+  /**
+   * @var \Civi\Afform\FormDataModel
+   */
+  public $formDataModel;
+
+  /**
+   * @var \Civi\Api4\Generic\AbstractAction
+   */
+  public $apiRequest;
+
+  /**
+   * AfformBaseEvent constructor.
+   * @param array $afform
+   * @param \Civi\Afform\FormDataModel $formDataModel
+   * @param \Civi\Api4\Generic\AbstractAction $apiRequest
+   */
+  public function __construct(array $afform, \Civi\Afform\FormDataModel $formDataModel, \Civi\Api4\Generic\AbstractAction $apiRequest) {
+    $this->afform = $afform;
+    $this->formDataModel = $formDataModel;
+    $this->apiRequest = $apiRequest;
+  }
+
+  /**
+   * @return \Civi\Api4\Generic\AbstractAction
+   */
+  public function getApiRequest() {
+    return $this->apiRequest;
+  }
+
+}
diff --git a/ext/afform/core/Civi/Afform/Event/AfformSubmitEvent.php b/ext/afform/core/Civi/Afform/Event/AfformSubmitEvent.php
index 4eff408c40..88112fd873 100644
--- a/ext/afform/core/Civi/Afform/Event/AfformSubmitEvent.php
+++ b/ext/afform/core/Civi/Afform/Event/AfformSubmitEvent.php
@@ -1,7 +1,8 @@
 <?php
 namespace Civi\Afform\Event;
 
-use Symfony\Component\EventDispatcher\Event;
+use Civi\Afform\FormDataModel;
+use Civi\Api4\Action\Afform\Submit;
 
 /**
  * Class AfformSubmitEvent
@@ -15,7 +16,7 @@ use Symfony\Component\EventDispatcher\Event;
  * methods. For the moment, this is only expected to be used internally,
  * so KISS.
  */
-class AfformSubmitEvent extends Event {
+class AfformSubmitEvent extends AfformBaseEvent {
 
   /**
    * @var array
@@ -33,10 +34,15 @@ class AfformSubmitEvent extends Event {
 
   /**
    * AfformSubmitEvent constructor.
-   * @param $entityDefns
+   *
+   * @param array $afform
+   * @param \Civi\Afform\FormDataModel $formDataModel
+   * @param \Civi\Api4\Action\Afform\Submit $apiRequest
+   * @param array $entityDefns
    * @param array $entityValues
    */
-  public function __construct($entityDefns, array $entityValues) {
+  public function __construct(array $afform, FormDataModel $formDataModel, Submit $apiRequest, $entityDefns, array $entityValues) {
+    parent::__construct($afform, $formDataModel, $apiRequest);
     $this->entityDefns = $entityDefns;
     $this->entityValues = $entityValues;
   }
diff --git a/ext/afform/core/Civi/Api4/Action/Afform/Submit.php b/ext/afform/core/Civi/Api4/Action/Afform/Submit.php
index 1f6e3e754c..dda6a41739 100644
--- a/ext/afform/core/Civi/Api4/Action/Afform/Submit.php
+++ b/ext/afform/core/Civi/Api4/Action/Afform/Submit.php
@@ -32,8 +32,7 @@ class Submit extends AbstractProcessor {
         }
       }
     }
-
-    $event = new AfformSubmitEvent($this->_formDataModel->getEntities(), $entityValues);
+    $event = new AfformSubmitEvent($this->_afform, $this->_formDataModel, $this, $this->_formDataModel->getEntities(), $entityValues);
     \Civi::dispatcher()->dispatch(self::EVENT_NAME, $event);
     foreach ($event->entityValues as $entityType => $entities) {
       if (!empty($entities)) {
-- 
2.25.1