From feb043b3a5ea4b8f164e5fbc524046ce86b3a741 Mon Sep 17 00:00:00 2001
From: puresyntax71 <34715246+puresyntax71@users.noreply.github.com>
Date: Sun, 28 Jun 2026 05:34:21 +0800
Subject: [PATCH] Allow autotagging of subscribers when implementing.

---
 src/CivicrmEventSubscriberInterface.php | 10 ++++++++++
 src/CivicrmServiceProvider.php          | 11 ++++++++++-
 2 files changed, 20 insertions(+), 1 deletion(-)
 create mode 100644 src/CivicrmEventSubscriberInterface.php

diff --git a/src/CivicrmEventSubscriberInterface.php b/src/CivicrmEventSubscriberInterface.php
new file mode 100644
index 0000000..b81cfee
--- /dev/null
+++ b/src/CivicrmEventSubscriberInterface.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace Drupal\civicrm;
+
+use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+
+/**
+ * Interface for use with CiviCRM related events.
+ */
+interface CivicrmEventSubscriberInterface extends EventSubscriberInterface {}
diff --git a/src/CivicrmServiceProvider.php b/src/CivicrmServiceProvider.php
index 7d09b30..802c11d 100644
--- a/src/CivicrmServiceProvider.php
+++ b/src/CivicrmServiceProvider.php
@@ -13,6 +13,7 @@
  * tagged "civicrm.event_subscriber" and hands their IDs to the registrar, which
  * attaches them to \Civi::dispatcher() once CiviCRM has booted.
  *
+ * @see \Drupal\civicrm\CivicrmEventSubscriberInterface
  * @see \Drupal\civicrm\EventSubscriberRegistrar
  * @see civicrm_civicrm_config()
  */
@@ -21,7 +22,15 @@ class CivicrmServiceProvider extends ServiceProviderBase {
   /**
    * {@inheritdoc}
    */
-  public function alter(ContainerBuilder $container) {
+  public function register(ContainerBuilder $container): void {
+    $container->registerForAutoconfiguration(CivicrmEventSubscriberInterface::class)
+      ->addTag('civicrm.event_subscriber');
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function alter(ContainerBuilder $container): void {
     if (!$container->hasDefinition('civicrm.event_subscriber_registrar')) {
       return;
     }