Skip to content

Commit 7e481fb

Browse files
BacLucBacLuc
committed
chore(api): run rector again
Since the last rector PR, rector was updated again and has some more rules. e.g. the sort named parameters rule, for which i waited for a long time.
1 parent 678cee4 commit 7e481fb

35 files changed

+180
-174
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+
uriTemplate: '/invitations/{inviteKey}/find{._format}',
25+
openapi: new OpenApiOperation(description: 'Use myInviteKey to find an invitation in the dev environment.'),
26+
// TO DISCUSS: Wouldn't '/{inviteKey}{._format}' be more REST-like
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
@@ -40,8 +40,8 @@
4040
validationContext: ['groups' => ['Default', 'update']]
4141
),
4242
new Delete(
43-
processor: ActivityRemoveProcessor::class,
44-
security: 'is_granted("CAMP_MEMBER", object) or is_granted("CAMP_MANAGER", object)'
43+
security: 'is_granted("CAMP_MEMBER", object) or is_granted("CAMP_MANAGER", object)',
44+
processor: ActivityRemoveProcessor::class
4545
),
4646
new GetCollection(
4747
normalizationContext: self::COLLECTION_NORMALIZATION_CONTEXT,
@@ -63,11 +63,11 @@
6363
]
6464
),
6565
new Post(
66-
processor: ActivityCreateProcessor::class,
67-
validationContext: ['groups' => ['Default', 'create']],
68-
denormalizationContext: ['groups' => ['write', 'create']],
6966
normalizationContext: self::ITEM_NORMALIZATION_CONTEXT,
70-
securityPostDenormalize: 'is_granted("CAMP_MEMBER", object) or is_granted("CAMP_MANAGER", object) or object.category === null'
67+
denormalizationContext: ['groups' => ['write', 'create']],
68+
securityPostDenormalize: 'is_granted("CAMP_MEMBER", object) or is_granted("CAMP_MANAGER", object) or object.category === null',
69+
validationContext: ['groups' => ['Default', 'create']],
70+
processor: ActivityCreateProcessor::class
7171
),
7272
],
7373
denormalizationContext: ['groups' => ['write']],

‎api/src/Entity/ActivityProgressLabel.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,9 @@
3737
validationContext: ['groups' => ['Default', 'update']]
3838
),
3939
new Delete(
40-
validate: true,
40+
security: 'is_granted("CAMP_MANAGER", object)',
4141
validationContext: ['groups' => ['delete']],
42-
security: 'is_granted("CAMP_MANAGER", object)'
42+
validate: true
4343
),
4444
new GetCollection(
4545
security: 'is_authenticated()'
@@ -59,10 +59,10 @@
5959
]
6060
),
6161
new Post(
62-
validationContext: ['groups' => ['Default', 'create']],
63-
denormalizationContext: ['groups' => ['write', 'create']],
6462
normalizationContext: self::ITEM_NORMALIZATION_CONTEXT,
65-
securityPostDenormalize: 'is_granted("CAMP_MANAGER", object) or object.camp === null'
63+
denormalizationContext: ['groups' => ['write', 'create']],
64+
securityPostDenormalize: 'is_granted("CAMP_MANAGER", object) or object.camp === null',
65+
validationContext: ['groups' => ['Default', 'create']]
6666
),
6767
],
6868
denormalizationContext: ['groups' => ['write']],

