Skip to content

Commit 4c18e77

Browse files
AntoineGonzalezPedroTroller
authored andcommitted
refactor: update and fix some issues for symfony 7
1 parent 3e024b4 commit 4c18e77

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

64 files changed

+196
-250
lines changed

composer.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,8 @@
5656
},
5757
"config": {
5858
"allow-plugins": {
59-
"symfony/*": true
59+
"symfony/*": true,
60+
"php-http/discovery": true
6061
},
6162
"optimize-autoloader": true,
6263
"preferred-install": {

config/services.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,6 @@ services:
1414
resource: '../src/Application/'
1515
exclude:
1616
- '../src/Application/DomainEventsHandler/'
17+
18+
Infrastructure\Doctrine\DataFixtures\:
19+
resource: '../src/Infrastructure/Doctrine/DataFixtures/**.php'

config/services/doctrine_event_listeners.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ services:
88
Infrastructure\Doctrine\EventListener\HashUserPasswordListener:
99
tags:
1010
- { name: doctrine.event_listener, event: prePersist }
11-
- { name: doctrine.event_listener, event: preUpdate }
11+
- { name: doctrine.event_listener, event: preUpdate }

config/services/domain_events.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
services:
33
_defaults:
44
autowire: true
5+
autoconfigure: true
56
public: false
67

78
Domain\EventsRegisterer: ~

config/services/use_cases.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ services:
88
Domain\UseCase\:
99
resource: '%kernel.project_dir%/src/Domain/UseCase/**/Handler.php'
1010
tags:
11-
- { name: messenger.message_handler, bus: command.bus }
11+
- { name: messenger.message_handler, bus: command.bus }

src/Application/Controller/AuthenticationController.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
final class AuthenticationController extends AbstractController
1919
{
2020
public function __construct(
21-
private UsersCollection $usersCollection,
22-
private CommandBus $commandBus
21+
private readonly UsersCollection $usersCollection,
22+
private readonly CommandBus $commandBus
2323
) {
2424
}
2525

src/Application/Controller/DinosaursController.php

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
use Application\MessageBus\CommandBus;
88
use Application\MessageBus\EventBus;
99
use Application\MessageBus\QueryBus;
10-
use Domain\Event\DinosaurIsBorn;
1110
use Domain\Exception\DinosaurNotFoundException;
1211
use Domain\Query\GetSingleDinosaur;
1312
use Domain\Query\GetAllDinosaurs;
@@ -23,9 +22,9 @@
2322
final class DinosaursController extends AbstractController
2423
{
2524
public function __construct(
26-
private CommandBus $commandBus,
27-
private QueryBus $queryBus,
28-
private EventBus $eventBus
25+
private readonly CommandBus $commandBus,
26+
private readonly QueryBus $queryBus,
27+
private readonly EventBus $eventBus
2928
) {
3029
}
3130

src/Application/Controller/SpeciesController.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
final class SpeciesController extends AbstractController
2323
{
2424
public function __construct(
25-
private CommandBus $commandBus,
26-
private QueryBus $queryBus
25+
private readonly CommandBus $commandBus,
26+
private readonly QueryBus $queryBus
2727
) {
2828
}
2929

src/Application/DomainEventsHandler/LogWhenDinosaurDied.php

Lines changed: 7 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -5,31 +5,22 @@
55
namespace Application\DomainEventsHandler;
66

77
use Domain\Event\DinosaurDied;
8-
use Domain\Event\EventInterface;
98
use Psr\Log\LoggerInterface;
10-
use Symfony\Component\Messenger\Handler\MessageSubscriberInterface;
9+
use Symfony\Component\Messenger\Attribute\AsMessageHandler;
1110

12-
class LogWhenDinosaurDied implements MessageSubscriberInterface
11+
#[AsMessageHandler]
12+
final class LogWhenDinosaurDied
1313
{
1414
public function __construct(
15-
private LoggerInterface $logger
15+
private readonly LoggerInterface $logger,
1616
) {
1717
}
1818

19-
public function __invoke(EventInterface $event): void
19+
public function __invoke(DinosaurDied $event): void
2020
{
21-
if (!$event instanceof DinosaurDied) {
22-
return;
23-
}
24-
25-
$this->logger->info(sprintf(
21+
$this->logger->info(\sprintf(
2622
'Dinosaur %s died',
27-
$event->getDinosaurName()
23+
$event->dinosaurName
2824
));
2925
}
30-
31-
public static function getHandledMessages(): iterable
32-
{
33-
yield DinosaurDied::class;
34-
}
3526
}

src/Application/DomainEventsHandler/LogWhenDinosaurIsBorn.php

Lines changed: 7 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -6,38 +6,27 @@
66

77
use Domain\Collection\DinosaursCollection;
88
use Domain\Event\DinosaurIsBorn;
9-
use Domain\Event\EventInterface;
10-
use Domain\Exception\DinosaurNotFoundException;
11-
use Domain\Model\Dinosaur;
129
use Psr\Log\LoggerInterface;
13-
use Symfony\Component\Messenger\Handler\MessageSubscriberInterface;
10+
use Symfony\Component\Messenger\Attribute\AsMessageHandler;
1411

15-
class LogWhenDinosaurIsBorn implements MessageSubscriberInterface
12+
#[AsMessageHandler]
13+
final class LogWhenDinosaurIsBorn
1614
{
1715
public function __construct(
18-
private DinosaursCollection $dinosaursCollection,
19-
private LoggerInterface $logger
16+
private readonly DinosaursCollection $dinosaursCollection,
17+
private readonly LoggerInterface $logger
2018
) {
2119
}
2220

23-
public function __invoke(EventInterface $event): void
21+
public function __invoke(DinosaurIsBorn $event): void
2422
{
2523
$dinosaurId = $event->getAggregateRootId();
2624

2725
$dinosaur = $this->dinosaursCollection->find($dinosaurId);
2826

29-
if (!$dinosaur instanceof Dinosaur) {
30-
throw new DinosaurNotFoundException($dinosaurId);
31-
}
32-
33-
$this->logger->info(sprintf(
27+
$this->logger->info(\sprintf(
3428
'Dinosaur %s was born',
3529
$dinosaur->getName()
3630
));
3731
}
38-
39-
public static function getHandledMessages(): iterable
40-
{
41-
yield DinosaurIsBorn::class;
42-
}
4332
}

0 commit comments

Comments
 (0)