Skip to content

Commit d7e9ba5

Browse files
BacLucBacLuc
authored
Merge pull request #7825 from BacLuc/continue-rector
chore(api): run rector again
2 parents 0f64970 + d919296 commit d7e9ba5

Some content is hidden

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

46 files changed

+198
-192
lines changed

‎api/rector.php‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
use Rector\Privatization\Rector\Class_\FinalizeTestCaseClassRector;
2020
use Rector\Renaming\Rector\FuncCall\RenameFunctionRector;
2121
use Rector\Strict\Rector\Empty_\DisallowedEmptyRuleFixerRector;
22+
use Rector\Symfony\Symfony73\Rector\Class_\ConstraintOptionsToNamedArgumentsRector;
2223
use Rector\TypeDeclaration\Rector\StmtsAwareInterface\DeclareStrictTypesRector;
2324

2425
// @noinspection PhpUnhandledExceptionInspection
@@ -42,6 +43,7 @@
4243
AddInstanceofAssertForNullableInstanceRector::class,
4344
AssertEmptyNullableObjectToAssertInstanceofRector::class,
4445
CombineIfRector::class,
46+
ConstraintOptionsToNamedArgumentsRector::class,
4547
DeclareStrictTypesRector::class,
4648
DisallowedEmptyRuleFixerRector::class,
4749
ExplicitBoolCompareRector::class,

‎api/src/DTO/Invitation.php‎

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -21,35 +21,36 @@
2121
#[ApiResource(
2222
operations: [
2323
new Get(
24-
provider: InvitationProvider::class,
25-
uriTemplate: '/invitations/{inviteKey}/find{._format}', // TO DISCUSS: Wouldn't '/{inviteKey}{._format}' be more REST-like
24+
// TO DISCUSS: Wouldn't '/{inviteKey}{._format}' be more REST-like
25+
uriTemplate: '/invitations/{inviteKey}/find{._format}',
26+
openapi: new OpenApiOperation(description: 'Use myInviteKey to find an invitation in the dev environment.'),
2627
normalizationContext: self::ITEM_NORMALIZATION_CONTEXT,
27-
openapi: new OpenApiOperation(description: 'Use myInviteKey to find an invitation in the dev environment.')
28+
provider: InvitationProvider::class
2829
),
2930
new Patch(
30-
provider: InvitationProvider::class,
31-
processor: InvitationAcceptProcessor::class,
32-
output: Invitation::class,
33-
security: 'is_authenticated()',
3431
uriTemplate: '/invitations/{inviteKey}/'.self::ACCEPT.'{._format}',
35-
denormalizationContext: ['groups' => ['write']],
36-
normalizationContext: self::ITEM_NORMALIZATION_CONTEXT,
3732
openapi: new OpenApiOperation(summary: 'Accept an Invitation.', description: 'Use myInviteKey2 to accept an invitation in dev environment.'),
38-
validationContext: ['groups' => ['Default', 'accept']]
33+
normalizationContext: self::ITEM_NORMALIZATION_CONTEXT,
34+
denormalizationContext: ['groups' => ['write']],
35+
security: 'is_authenticated()',
36+
validationContext: ['groups' => ['Default', 'accept']],
37+
output: Invitation::class,
38+
provider: InvitationProvider::class,
39+
processor: InvitationAcceptProcessor::class
3940
),
4041
new Patch(
41-
provider: InvitationProvider::class,
42-
processor: InvitationRejectProcessor::class,
43-
output: Invitation::class,
4442
uriTemplate: '/invitations/{inviteKey}/'.self::REJECT.'{._format}',
45-
denormalizationContext: ['groups' => ['write']],
43+
openapi: new OpenApiOperation(summary: 'Reject an Invitation.', description: 'Use myInviteKey to reject an invitation in dev environment.'),
4644
normalizationContext: self::ITEM_NORMALIZATION_CONTEXT,
47-
openapi: new OpenApiOperation(summary: 'Reject an Invitation.', description: 'Use myInviteKey to reject an invitation in dev environment.')
45+
denormalizationContext: ['groups' => ['write']],
46+
output: Invitation::class,
47+
provider: InvitationProvider::class,
48+
processor: InvitationRejectProcessor::class
4849
),
4950
new GetCollection(
50-
provider: InvitationProvider::class,
51+
openapi: false,
5152
security: 'false',
52-
openapi: false
53+
provider: InvitationProvider::class
5354
),
5455
],
5556
)]

‎api/src/DTO/ResetPassword.php‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,26 +18,26 @@
1818
#[ApiResource(
1919
operations: [
2020
new Get(
21-
provider: ResetPasswordProvider::class,
2221
uriTemplate: '/reset_password/{id}{._format}', // TO DISCUSS: default uri would be /reset_password (plural). Shall we keep or fix?
2322
security: 'true',
23+
provider: ResetPasswordProvider::class,
2424
),
2525
new Patch(
26-
provider: ResetPasswordProvider::class,
27-
processor: ResetPasswordUpdateProcessor::class,
2826
uriTemplate: '/reset_password/{id}{._format}',
27+
denormalizationContext: ['groups' => ['update']],
2928
security: 'true',
30-
denormalizationContext: ['groups' => ['update']]
29+
provider: ResetPasswordProvider::class,
30+
processor: ResetPasswordUpdateProcessor::class
3131
),
3232
new Post(
33-
processor: ResetPasswordCreateProcessor::class,
3433
uriTemplate: '/reset_password{._format}',
35-
security: 'true',
3634
status: 204,
37-
output: false,
38-
denormalizationContext: ['groups' => ['create']],
35+
openapi: new OpenApiOperation(summary: 'Request Password-Reset-Mail', description: 'Password-Reset-Link will be sent to the given email'),
3936
normalizationContext: ['groups' => ['read']],
40-
openapi: new OpenApiOperation(summary: 'Request Password-Reset-Mail', description: 'Password-Reset-Link will be sent to the given email')
37+
denormalizationContext: ['groups' => ['create']],
38+
security: 'true',
39+
output: false,
40+
processor: ResetPasswordCreateProcessor::class
4141
),
4242
],
4343
routePrefix: '/auth'

‎api/src/DTO/UserActivation.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@
1313
#[ApiResource(
1414
operations: [
1515
new Post(
16-
processor: ResendActivationProcessor::class,
1716
uriTemplate: '/resend_activation{._format}',
18-
security: 'true',
1917
status: 204,
20-
output: false,
18+
openapi: new OpenApiOperation(summary: 'Request activation email again', description: 'Activation email will be sent to the given email again.'),
2119
denormalizationContext: ['groups' => ['create']],
22-
openapi: new OpenApiOperation(summary: 'Request activation email again', description: 'Activation email will be sent to the given email again.')
20+
security: 'true',
21+
output: false,
22+
processor: ResendActivationProcessor::class
2323
),
2424
],
2525
routePrefix: '/auth'

‎api/src/DTO/ValidationError.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@ public function __construct(
1515
private readonly string $type = 'about:blank',
1616
) {
1717
parent::__construct(
18-
type: $this->type,
1918
title: $this->title,
20-
status: $this->status,
2119
detail: $this->detail,
20+
status: $this->status,
2221
instance: $this->instance,
22+
type: $this->type,
2323
);
2424
}
2525

‎api/src/Entity/Activity.php‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@
4141
validationContext: ['groups' => ['Default', 'update']]
4242
),
4343
new Delete(
44-
processor: ActivityRemoveProcessor::class,
45-
security: 'is_granted("CAMP_MEMBER", object) or is_granted("CAMP_MANAGER", object)'
44+
security: 'is_granted("CAMP_MEMBER", object) or is_granted("CAMP_MANAGER", object)',
45+
processor: ActivityRemoveProcessor::class
4646
),
4747
new GetCollection(
4848
normalizationContext: self::COLLECTION_NORMALIZATION_CONTEXT,
@@ -65,11 +65,11 @@
6565
]
6666
),
6767
new Post(
68-
processor: ActivityCreateProcessor::class,
69-
validationContext: ['groups' => ['Default', 'create']],
70-
denormalizationContext: ['groups' => ['write', 'create']],
7168
normalizationContext: self::ITEM_NORMALIZATION_CONTEXT,
72-
securityPostDenormalize: 'is_granted("CAMP_MEMBER", object) or is_granted("CAMP_MANAGER", object) or object.category === null'
69+
denormalizationContext: ['groups' => ['write', 'create']],
70+
securityPostDenormalize: 'is_granted("CAMP_MEMBER", object) or is_granted("CAMP_MANAGER", object) or object.category === null',
71+
validationContext: ['groups' => ['Default', 'create']],
72+
processor: ActivityCreateProcessor::class
7373
),
7474
],
7575
denormalizationContext: ['groups' => ['write']],

‎api/src/Entity/ActivityProgressLabel.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@
3838
validationContext: ['groups' => ['Default', 'update']]
3939
),
4040
new Delete(
41-
validate: true,
41+
security: 'is_granted("CAMP_MANAGER", object)',
4242
validationContext: ['groups' => ['delete']],
43-
security: 'is_granted("CAMP_MANAGER", object)'
43+
validate: true
4444
),
4545
new GetCollection(
4646
security: 'is_authenticated()'
@@ -61,10 +61,10 @@
6161
]
6262
),
6363
new Post(
64-
validationContext: ['groups' => ['Default', 'create']],
65-
denormalizationContext: ['groups' => ['write', 'create']],
6664
normalizationContext: self::ITEM_NORMALIZATION_CONTEXT,
67-
securityPostDenormalize: 'is_granted("CAMP_MANAGER", object) or object.camp === null'
65+
denormalizationContext: ['groups' => ['write', 'create']],
66+
securityPostDenormalize: 'is_granted("CAMP_MANAGER", object) or object.camp === null',
67+
validationContext: ['groups' => ['Default', 'create']]
6868
),
6969
],
7070
denormalizationContext: ['groups' => ['write']],

‎api/src/Entity/Camp.php‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -34,29 +34,29 @@
3434
#[ApiResource(
3535
operations: [
3636
new Get(
37+
normalizationContext: self::ITEM_NORMALIZATION_CONTEXT,
3738
security: 'is_granted("CAMP_COLLABORATOR", object) or
3839
is_granted("CAMP_IS_PUBLIC", object)',
39-
normalizationContext: self::ITEM_NORMALIZATION_CONTEXT,
4040
),
4141
new Patch(
42-
processor: CampUpdateProcessor::class,
43-
security: 'is_granted("CAMP_MEMBER", object) or is_granted("CAMP_MANAGER", object)',
44-
denormalizationContext: ['groups' => ['write', 'update']],
4542
normalizationContext: self::ITEM_NORMALIZATION_CONTEXT,
43+
denormalizationContext: ['groups' => ['write', 'update']],
44+
security: 'is_granted("CAMP_MEMBER", object) or is_granted("CAMP_MANAGER", object)',
45+
processor: CampUpdateProcessor::class,
4646
),
4747
new Delete(
48-
processor: CampRemoveProcessor::class,
4948
security: 'is_granted("CAMP_MANAGER", object)',
49+
processor: CampRemoveProcessor::class,
5050
),
5151
new GetCollection(
5252
security: 'is_authenticated()'
5353
),
5454
new Post(
55-
processor: CampCreateProcessor::class,
55+
normalizationContext: self::ITEM_NORMALIZATION_CONTEXT,
56+
denormalizationContext: ['groups' => ['write', 'create']],
5657
security: 'is_authenticated()',
5758
validationContext: ['groups' => ['Default', 'create', 'Camp:create']],
58-
denormalizationContext: ['groups' => ['write', 'create']],
59-
normalizationContext: self::ITEM_NORMALIZATION_CONTEXT,
59+
processor: CampCreateProcessor::class,
6060
),
6161
],
6262
denormalizationContext: ['groups' => ['write']],

