Skip to content

Commit c76a561

Browse files
Merge branch '6.2' into 6.3
* 6.2: CS fix Fix test provider
2 parents 4e544f8 + 64a582e commit c76a561

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

Authorization/TraceableAccessDecisionManager.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,11 @@ public function __construct(AccessDecisionManagerInterface $manager)
3838

3939
// The strategy and voters are stored in a private properties of the decorated service
4040
if (property_exists($manager, 'strategy')) {
41-
$reflection = new \ReflectionProperty(\get_class($manager), 'strategy');
41+
$reflection = new \ReflectionProperty($manager::class, 'strategy');
4242
$this->strategy = $reflection->getValue($manager);
4343
}
4444
if (property_exists($manager, 'voters')) {
45-
$reflection = new \ReflectionProperty(\get_class($manager), 'voters');
45+
$reflection = new \ReflectionProperty($manager::class, 'voters');
4646
$this->voters = $reflection->getValue($manager);
4747
}
4848
}

Authorization/Voter/VoterInterface.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ interface VoterInterface
3434
* @param array $attributes An array of attributes associated with the method being invoked
3535
*
3636
* @return int either ACCESS_GRANTED, ACCESS_ABSTAIN, or ACCESS_DENIED
37+
*
3738
* @psalm-return self::ACCESS_* must be transformed into @return on Symfony 7
3839
*/
3940
public function vote(TokenInterface $token, mixed $subject, array $attributes);

Tests/Validator/Constraints/UserPasswordValidatorTestCase.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
use Symfony\Component\Security\Core\User\UserInterface;
1919
use Symfony\Component\Security\Core\Validator\Constraints\UserPassword;
2020
use Symfony\Component\Security\Core\Validator\Constraints\UserPasswordValidator;
21-
use Symfony\Component\Validator\ConstraintValidatorInterface;
2221
use Symfony\Component\Validator\Exception\ConstraintDefinitionException;
2322
use Symfony\Component\Validator\Test\ConstraintValidatorTestCase;
2423

User/InMemoryUserProvider.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,9 +93,9 @@ public function supportsClass(string $class): bool
9393
/**
9494
* Returns the user by given username.
9595
*
96-
* @throws UserNotFoundException if user whose given username does not exist
97-
*
9896
* @return InMemoryUser change return type on 7.0
97+
*
98+
* @throws UserNotFoundException if user whose given username does not exist
9999
*/
100100
private function getUser(string $username): UserInterface
101101
{

0 commit comments

Comments
 (0)