Skip to content

Commit 01e15bb

Browse files
committed
minor #265 Rebuild CI and fix CS (bocharsky-bw)
This PR was squashed before being merged into the main branch. Discussion ---------- Rebuild CI and fix CS After some changes upstream in GitHub CI config: SymfonyCasts/.github#2 Commits ------- 16a7ae4 Rebuild CI and fix CS
2 parents 3930870 + 16a7ae4 commit 01e15bb

File tree

8 files changed

+5
-31
lines changed

8 files changed

+5
-31
lines changed

.php-cs-fixer.dist.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,9 @@
1919
For the full copyright and license information, please view the LICENSE
2020
file that was distributed with this source code.
2121
EOF
22-
]
22+
],
23+
// Because of the commented out argument in ResetPasswordHelperInterface
24+
'no_superfluous_phpdoc_tags' => false,
2325
))
2426
->setRiskyAllowed(true)
2527
->setFinder($finder)

src/Command/ResetPasswordRemoveExpiredCommand.php

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,17 +29,11 @@ public function __construct(ResetPasswordCleaner $cleaner)
2929
parent::__construct('reset-password:remove-expired');
3030
}
3131

32-
/**
33-
* {@inheritdoc}
34-
*/
3532
protected function configure(): void
3633
{
3734
$this->setDescription('Remove expired reset password requests from persistence.');
3835
}
3936

40-
/**
41-
* {@inheritdoc}
42-
*/
4337
protected function execute(InputInterface $input, OutputInterface $output): int
4438
{
4539
$output->writeln('Removing expired reset password requests...');

src/ResetPasswordHelper.php

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ public function __construct(ResetPasswordTokenGenerator $generator, ResetPasswor
6060
*
6161
* @throws TooManyPasswordRequestsException
6262
*/
63-
public function generateResetToken(object $user, ?int $resetRequestLifetime = null): ResetPasswordToken
63+
public function generateResetToken(object $user, int $resetRequestLifetime = null): ResetPasswordToken
6464
{
6565
$this->resetPasswordCleaner->handleGarbageCollection();
6666

@@ -94,8 +94,6 @@ public function generateResetToken(object $user, ?int $resetRequestLifetime = nu
9494
}
9595

9696
/**
97-
* {@inheritdoc}
98-
*
9997
* @throws ExpiredResetPasswordTokenException
10098
* @throws InvalidResetPasswordTokenException
10199
*/
@@ -133,8 +131,6 @@ public function validateTokenAndFetchUser(string $fullToken): object
133131
}
134132

135133
/**
136-
* {@inheritdoc}
137-
*
138134
* @throws InvalidResetPasswordTokenException
139135
*/
140136
public function removeResetRequest(string $fullToken): void
@@ -148,9 +144,6 @@ public function removeResetRequest(string $fullToken): void
148144
$this->repository->removeResetPasswordRequest($request);
149145
}
150146

151-
/**
152-
* {@inheritdoc}
153-
*/
154147
public function getTokenLifetime(): int
155148
{
156149
return $this->resetRequestLifetime;
@@ -166,7 +159,7 @@ public function getTokenLifetime(): int
166159
*
167160
* This method should not be used when timing attacks are a concern.
168161
*/
169-
public function generateFakeResetToken(?int $resetRequestLifetime = null): ResetPasswordToken
162+
public function generateFakeResetToken(int $resetRequestLifetime = null): ResetPasswordToken
170163
{
171164
$resetRequestLifetime = $resetRequestLifetime ?: $this->resetRequestLifetime;
172165
$expiresAt = new \DateTimeImmutable(sprintf('+%d seconds', $resetRequestLifetime));

tests/FunctionalTests/Persistence/ResetPasswordRequestRepositoryTest.php

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,6 @@ final class ResetPasswordRequestRepositoryTest extends TestCase
3636
*/
3737
private $repository;
3838

39-
/**
40-
* {@inheritdoc}
41-
*/
4239
protected function setUp(): void
4340
{
4441
$kernel = new ResetPasswordTestKernel();

tests/UnitTests/Controller/ResetPasswordControllerTraitTest.php

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,6 @@ class ResetPasswordControllerTraitTest extends TestCase
3333
*/
3434
private $mockSession;
3535

36-
/**
37-
* {@inheritdoc}
38-
*/
3936
protected function setUp(): void
4037
{
4138
$this->mockSession = $this->createMock(SessionInterface::class);

tests/UnitTests/Generator/ResetPasswordTokenGeneratorTest.php

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,6 @@ class ResetPasswordTokenGeneratorTest extends TestCase
3030
*/
3131
private $mockExpiresAt;
3232

33-
/**
34-
* {@inheritdoc}
35-
*/
3633
protected function setUp(): void
3734
{
3835
$this->mockRandomGenerator = $this->createMock(ResetPasswordRandomGenerator::class);

tests/UnitTests/ResetPasswordHelperTest.php

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,6 @@ class ResetPasswordHelperTest extends TestCase
5252
*/
5353
private $randomToken;
5454

55-
/**
56-
* {@inheritdoc}
57-
*/
5855
protected function setUp(): void
5956
{
6057
$this->mockRepo = $this->createMock(ResetPasswordRequestRepositoryInterface::class);

tests/UnitTests/Util/ResetPasswordCleanerTest.php

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,6 @@ class ResetPasswordCleanerTest extends TestCase
2525
*/
2626
private $mockRepo;
2727

28-
/**
29-
* {@inheritdoc}
30-
*/
3128
protected function setUp(): void
3229
{
3330
$this->mockRepo = $this->createMock(ResetPasswordRequestRepositoryInterface::class);

0 commit comments

Comments
 (0)