Skip to content
Snippets Groups Projects
Verified Commit 00fb6f97 authored by Stefan Auditor's avatar Stefan Auditor
Browse files

Revert "Issue #3305370 by Project Update Bot: Automated Drupal 10 compatibility fixes"

This reverts commit 0edbc3c6.
parent 4f16ed01
No related branches found
No related tags found
No related merge requests found
Pipeline #51655 failed
......@@ -5,6 +5,12 @@ namespace Drupal\webhooks\Event;
use Drupal\Component\EventDispatcher\Event;
use Drupal\webhooks\Entity\WebhookConfig;
use Drupal\webhooks\Webhook;
<<<<<<< HEAD
||||||| 0edbc3c (Issue #3305370 by Project Update Bot: Automated Drupal 10 compatibility fixes)
use Symfony\Contracts\EventDispatcher\Event;
=======
use Symfony\Component\EventDispatcher\Event;
>>>>>>> parent of 0edbc3c (Issue #3305370 by Project Update Bot: Automated Drupal 10 compatibility fixes)
/**
* Class Send Event.
......
......@@ -174,8 +174,8 @@ class WebhooksService implements WebhookDispatcherInterface, WebhookReceiverInte
// Dispatch Webhook Send event.
$this->eventDispatcher->dispatch(
new SendEvent($webhook_config, $webhook),
WebhookEvents::SEND
WebhookEvents::SEND,
new SendEvent($webhook_config, $webhook)
);
$body = $this->encode(
......@@ -202,8 +202,8 @@ class WebhooksService implements WebhookDispatcherInterface, WebhookReceiverInte
catch (\Exception $e) {
// Dispatch Webhook Send error event.
$this->eventDispatcher->dispatch(
new SendErrorEvent($webhook_config, $webhook, $e),
WebhookEvents::SEND_ERROR
WebhookEvents::SEND_ERROR,
new SendErrorEvent($webhook_config, $webhook, $e)
);
$this->logger->error(
......@@ -290,8 +290,8 @@ class WebhooksService implements WebhookDispatcherInterface, WebhookReceiverInte
else {
// Dispatch Webhook Receive event.
$this->eventDispatcher->dispatch(
new ReceiveEvent($webhook_config, $webhook),
WebhookEvents::RECEIVE
WebhookEvents::RECEIVE,
new ReceiveEvent($webhook_config, $webhook)
);
}
......
......@@ -36,7 +36,7 @@ class WebhooksTest extends BrowserTestBase {
/**
* {@inheritdoc}
*/
protected static $modules = ['webhooks', 'webhooks_test'];
public static $modules = ['webhooks', 'webhooks_test'];
/**
* {@inheritdoc}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment