Skip to content

Commit 890bd38

Browse files
authored
chore: remove compatibility layer in AbstractSecurityUser (#4867)
1 parent 338ea0f commit 890bd38

File tree

4 files changed

+6
-39
lines changed

4 files changed

+6
-39
lines changed

phpstan.neon.dist

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ parameters:
2828
- src/Symfony/Bundle/Test/Constraint/ArraySubsetLegacy.php
2929
# Imported code (temporary)
3030
- src/Symfony/Bundle/Test/BrowserKitAssertionsTrait.php
31-
- tests/Fixtures/TestBundle/Security/AbstractSecurityUser.php
3231
# Templates for Maker
3332
- src/Symfony/Maker/Resources/skeleton
3433
earlyTerminatingMethodCalls:

tests/Fixtures/TestBundle/Document/User.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,9 @@
2323
use ApiPlatform\Tests\Fixtures\TestBundle\Dto\PasswordResetRequestResult;
2424
use ApiPlatform\Tests\Fixtures\TestBundle\Dto\RecoverPasswordInput;
2525
use ApiPlatform\Tests\Fixtures\TestBundle\Dto\RecoverPasswordOutput;
26-
use ApiPlatform\Tests\Fixtures\TestBundle\Security\AbstractSecurityUser;
2726
use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM;
27+
use Symfony\Component\Security\Core\User\PasswordAuthenticatedUserInterface;
28+
use Symfony\Component\Security\Core\User\UserInterface;
2829
use Symfony\Component\Serializer\Annotation\Groups;
2930

3031
/**
@@ -35,7 +36,7 @@
3536
*/
3637
#[ApiResource(operations: [new Get(), new Put(), new Delete(), new Put(input: RecoverPasswordInput::class, output: RecoverPasswordOutput::class, uriTemplate: 'users/recover/{id}'), new Post(), new GetCollection(), new Post(uriTemplate: '/users/password_reset_request', messenger: 'input', input: PasswordResetRequest::class, output: PasswordResetRequestResult::class, normalizationContext: ['groups' => ['user_password_reset_request']], denormalizationContext: ['groups' => ['user_password_reset_request']])], normalizationContext: ['groups' => ['user', 'user-read']], denormalizationContext: ['groups' => ['user', 'user-write']])]
3738
#[ODM\Document(collection: 'user_test')]
38-
class User extends AbstractSecurityUser
39+
class User implements UserInterface, PasswordAuthenticatedUserInterface
3940
{
4041
#[ODM\Id(strategy: 'INCREMENT', type: 'int')]
4142
protected ?int $id = null;

tests/Fixtures/TestBundle/Entity/User.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,10 @@
2323
use ApiPlatform\Tests\Fixtures\TestBundle\Dto\PasswordResetRequestResult;
2424
use ApiPlatform\Tests\Fixtures\TestBundle\Dto\RecoverPasswordInput;
2525
use ApiPlatform\Tests\Fixtures\TestBundle\Dto\RecoverPasswordOutput;
26-
use ApiPlatform\Tests\Fixtures\TestBundle\Security\AbstractSecurityUser;
2726
use ApiPlatform\Tests\Fixtures\TestBundle\State\RecoverPasswordProcessor;
2827
use Doctrine\ORM\Mapping as ORM;
28+
use Symfony\Component\Security\Core\User\PasswordAuthenticatedUserInterface;
29+
use Symfony\Component\Security\Core\User\UserInterface;
2930
use Symfony\Component\Serializer\Annotation\Groups;
3031

3132
/**
@@ -52,7 +53,7 @@
5253
], normalizationContext: ['groups' => ['user', 'user-read']], denormalizationContext: ['groups' => ['user', 'user-write']])]
5354
#[ORM\Entity]
5455
#[ORM\Table(name: 'user_test')]
55-
class User extends AbstractSecurityUser
56+
class User implements UserInterface, PasswordAuthenticatedUserInterface
5657
{
5758
#[ORM\Id]
5859
#[ORM\Column(type: 'integer')]

tests/Fixtures/TestBundle/Security/AbstractSecurityUser.php

Lines changed: 0 additions & 34 deletions
This file was deleted.

0 commit comments

Comments
 (0)