Skip to content

Commit 6c5ffdb

Browse files
author
Sander
authored
Merge pull request #12 from sumocoders/update-six-two
Replace deprecated MessagehandlerInterface with new attrbute
2 parents 5c1eb0b + e004a6f commit 6c5ffdb

11 files changed

+34
-22
lines changed

config/services.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,6 @@ services:
2626
_defaults:
2727
autowire: true # Automatically injects dependencies in your services.
2828
autoconfigure: true # Automatically registers your services as commands, event subscribers, etc.
29-
bind:
30-
$from: '%mailer.default_sender_name% <%mailer.default_sender_email%>'
3129

3230
# makes classes in src/ available to be used as services
3331
# this creates a service per class whose id is the fully-qualified class name

src/MessageHandler/User/ChangePasswordHandler.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,11 @@
44

55
use App\Message\User\ChangePassword;
66
use App\Repository\User\UserRepository;
7-
use Symfony\Component\Messenger\Handler\MessageHandlerInterface;
7+
use Symfony\Component\Messenger\Attribute\AsMessageHandler;
88
use Symfony\Component\PasswordHasher\Hasher\UserPasswordHasherInterface;
99

10-
final class ChangePasswordHandler implements MessageHandlerInterface
10+
#[AsMessageHandler]
11+
final class ChangePasswordHandler
1112
{
1213
public function __construct(
1314
private readonly UserRepository $userRepository,

src/MessageHandler/User/ConfirmUserHandler.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,10 @@
44

55
use App\Message\User\ConfirmUser;
66
use App\Repository\User\UserRepository;
7-
use Symfony\Component\Messenger\Handler\MessageHandlerInterface;
7+
use Symfony\Component\Messenger\Attribute\AsMessageHandler;
88

9-
class ConfirmUserHandler implements MessageHandlerInterface
9+
#[AsMessageHandler]
10+
class ConfirmUserHandler
1011
{
1112
public function __construct(private readonly UserRepository $userRepository)
1213
{

src/MessageHandler/User/CreateUserHandler.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,11 @@
66
use App\Message\User\CreateUser;
77
use App\Message\User\SendConfirmation;
88
use App\Repository\User\UserRepository;
9-
use Symfony\Component\Messenger\Handler\MessageHandlerInterface;
9+
use Symfony\Component\Messenger\Attribute\AsMessageHandler;
1010
use Symfony\Component\Messenger\MessageBusInterface;
1111

12-
final class CreateUserHandler implements MessageHandlerInterface
12+
#[AsMessageHandler]
13+
final class CreateUserHandler
1314
{
1415
public function __construct(
1516
private readonly UserRepository $userRepository,

src/MessageHandler/User/DisableUserHandler.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,10 @@
44

55
use App\Message\User\DisableUser;
66
use App\Repository\User\UserRepository;
7-
use Symfony\Component\Messenger\Handler\MessageHandlerInterface;
7+
use Symfony\Component\Messenger\Attribute\AsMessageHandler;
88

9-
class DisableUserHandler implements MessageHandlerInterface
9+
#[AsMessageHandler]
10+
class DisableUserHandler
1011
{
1112
public function __construct(private readonly UserRepository $userRepository)
1213
{

src/MessageHandler/User/EnableUserHandler.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,10 @@
44

55
use App\Message\User\EnableUser;
66
use App\Repository\User\UserRepository;
7-
use Symfony\Component\Messenger\Handler\MessageHandlerInterface;
7+
use Symfony\Component\Messenger\Attribute\AsMessageHandler;
88

9-
class EnableUserHandler implements MessageHandlerInterface
9+
#[AsMessageHandler]
10+
class EnableUserHandler
1011
{
1112
public function __construct(private readonly UserRepository $userRepository)
1213
{

src/MessageHandler/User/RegisterUserHandler.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,12 @@
66
use App\Message\User\RegisterUser;
77
use App\Message\User\SendConfirmation;
88
use App\Repository\User\UserRepository;
9-
use Symfony\Component\Messenger\Handler\MessageHandlerInterface;
9+
use Symfony\Component\Messenger\Attribute\AsMessageHandler;
1010
use Symfony\Component\Messenger\MessageBusInterface;
1111
use Symfony\Component\PasswordHasher\Hasher\UserPasswordHasherInterface;
1212

13-
final class RegisterUserHandler implements MessageHandlerInterface
13+
#[AsMessageHandler]
14+
final class RegisterUserHandler
1415
{
1516
public function __construct(
1617
private readonly UserRepository $userRepository,

src/MessageHandler/User/ResetPasswordHandler.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,11 @@
44

55
use App\Message\User\ResetPassword;
66
use App\Repository\User\UserRepository;
7-
use Symfony\Component\Messenger\Handler\MessageHandlerInterface;
7+
use Symfony\Component\Messenger\Attribute\AsMessageHandler;
88
use Symfony\Component\PasswordHasher\Hasher\UserPasswordHasherInterface;
99

10-
final class ResetPasswordHandler implements MessageHandlerInterface
10+
#[AsMessageHandler]
11+
final class ResetPasswordHandler
1112
{
1213
public function __construct(
1314
private readonly UserRepository $userRepository,

src/MessageHandler/User/SendConfirmationHandler.php

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,15 @@
66
use App\Message\User\SendConfirmation;
77
use App\Repository\User\UserRepository;
88
use Symfony\Bridge\Twig\Mime\TemplatedEmail;
9+
use Symfony\Component\DependencyInjection\Attribute\Autowire;
910
use Symfony\Component\Mailer\MailerInterface;
10-
use Symfony\Component\Messenger\Handler\MessageHandlerInterface;
11+
use Symfony\Component\Messenger\Attribute\AsMessageHandler;
1112
use Symfony\Component\Mime\Address;
1213
use Symfony\Component\Routing\RouterInterface;
1314
use Symfony\Contracts\Translation\TranslatorInterface;
1415

15-
class SendConfirmationHandler implements MessageHandlerInterface
16+
#[AsMessageHandler]
17+
class SendConfirmationHandler
1618
{
1719
private readonly Address $from;
1820

@@ -21,6 +23,7 @@ public function __construct(
2123
private readonly TranslatorInterface $translator,
2224
private readonly RouterInterface $router,
2325
private readonly UserRepository $userRepository,
26+
#[Autowire('%mailer.default_sender_name% <%mailer.default_sender_email%>')]
2427
string $from
2528
) {
2629
$this->from = Address::create($from);

src/MessageHandler/User/SendPasswordResetHandler.php

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,15 @@
66
use App\Message\User\SendPasswordReset;
77
use App\Repository\User\UserRepository;
88
use Symfony\Bridge\Twig\Mime\TemplatedEmail;
9+
use Symfony\Component\DependencyInjection\Attribute\Autowire;
910
use Symfony\Component\Mailer\MailerInterface;
10-
use Symfony\Component\Messenger\Handler\MessageHandlerInterface;
11+
use Symfony\Component\Messenger\Attribute\AsMessageHandler;
1112
use Symfony\Component\Mime\Address;
1213
use Symfony\Component\Routing\RouterInterface;
1314
use Symfony\Contracts\Translation\TranslatorInterface;
1415

15-
class SendPasswordResetHandler implements MessageHandlerInterface
16+
#[AsMessageHandler]
17+
class SendPasswordResetHandler
1618
{
1719
private readonly Address $from;
1820

@@ -21,6 +23,7 @@ public function __construct(
2123
private readonly TranslatorInterface $translator,
2224
private readonly RouterInterface $router,
2325
private readonly UserRepository $userRepository,
26+
#[Autowire('%mailer.default_sender_name% <%mailer.default_sender_email%>')]
2427
string $from
2528
) {
2629
$this->from = Address::create($from);

0 commit comments

Comments
 (0)