Skip to content

Commit bdc1962

Browse files
authored
chore(deprecations): fix symfony deprecations (#5289)
* [Chore] Remove deprecated MessageHandlerInterface from tests * [Chore] Replace deprecated ArgumentValueResolverInterface, supports logic now needs to be in resolve as well * [Chore] Swap loose mode with html5 mode
1 parent 263a3d4 commit bdc1962

File tree

6 files changed

+19
-11
lines changed

6 files changed

+19
-11
lines changed

src/Symfony/Bundle/ArgumentResolver/PayloadArgumentResolver.php

+6-2
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@
1818
use ApiPlatform\Util\OperationRequestInitiatorTrait;
1919
use ApiPlatform\Util\RequestAttributesExtractor;
2020
use Symfony\Component\HttpFoundation\Request;
21-
use Symfony\Component\HttpKernel\Controller\ArgumentValueResolverInterface;
21+
use Symfony\Component\HttpKernel\Controller\ValueResolverInterface;
2222
use Symfony\Component\HttpKernel\ControllerMetadata\ArgumentMetadata;
2323

24-
final class PayloadArgumentResolver implements ArgumentValueResolverInterface
24+
final class PayloadArgumentResolver implements ValueResolverInterface
2525
{
2626
use OperationRequestInitiatorTrait;
2727

@@ -59,6 +59,10 @@ public function supports(Request $request, ArgumentMetadata $argument): bool
5959

6060
public function resolve(Request $request, ArgumentMetadata $argument): \Generator
6161
{
62+
if (!$this->supports($request, $argument)) {
63+
yield [];
64+
}
65+
6266
yield $request->attributes->get('data');
6367
}
6468

tests/Fixtures/TestBundle/MessageHandler/PasswordResetRequestHandler.php

+3-2
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,10 @@
1616
use ApiPlatform\Tests\Fixtures\TestBundle\Dto\PasswordResetRequest;
1717
use ApiPlatform\Tests\Fixtures\TestBundle\Dto\PasswordResetRequestResult;
1818
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
19-
use Symfony\Component\Messenger\Handler\MessageHandlerInterface;
19+
use Symfony\Component\Messenger\Attribute\AsMessageHandler;
2020

21-
class PasswordResetRequestHandler implements MessageHandlerInterface
21+
#[AsMessageHandler]
22+
class PasswordResetRequestHandler
2223
{
2324
public function __invoke(PasswordResetRequest $passwordResetRequest): PasswordResetRequestResult
2425
{

tests/Fixtures/TestBundle/MessengerHandler/Document/MessengerWithInputHandler.php

+3-2
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,10 @@
1515

1616
use ApiPlatform\Tests\Fixtures\TestBundle\Document\MessengerWithInput;
1717
use ApiPlatform\Tests\Fixtures\TestBundle\Dto\MessengerInput;
18-
use Symfony\Component\Messenger\Handler\MessageHandlerInterface;
18+
use Symfony\Component\Messenger\Attribute\AsMessageHandler;
1919

20-
class MessengerWithInputHandler implements MessageHandlerInterface
20+
#[AsMessageHandler]
21+
class MessengerWithInputHandler
2122
{
2223
public function __invoke(MessengerInput $data): MessengerWithInput
2324
{

tests/Fixtures/TestBundle/MessengerHandler/Entity/MessengerWithInputHandler.php

+3-2
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,10 @@
1515

1616
use ApiPlatform\Tests\Fixtures\TestBundle\Dto\MessengerInput;
1717
use ApiPlatform\Tests\Fixtures\TestBundle\Entity\MessengerWithInput;
18-
use Symfony\Component\Messenger\Handler\MessageHandlerInterface;
18+
use Symfony\Component\Messenger\Attribute\AsMessageHandler;
1919

20-
class MessengerWithInputHandler implements MessageHandlerInterface
20+
#[AsMessageHandler]
21+
class MessengerWithInputHandler
2122
{
2223
public function __invoke(MessengerInput $data): MessengerWithInput
2324
{

tests/Fixtures/TestBundle/MessengerHandler/MessengerWithResponseHandler.php

+3-2
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,10 @@
1515

1616
use ApiPlatform\Tests\Fixtures\TestBundle\Dto\MessengerResponseInput;
1717
use Symfony\Component\HttpFoundation\Response;
18-
use Symfony\Component\Messenger\Handler\MessageHandlerInterface;
18+
use Symfony\Component\Messenger\Attribute\AsMessageHandler;
1919

20-
class MessengerWithResponseHandler implements MessageHandlerInterface
20+
#[AsMessageHandler]
21+
class MessengerWithResponseHandler
2122
{
2223
public function __invoke(MessengerResponseInput $data): Response
2324
{

tests/Symfony/Validator/Metadata/Property/Restriction/PropertySchemaCollectionRestrictionTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ public function createProvider(): \Generator
8585
'email' => [
8686
new NotNull(),
8787
new Length(['min' => 2, 'max' => 255]),
88-
new Email(['mode' => Email::VALIDATION_MODE_LOOSE]),
88+
new Email(['mode' => Email::VALIDATION_MODE_HTML5]),
8989
],
9090
'phone' => new Optional([
9191
new Type(['type' => 'string']),

0 commit comments

Comments
 (0)