Skip to content

Commit 72192e5

Browse files
carlobeltramecarlobeltrame
committed
Cs-fixer
1 parent 3f5ec98 commit 72192e5

File tree

7 files changed

+39
-29
lines changed

7 files changed

+39
-29
lines changed

‎api/src/Repository/CampCollaborationRepository.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public function findByUserAndIdAndInvited(User $user, string $id): ?CampCollabor
3939
* @return CampCollaboration[]
4040
*/
4141
public function findAllByInviteEmailAndInvited(string $inviteEmail): array {
42-
return $this->findBy(['inviteEmail' =>$inviteEmail, 'status' => CampCollaboration::STATUS_INVITED]);
42+
return $this->findBy(['inviteEmail' => $inviteEmail, 'status' => CampCollaboration::STATUS_INVITED]);
4343
}
4444

4545
/**

‎api/src/Service/ClaimInvitationService.php‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,22 +18,19 @@ public function __construct(
1818
* personal invitations, which the invited user will be able to see and
1919
* accept / reject in the UI, even without receiving the invitation email.
2020
* This is done by setting the user field instead of the inviteEmail field.
21-
* @param User $user
22-
* @param string $email
23-
* @return void
2421
*/
2522
public function claimInvitations(User $user, string $email): void {
2623
$personalInvitationsForNewEmail = $this->campCollaborationRepository->findAllByInviteEmailAndInvited($email);
2724

2825
foreach ($personalInvitationsForNewEmail as $invitation) {
29-
if ($this->campCollaborationRepository->findOneBy([
26+
if (null !== $this->campCollaborationRepository->findOneBy([
3027
'user' => $user,
3128
'camp' => $invitation->camp,
32-
]) !== null) {
29+
])) {
3330
// If the user is already part of the camp, we skip claiming this invitation,
3431
// because it would otherwise create a unique constraint violation, or we would
3532
// need to merge the existing collaboration and the invitation, which would be
36-
//very complex for an extremely rare use case which can easily be resolved by
33+
// very complex for an extremely rare use case which can easily be resolved by
3734
// the camp leaders in the UI.
3835
// We could also discard the invitation in this case, but previously, when users
3936
// have had problems with receiving their invitation emails, we have recommended
@@ -43,6 +40,7 @@ public function claimInvitations(User $user, string $email): void {
4340
// confusing for the users.
4441
continue;
4542
}
43+
4644
try {
4745
$invitation->inviteEmail = null;
4846
$invitation->user = $user;

‎api/src/State/ProfileUpdateProcessor.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
* @template-extends AbstractPersistProcessor<Profile>
2424
*/
2525
class ProfileUpdateProcessor extends AbstractPersistProcessor {
26-
2726
private $emailAddressVerificationPerformed = false;
2827

2928
public function __construct(
@@ -42,6 +41,7 @@ public function __construct(
4241
*/
4342
public function onBefore($data, Operation $operation, array $uriVariables = [], array $context = []): Profile {
4443
$this->emailAddressVerificationPerformed = false;
44+
4545
/** @var Profile $data */
4646
if (isset($data->newEmail)) {
4747
$verificationKey = IdGenerator::generateRandomHexString(64);

‎api/tests/Api/PersonalInvitations/ListPersonalInvitationsTest.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public function testListPersonalInvitationsIsAllowedForLoggedInUserButFiltered()
2929
'totalItems' => 1,
3030
'_links' => [
3131
'items' => [
32-
['href' => "/personal_invitations/{$invitation->getId()}"]
32+
['href' => "/personal_invitations/{$invitation->getId()}"],
3333
],
3434
],
3535
'_embedded' => [

‎api/tests/Api/Profiles/UpdateProfileTest.php‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
use App\Entity\CampCollaboration;
77
use App\Entity\Profile;
88
use App\Entity\User;
9-
use App\Repository\ProfileRepository;
109
use App\Service\MailService;
1110
use App\Tests\Api\ECampApiTestCase;
1211
use PHPUnit\Framework\Attributes\DataProvider;
@@ -104,7 +103,7 @@ public function testPatchProfileValidatesChangedEmail() {
104103

105104
$untrustedEmailKey = null;
106105
$mailServiceMock = $this->createMock(MailService::class);
107-
$mailServiceMock->expects($this->once())->method('sendEmailVerificationMail')->willReturnCallback(function($user, $profile) use(&$untrustedEmailKey) {
106+
$mailServiceMock->expects($this->once())->method('sendEmailVerificationMail')->willReturnCallback(function ($user, $profile) use (&$untrustedEmailKey) {
108107
$untrustedEmailKey = $profile->untrustedEmailKey;
109108
});
110109
$this->getContainer()->set(MailService::class, $mailServiceMock);
@@ -222,7 +221,7 @@ public function testActivatingEmailClaimsPersonalInvitation() {
222221

223222
$untrustedEmailKey = null;
224223
$mailServiceMock = $this->createMock(MailService::class);
225-
$mailServiceMock->expects($this->once())->method('sendEmailVerificationMail')->willReturnCallback(function($user, $profile) use(&$untrustedEmailKey) {
224+
$mailServiceMock->expects($this->once())->method('sendEmailVerificationMail')->willReturnCallback(function ($user, $profile) use (&$untrustedEmailKey) {
226225
$untrustedEmailKey = $profile->untrustedEmailKey;
227226
});
228227
$this->getContainer()->set(MailService::class, $mailServiceMock);
@@ -260,7 +259,7 @@ public function testActivatingEmailClaimsPersonalInvitation() {
260259
'totalItems' => 1,
261260
'_links' => [
262261
'items' => [
263-
['href' => "/personal_invitations/{$invitation1->getId()}"]
262+
['href' => "/personal_invitations/{$invitation1->getId()}"],
264263
],
265264
],
266265
'_embedded' => [
@@ -289,7 +288,7 @@ public function testActivatingEmailClaimingPersonalInvitationHandlesUniqueConstr
289288

290289
$untrustedEmailKey = null;
291290
$mailServiceMock = $this->createMock(MailService::class);
292-
$mailServiceMock->expects($this->once())->method('sendEmailVerificationMail')->willReturnCallback(function($user, $profile) use(&$untrustedEmailKey) {
291+
$mailServiceMock->expects($this->once())->method('sendEmailVerificationMail')->willReturnCallback(function ($user, $profile) use (&$untrustedEmailKey) {
293292
$untrustedEmailKey = $profile->untrustedEmailKey;
294293
});
295294
$this->getContainer()->set(MailService::class, $mailServiceMock);

‎api/tests/Api/Users/CreateUserTest.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ public function testActivationClaimsOpenInvitations() {
145145
'totalItems' => 1,
146146
'_links' => [
147147
'items' => [
148-
['href' => "/personal_invitations/{$invitation1->getId()}"]
148+
['href' => "/personal_invitations/{$invitation1->getId()}"],
149149
],
150150
],
151151
'_embedded' => [

‎api/tests/Service/ClaimInvitationServiceTest.php‎

Lines changed: 27 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,17 @@
1111
use Doctrine\ORM\EntityManagerInterface;
1212
use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
1313

14+
/**
15+
* @internal
16+
*/
1417
class ClaimInvitationServiceTest extends KernelTestCase {
15-
1618
private CampCollaborationRepository $campCollaborationRepository;
1719
private EntityManagerInterface $em;
1820
private ClaimInvitationService $claimInvitationService;
1921

2022
private User $user;
2123
private string $email = 'test@example.com';
2224

23-
2425
protected function setUp(): void {
2526
static::bootKernel();
2627

@@ -38,7 +39,8 @@ public function testDoesNothingWhenNoInvitationPresent() {
3839
->expects($this->once())
3940
->method('findAllByInviteEmailAndInvited')
4041
->with($this->email)
41-
->willReturn([]);
42+
->willReturn([])
43+
;
4244

4345
// then
4446
$this->em->expects($this->never())->method('persist');
@@ -61,7 +63,8 @@ public function testClaimsInvitation() {
6163
->expects($this->once())
6264
->method('findAllByInviteEmailAndInvited')
6365
->with($this->email)
64-
->willReturn([ $invitation ]);
66+
->willReturn([$invitation])
67+
;
6568

6669
// then
6770
$this->em->expects($this->once())->method('persist')->with($invitation);
@@ -97,13 +100,15 @@ public function testIgnoresInvitationWhenUserAlreadyPartOfCamp() {
97100
->expects($this->once())
98101
->method('findAllByInviteEmailAndInvited')
99102
->with($this->email)
100-
->willReturn([ $invitation ]);
103+
->willReturn([$invitation])
104+
;
101105

102106
$this->campCollaborationRepository
103107
->expects($this->once())
104108
->method('findOneBy')
105109
->with(['user' => $this->user, 'camp' => $camp])
106-
->willReturn($existingCollaboration);
110+
->willReturn($existingCollaboration)
111+
;
107112

108113
// then
109114
$this->em->expects($this->never())->method('persist');
@@ -139,13 +144,15 @@ public function testIgnoresInvitationWhenUserWasPreviouslyPartOfCamp() {
139144
->expects($this->once())
140145
->method('findAllByInviteEmailAndInvited')
141146
->with($this->email)
142-
->willReturn([ $invitation ]);
147+
->willReturn([$invitation])
148+
;
143149

144150
$this->campCollaborationRepository
145151
->expects($this->once())
146152
->method('findOneBy')
147153
->with(['user' => $this->user, 'camp' => $camp])
148-
->willReturn($existingCollaboration);
154+
->willReturn($existingCollaboration)
155+
;
149156

150157
// then
151158
$this->em->expects($this->never())->method('persist');
@@ -181,24 +188,30 @@ public function testHandlesUniqueConstraintViolationWhenUserAlreadyPartOfCamp()
181188
->expects($this->once())
182189
->method('findAllByInviteEmailAndInvited')
183190
->with($this->email)
184-
->willReturn([ $invitation, $invitation2 ]);
191+
->willReturn([$invitation, $invitation2])
192+
;
185193

186194
// then
187195
$matcher1 = $this->exactly(2);
188196
$this->em->expects($matcher1)
189197
->method('persist')
190198
->willReturnCallback(function (CampCollaboration $value) use ($matcher1, $invitation, $invitation2) {
191-
if ($matcher1->numberOfInvocations() === 1) $this->assertEquals($invitation, $value);
192-
else $this->assertEquals($invitation2, $value);
193-
});
199+
if (1 === $matcher1->numberOfInvocations()) {
200+
$this->assertEquals($invitation, $value);
201+
} else {
202+
$this->assertEquals($invitation2, $value);
203+
}
204+
})
205+
;
194206
$matcher2 = $this->exactly(2);
195207
$this->em->expects($matcher2)
196208
->method('flush')
197209
->willReturnCallback(function () use ($matcher2) {
198-
if ($matcher2->numberOfInvocations() === 1) {
210+
if (1 === $matcher2->numberOfInvocations()) {
199211
throw $this->createMock(UniqueConstraintViolationException::class);
200212
}
201-
});
213+
})
214+
;
202215
$this->em->expects($this->once())->method('clear');
203216

204217
// when

0 commit comments

Comments
 (0)