From 6f47b6a6af25d168bd3bd93f08a6a29516b2f547 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kasper=20Garn=C3=A6s?=
<21994-kasperg@users.noreply.drupalcode.org>
Date: Tue, 22 Aug 2023 07:45:59 +0000
Subject: [PATCH] 3289208: Updated for Drupal 10 compatibility
---
queue_stats.info.yml | 2 +-
src/Event/QueueItemEvent.php | 2 +-
src/MonitoredQueue.php | 6 +++---
src/Plugin/QueueStatisticManager.php | 2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/queue_stats.info.yml b/queue_stats.info.yml
index cc2a781..c21bca9 100644
--- a/queue_stats.info.yml
+++ b/queue_stats.info.yml
@@ -1,6 +1,6 @@
name: 'Queue Statistics'
type: module
description: 'Calculate statistics about queues'
-core_version_requirement: ^8 || ^9
+core_version_requirement: ^8 || ^9 || ^10
package: 'Queues'
configure: 'queue_stats.admin_form'
diff --git a/src/Event/QueueItemEvent.php b/src/Event/QueueItemEvent.php
index a7920f5..2261c78 100644
--- a/src/Event/QueueItemEvent.php
+++ b/src/Event/QueueItemEvent.php
@@ -2,8 +2,8 @@
namespace Drupal\queue_stats\Event;
+use Symfony\Contracts\EventDispatcher\Event;
use Drupal\queue_stats\MonitoredQueueInterface;
-use Symfony\Component\EventDispatcher\Event;
/**
* Queue item event class.
diff --git a/src/MonitoredQueue.php b/src/MonitoredQueue.php
index 3df5f7a..27296af 100644
--- a/src/MonitoredQueue.php
+++ b/src/MonitoredQueue.php
@@ -70,7 +70,7 @@ class MonitoredQueue implements MonitoredQueueInterface, QueueInterface, QueueGa
*/
public function deleteItem($item) {
$event = new QueueItemEvent(QueueItemEvent::PROCESSING_COMPLETED, $this, $item, $this->time->getCurrentMicroTime());
- $this->dispatcher->dispatch($event->getName(), $event);
+ $this->dispatcher->dispatch($event, $event->getName());
$this->queue->deleteItem($item);
}
@@ -82,7 +82,7 @@ class MonitoredQueue implements MonitoredQueueInterface, QueueInterface, QueueGa
$item = $this->queue->claimItem($lease_time);
if ($item !== FALSE) {
$event = new QueueItemEvent(QueueItemEvent::PROCESSING_STARTED, $this, $item, $this->time->getCurrentMicroTime());
- $this->dispatcher->dispatch($event->getName(), $event);
+ $this->dispatcher->dispatch($event, $event->getName());
}
return $item;
}
@@ -108,7 +108,7 @@ class MonitoredQueue implements MonitoredQueueInterface, QueueInterface, QueueGa
$released = $this->queue->releaseItem($item);
if ($released) {
$event = new QueueItemEvent(QueueItemEvent::PROCESSING_ABORTED, $this, $item, $this->time->getCurrentMicroTime());
- $this->dispatcher->dispatch($event->getName(), $event);
+ $this->dispatcher->dispatch($event, $event->getName());
}
return $released;
}
diff --git a/src/Plugin/QueueStatisticManager.php b/src/Plugin/QueueStatisticManager.php
index 5943031..c33fdf1 100644
--- a/src/Plugin/QueueStatisticManager.php
+++ b/src/Plugin/QueueStatisticManager.php
@@ -119,7 +119,7 @@ class QueueStatisticManager extends DefaultPluginManager implements EventSubscri
* Queue event.
*/
public function onEvent(QueueItemEvent $event) {
- $this->eventDispatcher->dispatch($event->getName(), $event);
+ $this->eventDispatcher->dispatch($event, $event->getName());
}
/**
--
GitLab