From c95fbf9b3979abbf018eaf0c051a310df1cdacc6 Mon Sep 17 00:00:00 2001
From: Seamus Lee <seamuslee001@gmail.com>
Date: Mon, 28 Jun 2021 09:23:52 +1000
Subject: [PATCH] [REF] Alter new Setup process to use CiviCRM's Event
 Dispatcher

Apply patch from Tim to limit what events are dispatched
---
 setup/src/Setup.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/setup/src/Setup.php b/setup/src/Setup.php
index 04dd426b2b..5503ae709e 100644
--- a/setup/src/Setup.php
+++ b/setup/src/Setup.php
@@ -12,7 +12,7 @@ use Civi\Setup\Event\UninstallDatabaseEvent;
 use Civi\Setup\Event\UninstallFilesEvent;
 use Civi\Setup\Exception\InitException;
 use Psr\Log\NullLogger;
-use Symfony\Component\EventDispatcher\EventDispatcher;
+use Civi\Core\CiviEventDispatcher;
 
 class Setup {
 
@@ -70,7 +70,8 @@ class Setup {
     self::$instance = new Setup();
     self::$instance->model = new \Civi\Setup\Model();
     self::$instance->model->setValues($modelValues);
-    self::$instance->dispatcher = new EventDispatcher();
+    self::$instance->dispatcher = new CiviEventDispatcher();
+    self::$instance->dispatcher->setDispatchPolicy(['/^civi\.setup\./' => 'run', '/./' => 'fail']);
     self::$instance->log = $log ? $log : new NullLogger();
 
     $pluginDir = dirname(__DIR__) . '/plugins';
-- 
2.25.1