Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
webhooks
Manage
Activity
Members
Labels
Plan
Wiki
Custom issue tracker
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Model registry
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
project
webhooks
Commits
00fb6f97
Verified
Commit
00fb6f97
authored
Nov 17, 2023
by
Stefan Auditor
Browse files
Options
Downloads
Patches
Plain Diff
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
Nov 17, 2023
Stage: build
Stage: validate
Stage: test
Changes
3
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
src/Event/SendErrorEvent.php
+6
-0
6 additions, 0 deletions
src/Event/SendErrorEvent.php
src/WebhooksService.php
+6
-6
6 additions, 6 deletions
src/WebhooksService.php
tests/src/Functional/WebhooksTest.php
+1
-1
1 addition, 1 deletion
tests/src/Functional/WebhooksTest.php
with
13 additions
and
7 deletions
src/Event/SendErrorEvent.php
+
6
−
0
View file @
00fb6f97
...
...
@@ -5,6 +5,12 @@ namespace Drupal\webhooks\Event;
use
Drupal\Component\EventDispatcher\Event
;
use
Drupal\webhooks\Entity\WebhookConfig
;
use
Drupal\webhooks\Webhook
;
<<<<<<<
HEAD
|||||||
0
edbc3c
(
Issue
#3305370 by Project Update Bot: Automated Drupal 10 compatibility fixes)
use
Symfony\Contracts\EventDispatcher\Event
;
=======
use
Symfony\Component\EventDispatcher\Event
;
>>>>>>>
parent
of
0
edbc3c
(
Issue
#3305370 by Project Update Bot: Automated Drupal 10 compatibility fixes)
/**
* Class Send Event.
...
...
This diff is collapsed.
Click to expand it.
src/WebhooksService.php
+
6
−
6
View file @
00fb6f97
...
...
@@ -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
)
);
}
...
...
This diff is collapsed.
Click to expand it.
tests/src/Functional/WebhooksTest.php
+
1
−
1
View file @
00fb6f97
...
...
@@ -36,7 +36,7 @@ class WebhooksTest extends BrowserTestBase {
/**
* {@inheritdoc}
*/
p
rotected
static
$modules
=
[
'webhooks'
,
'webhooks_test'
];
p
ublic
static
$modules
=
[
'webhooks'
,
'webhooks_test'
];
/**
* {@inheritdoc}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment