From 8b9698ed93875cefb1233c80463635d4645e0193 Mon Sep 17 00:00:00 2001
From: ebremner <ebremner@uwaterloo.ca>
Date: Wed, 24 Jun 2020 14:46:44 -0400
Subject: [PATCH] Updating code to use hook_event_dispatcher 2.x branch
---
layout_builder_ids.info.yml | 2 +-
.../LayoutBuilderIdsConfigureBlock.php | 11 +++++++----
.../LayoutBuilderIdsConfigureSection.php | 9 +++++----
3 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/layout_builder_ids.info.yml b/layout_builder_ids.info.yml
index da7479a..4517853 100644
--- a/layout_builder_ids.info.yml
+++ b/layout_builder_ids.info.yml
@@ -4,4 +4,4 @@ type: module
core_version_requirement: ^8.8 || ^9
dependencies:
- drupal:layout_builder
- - hook_event_dispatcher
+ - hook_event_dispatcher:core_event_dispatcher
diff --git a/src/EventSubscriber/LayoutBuilderIdsConfigureBlock.php b/src/EventSubscriber/LayoutBuilderIdsConfigureBlock.php
index 1c50164..b24e382 100644
--- a/src/EventSubscriber/LayoutBuilderIdsConfigureBlock.php
+++ b/src/EventSubscriber/LayoutBuilderIdsConfigureBlock.php
@@ -3,7 +3,9 @@
namespace Drupal\layout_builder_ids\EventSubscriber;
use Drupal\Core\Form\FormStateInterface;
-use Drupal\hook_event_dispatcher\Event\Form\FormAlterEvent;
+use Drupal\core_event_dispatcher\Event\Form\FormAlterEvent;
+use Drupal\core_event_dispatcher\Event\Form\FormBaseAlterEvent;
+use Drupal\core_event_dispatcher\Event\Form\FormIdAlterEvent;
use Drupal\hook_event_dispatcher\HookEventDispatcherInterface;
use Symfony\Component\EventDispatcher\EventSubscriberInterface;
use Drupal\Component\Utility\Html;
@@ -16,10 +18,10 @@ class LayoutBuilderIdsConfigureBlock implements EventSubscriberInterface {
/**
* Alter form.
*
- * @param \Drupal\hook_event_dispatcher\Event\Form\FormAlterEvent $event
+ * @param \Drupal\core_event_dispatcher\Event\Form\FormAlterEvent $event
* The event.
*/
- public function alterForm(FormAlterEvent $event) {
+ public function alterForm(FormAlterEvent $event): void {
// Get the form from the event.
$form = &$event->getForm();
@@ -67,7 +69,8 @@ class LayoutBuilderIdsConfigureBlock implements EventSubscriberInterface {
/**
* {@inheritdoc}
*/
- public static function getSubscribedEvents() {
+ public static function getSubscribedEvents(): array {
+
return [
HookEventDispatcherInterface::FORM_ALTER => 'alterForm',
];
diff --git a/src/EventSubscriber/LayoutBuilderIdsConfigureSection.php b/src/EventSubscriber/LayoutBuilderIdsConfigureSection.php
index 41a9ced..cf2cdec 100644
--- a/src/EventSubscriber/LayoutBuilderIdsConfigureSection.php
+++ b/src/EventSubscriber/LayoutBuilderIdsConfigureSection.php
@@ -3,10 +3,11 @@
namespace Drupal\layout_builder_ids\EventSubscriber;
use Drupal\Core\Form\FormStateInterface;
-use Drupal\hook_event_dispatcher\Event\Form\FormAlterEvent;
+use Drupal\core_event_dispatcher\Event\Form\FormAlterEvent;
+use Drupal\core_event_dispatcher\Event\Form\FormBaseAlterEvent;
+use Drupal\core_event_dispatcher\Event\Form\FormIdAlterEvent;
use Drupal\hook_event_dispatcher\HookEventDispatcherInterface;
use Symfony\Component\EventDispatcher\EventSubscriberInterface;
-use Symfony\Component\Routing\RouteCollection;
use Drupal\Component\Utility\Html;
@@ -18,10 +19,10 @@ class LayoutBuilderIdsConfigureSection implements EventSubscriberInterface {
/**
* Alter form.
*
- * @param \Drupal\hook_event_dispatcher\Event\Form\FormAlterEvent $event
+ * @param \Drupal\core_event_dispatcher\Event\Form\FormAlterEvent $event
* The event.
*/
- public function alterForm(FormAlterEvent $event) {
+ public function alterForm(FormAlterEvent $event): void {
// Get the form from the event.
$form = &$event->getForm();
--
GitLab