‎api/src/Entity/Camp.php‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,27 +32,27 @@
3232
#[ApiResource(
3333
operations: [
3434
new Get(
35-
security: 'is_granted("CAMP_COLLABORATOR", object) or is_granted("CAMP_IS_PROTOTYPE", object)',
3635
normalizationContext: self::ITEM_NORMALIZATION_CONTEXT,
36+
security: 'is_granted("CAMP_COLLABORATOR", object) or is_granted("CAMP_IS_PROTOTYPE", object)',
3737
),
3838
new Patch(
39-
security: 'is_granted("CAMP_MEMBER", object) or is_granted("CAMP_MANAGER", object)',
40-
denormalizationContext: ['groups' => ['write', 'update']],
4139
normalizationContext: self::ITEM_NORMALIZATION_CONTEXT,
40+
denormalizationContext: ['groups' => ['write', 'update']],
41+
security: 'is_granted("CAMP_MEMBER", object) or is_granted("CAMP_MANAGER", object)',
4242
),
4343
new Delete(
44-
processor: CampRemoveProcessor::class,
4544
security: 'is_granted("CAMP_MANAGER", object)',
45+
processor: CampRemoveProcessor::class,
4646
),
4747
new GetCollection(
4848
security: 'is_authenticated()'
4949
),
5050
new Post(
51-
processor: CampCreateProcessor::class,
51+
normalizationContext: self::ITEM_NORMALIZATION_CONTEXT,
52+
denormalizationContext: ['groups' => ['write', 'create']],
5253
security: 'is_authenticated()',
5354
validationContext: ['groups' => ['Default', 'create', 'Camp:create']],
54-
denormalizationContext: ['groups' => ['write', 'create']],
55-
normalizationContext: self::ITEM_NORMALIZATION_CONTEXT,
55+
processor: CampCreateProcessor::class,
5656
),
5757
],
5858
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_PROTOTYPE", 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,
@@ -70,15 +70,15 @@
7070
security: 'is_granted("CAMP_COLLABORATOR", camp) or is_granted("CAMP_IS_PROTOTYPE", camp)'
7171
),
7272
],
73-
security: 'is_fully_authenticated()',
74-
normalizationContext: self::COLLECTION_NORMALIZATION_CONTEXT
73+
normalizationContext: self::COLLECTION_NORMALIZATION_CONTEXT,
74+
security: 'is_fully_authenticated()'
7575
),
7676
new Post(
77-
processor: CampCollaborationCreateProcessor::class,
78-
denormalizationContext: ['groups' => ['write', 'create']],
79-
normalizationContext: self::ITEM_NORMALIZATION_CONTEXT,
8077
openapi: new OpenApiOperation(description: 'Also sends an invitation email to the inviteEmail address, if specified.'),
81-
securityPostDenormalize: 'is_granted("CAMP_MEMBER", object) or is_granted("CAMP_MANAGER", object) or object.camp === null'
78+
normalizationContext: self::ITEM_NORMALIZATION_CONTEXT,
79+
denormalizationContext: ['groups' => ['write', 'create']],
80+
securityPostDenormalize: 'is_granted("CAMP_MEMBER", object) or is_granted("CAMP_MANAGER", object) or object.camp === null',
81+
processor: CampCollaborationCreateProcessor::class
8282
),
8383
],
8484
denormalizationContext: ['groups' => ['write']],

‎api/src/Entity/Category.php‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -38,38 +38,38 @@
3838
security: 'is_granted("CAMP_COLLABORATOR", object) or is_granted("CAMP_IS_PROTOTYPE", object)'
3939
),
4040
new Patch(
41-
denormalizationContext: ['groups' => ['write', 'update']],
4241
normalizationContext: self::ITEM_NORMALIZATION_CONTEXT,
42+
denormalizationContext: ['groups' => ['write', 'update']],
4343
security: 'is_granted("CAMP_MEMBER", object) or is_granted("CAMP_MANAGER", object)'
4444
),
4545
new Delete(
46-
processor: CategoryRemoveProcessor::class,
4746
security: 'is_granted("CAMP_MEMBER", object) or is_granted("CAMP_MANAGER", object)',
48-
validate: true,
4947
validationContext: ['groups' => ['delete']],
48+
validate: true,
49+
processor: CategoryRemoveProcessor::class,
5050
),
5151
new GetCollection(
5252
security: 'is_authenticated()'
5353
),
5454
new Post(
55-
processor: CategoryCreateProcessor::class,
56-
denormalizationContext: ['groups' => ['write', 'create']],
5755
normalizationContext: self::ITEM_NORMALIZATION_CONTEXT,
58-
securityPostDenormalize: 'is_granted("CAMP_MEMBER", object) or is_granted("CAMP_MANAGER", object) or object.camp === null'
56+
denormalizationContext: ['groups' => ['write', 'create']],
57+
securityPostDenormalize: 'is_granted("CAMP_MEMBER", object) or is_granted("CAMP_MANAGER", object) or object.camp === null',
58+
processor: CategoryCreateProcessor::class
5959
),
6060
new GetCollection(
6161
uriTemplate: self::CAMP_SUBRESOURCE_URI_TEMPLATE,
6262
uriVariables: [
6363
'campId' => new Link(
64-
fromClass: Camp::class,
6564
toProperty: 'camp',
65+
fromClass: Camp::class,
6666
security: 'is_granted("CAMP_COLLABORATOR", camp) or is_granted("CAMP_IS_PROTOTYPE", camp)'
6767
),
6868
],
69+
normalizationContext: self::COLLECTION_NORMALIZATION_CONTEXT,
6970
extraProperties: [
7071
'filter_by_current_user' => false,
7172
],
72-
normalizationContext: self::COLLECTION_NORMALIZATION_CONTEXT,
7373
),
7474
],
7575
denormalizationContext: ['groups' => ['write']],

0 commit comments

Comments
 (0)