‎api/src/Entity/CampCollaboration.php‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -38,28 +38,28 @@
3838
security: 'is_granted("CAMP_COLLABORATOR", object) or is_granted("CAMP_IS_PUBLIC", object)'
3939
),
4040
new Patch(
41-
processor: CampCollaborationUpdateProcessor::class,
42-
denormalizationContext: ['groups' => ['write', 'update']],
4341
normalizationContext: self::ITEM_NORMALIZATION_CONTEXT,
42+
denormalizationContext: ['groups' => ['write', 'update']],
4443
security: '(is_authenticated() && user === object.user) or is_granted("CAMP_MEMBER", object) or is_granted("CAMP_MANAGER", object)',
45-
validationContext: ['groups' => ['Default', 'update']]
44+
validationContext: ['groups' => ['Default', 'update']],
45+
processor: CampCollaborationUpdateProcessor::class
4646
),
4747
new Delete(
48-
validate: true,
48+
security: 'is_granted("CAMP_MEMBER", object) or is_granted("CAMP_MANAGER", object)',
4949
validationContext: ['groups' => ['delete']],
50-
security: 'is_granted("CAMP_MEMBER", object) or is_granted("CAMP_MANAGER", object)'
50+
validate: true
5151
),
5252
new Patch(
53-
processor: CampCollaborationResendInvitationProcessor::class,
54-
security: '(is_authenticated() && user === object.user) or is_granted("CAMP_MEMBER", object) or is_granted("CAMP_MANAGER", object)',
5553
uriTemplate: 'camp_collaborations/{id}/'.self::RESEND_INVITATION,
56-
denormalizationContext: ['groups' => ['resend_invitation']],
5754
openapi: new OpenApiOperation(summary: 'Send the invitation email for this CampCollaboration again. Only possible, if the status is already invited.'),
58-
validationContext: ['groups' => ['Default', 'resend_invitation']]
55+
denormalizationContext: ['groups' => ['resend_invitation']],
56+
security: '(is_authenticated() && user === object.user) or is_granted("CAMP_MEMBER", object) or is_granted("CAMP_MANAGER", object)',
57+
validationContext: ['groups' => ['Default', 'resend_invitation']],
58+
processor: CampCollaborationResendInvitationProcessor::class
5959
),
6060
new GetCollection(
61-
security: 'is_fully_authenticated()',
62-
normalizationContext: self::COLLECTION_NORMALIZATION_CONTEXT
61+
normalizationContext: self::COLLECTION_NORMALIZATION_CONTEXT,
62+
security: 'is_fully_authenticated()'
6363
),
6464
new GetCollection(
6565
uriTemplate: self::CAMP_SUBRESOURCE_URI_TEMPLATE,
@@ -71,15 +71,15 @@
7171
is_granted("CAMP_IS_PUBLIC", camp)'
7272
),
7373
],
74-
security: 'is_fully_authenticated()',
75-
normalizationContext: self::COLLECTION_NORMALIZATION_CONTEXT
74+
normalizationContext: self::COLLECTION_NORMALIZATION_CONTEXT,
75+
security: 'is_fully_authenticated()'
7676
),
7777
new Post(
78-
processor: CampCollaborationCreateProcessor::class,
79-
denormalizationContext: ['groups' => ['write', 'create']],
80-
normalizationContext: self::ITEM_NORMALIZATION_CONTEXT,
8178
openapi: new OpenApiOperation(description: 'Also sends an invitation email to the inviteEmail address, if specified.'),
82-
securityPostDenormalize: 'is_granted("CAMP_MEMBER", object) or is_granted("CAMP_MANAGER", object) or object.camp === null'
79+
normalizationContext: self::ITEM_NORMALIZATION_CONTEXT,
80+
denormalizationContext: ['groups' => ['write', 'create']],
81+
securityPostDenormalize: 'is_granted("CAMP_MEMBER", object) or is_granted("CAMP_MANAGER", object) or object.camp === null',
82+
processor: CampCollaborationCreateProcessor::class
8383
),
8484
],
8585
denormalizationContext: ['groups' => ['write']],

‎api/src/Entity/Category.php‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -39,39 +39,39 @@
3939
is_granted("CAMP_IS_PUBLIC", object)'
4040
),
4141
new Patch(
42-
denormalizationContext: ['groups' => ['write', 'update']],
4342
normalizationContext: self::ITEM_NORMALIZATION_CONTEXT,
43+
denormalizationContext: ['groups' => ['write', 'update']],
4444
security: 'is_granted("CAMP_MEMBER", object) or is_granted("CAMP_MANAGER", object)'
4545
),
4646
new Delete(
47-
processor: CategoryRemoveProcessor::class,
4847
security: 'is_granted("CAMP_MEMBER", object) or is_granted("CAMP_MANAGER", object)',
49-
validate: true,
5048
validationContext: ['groups' => ['delete']],
49+
validate: true,
50+
processor: CategoryRemoveProcessor::class,
5151
),
5252
new GetCollection(
5353
security: 'is_authenticated()'
5454
),
5555
new Post(
56-
processor: CategoryCreateProcessor::class,
57-
denormalizationContext: ['groups' => ['write', 'create']],
5856
normalizationContext: self::ITEM_NORMALIZATION_CONTEXT,
59-
securityPostDenormalize: 'is_granted("CAMP_MEMBER", object) or is_granted("CAMP_MANAGER", object) or object.camp === null'
57+
denormalizationContext: ['groups' => ['write', 'create']],
58+
securityPostDenormalize: 'is_granted("CAMP_MEMBER", object) or is_granted("CAMP_MANAGER", object) or object.camp === null',
59+
processor: CategoryCreateProcessor::class
6060
),
6161
new GetCollection(
6262
uriTemplate: self::CAMP_SUBRESOURCE_URI_TEMPLATE,
6363
uriVariables: [
6464
'campId' => new Link(
65-
fromClass: Camp::class,
6665
toProperty: 'camp',
66+
fromClass: Camp::class,
6767
security: 'is_granted("CAMP_COLLABORATOR", camp) or
6868
is_granted("CAMP_IS_PUBLIC", camp)'
6969
),
7070
],
71+
normalizationContext: self::COLLECTION_NORMALIZATION_CONTEXT,
7172
extraProperties: [
7273
'filter_by_current_user' => false,
7374
],
74-
normalizationContext: self::COLLECTION_NORMALIZATION_CONTEXT,
7575
),
7676
],
7777
denormalizationContext: ['groups' => ['write']],

0 commit comments

Comments
 (0)