Skip to content

Commit 55a82cd

Browse files
committed
Test for 6.2 and next as 6.3
1 parent 8f44f74 commit 55a82cd

File tree

7 files changed

+29
-22
lines changed

7 files changed

+29
-22
lines changed

.github/workflows/ci.yml

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -50,12 +50,13 @@ jobs:
5050
php:
5151
- '8.1'
5252
symfony:
53-
- '^6.1'
53+
- '6.1'
54+
- '6.2'
5455
experimental:
5556
- false
5657
include:
5758
- php: '8.1'
58-
symfony: '^6.1'
59+
symfony: '6.2'
5960
experimental: false
6061
coverage: true
6162
fail-fast: false
@@ -143,12 +144,13 @@ jobs:
143144
php:
144145
- '8.1'
145146
symfony:
146-
- '^6.1'
147+
- '6.1'
148+
- '6.2'
147149
experimental:
148150
- false
149151
include:
150152
- php: '8.1'
151-
symfony: '^6.1'
153+
symfony: '6.2'
152154
experimental: false
153155
coverage: true
154156
fail-fast: false
@@ -331,7 +333,7 @@ jobs:
331333
php:
332334
- '8.1'
333335
symfony:
334-
- '6.2'
336+
- '6.3'
335337
fail-fast: false
336338
timeout-minutes: 20
337339
steps:
@@ -404,7 +406,7 @@ jobs:
404406
php:
405407
- '8.1'
406408
symfony:
407-
- '6.2'
409+
- '6.3'
408410
fail-fast: false
409411
timeout-minutes: 20
410412
steps:

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@
120120
}
121121
},
122122
"minimum-stability": "dev",
123-
"prefer-stable": false,
123+
"prefer-stable": true,
124124
"extra": {
125125
"symfony": {
126126
"allow-contrib": false,

features/bootstrap/ProfilerContext.php

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,6 @@
3232
use Symfony\Component\HttpClient\DataCollector\HttpClientDataCollector;
3333
use Symfony\Component\HttpKernel\Profiler\Profile as HttpProfile;
3434
use Symfony\Component\Mailer\DataCollector\MessageDataCollector;
35-
use Symfony\Component\Mailer\DelayedEnvelope;
36-
use Symfony\Component\Mailer\Event\MessageEvents;
3735
use Symfony\Component\Mercure\Update;
3836
use Symfony\Component\Mime\Header\Headers;
3937
use Symfony\Component\VarDumper\Cloner\Data;
@@ -204,14 +202,17 @@ public function iShouldGetAnEmail(string $emailType, string $emailAddress = 'use
204202
/** @var MessageDataCollector $collector */
205203
$collector = $this->getProfile()->getCollector('mailer');
206204

207-
$events = $collector->getEvents()->getEvents();
208205
/** @var TemplatedEmail[] $messages */
209-
$messages = [];
210-
foreach ($events as $event) {
211-
if (!$event->isQueued()) {
212-
$messages[] = $event->getMessage();
213-
}
214-
}
206+
$messages = $collector->getEvents()->getMessages();
207+
208+
// $events = $collector->getEvents()->getEvents();
209+
// /** @var TemplatedEmail[] $messages */
210+
// $messages = [];
211+
// foreach ($events as $event) {
212+
// if (!$event->isQueued()) {
213+
// $messages[] = $event->getMessage();
214+
// }
215+
// }
215216

216217
Assert::assertCount(1, $messages);
217218
Assert::assertInstanceOf(TemplatedEmail::class, $email = $messages[0]);

tests/Functional/app/config/bundles.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,5 +28,6 @@
2828
Nelmio\CorsBundle\NelmioCorsBundle::class => ['all' => true],
2929
Cocur\Slugify\Bridge\Symfony\CocurSlugifyBundle::class => ['all' => true],
3030
FriendsOfBehat\SymfonyExtension\Bundle\FriendsOfBehatSymfonyExtensionBundle::class => ['test' => true],
31+
Silverback\ApiComponentsBundle\Tests\Functional\TestBundle\TestBundle::class => ['test' => true],
3132
Symfony\Bundle\MercureBundle\MercureBundle::class => ['all' => true],
3233
];
Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
framework:
22
mailer:
33
dsn: '%env(MAILER_DSN)%'
4-
# message_bus: messenger.bus.default
5-
message_bus: ~
4+
message_bus: messenger.bus.default

tests/Functional/app/config/packages/messenger.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ framework:
44
buses:
55
messenger.bus.default:
66
default_middleware: allow_no_handlers
7-
# transports:
8-
# async_priority_normal: 'in-memory://'
9-
# routing:
10-
# 'Symfony\Component\Mailer\Messenger\SendEmailMessage': async_priority_normal
7+
transports:
8+
async_priority_normal: 'in-memory://?serialize=true'
9+
routing:
10+
'Symfony\Component\Mailer\Messenger\SendEmailMessage': async_priority_normal

tests/Functional/app/config/services_test.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,5 +29,9 @@ services:
2929
arguments:
3030
$factory: '@mercure.hub.default.jwt.factory'
3131

32+
# ->set('messenger.transport.in_memory.factory', InMemoryTransportFactory::class)
33+
# ->tag('messenger.transport_factory')
34+
# ->tag('kernel.reset', ['method' => 'reset'])
35+
3236
# Test service to provide responses to the mock http client
3337
Silverback\ApiComponentsBundle\Tests\Functional\MockClientCallback: ~

0 commit comments

Comments
 (0)