Skip to content

Commit 5372f34

Browse files
fabpotfabpot
committed
fixed CS
1 parent b1f3f23 commit 5372f34

File tree

6 files changed

+172
-172
lines changed

6 files changed

+172
-172
lines changed

‎Authorization/TraceableAccessDecisionManager.php

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ class TraceableAccessDecisionManager implements AccessDecisionManagerInterface
2626
{
2727
private $manager;
2828
private $strategy;
29-
private $voters = array();
30-
private $decisionLog = array(); // All decision logs
31-
private $currentLog = array(); // Logs being filled in
29+
private $voters = [];
30+
private $decisionLog = []; // All decision logs
31+
private $currentLog = []; // Logs being filled in
3232

3333
public function __construct(AccessDecisionManagerInterface $manager)
3434
{
@@ -50,11 +50,11 @@ public function __construct(AccessDecisionManagerInterface $manager)
5050
*/
5151
public function decide(TokenInterface $token, array $attributes, $object = null)
5252
{
53-
$currentDecisionLog = array(
53+
$currentDecisionLog = [
5454
'attributes' => $attributes,
5555
'object' => $object,
56-
'voterDetails' => array(),
57-
);
56+
'voterDetails' => [],
57+
];
5858

5959
$this->currentLog[] = &$currentDecisionLog;
6060

@@ -77,11 +77,11 @@ public function decide(TokenInterface $token, array $attributes, $object = null)
7777
public function addVoterVote(VoterInterface $voter, array $attributes, int $vote)
7878
{
7979
$currentLogIndex = \count($this->currentLog) - 1;
80-
$this->currentLog[$currentLogIndex]['voterDetails'][] = array(
80+
$this->currentLog[$currentLogIndex]['voterDetails'][] = [
8181
'voter' => $voter,
8282
'attributes' => $attributes,
8383
'vote' => $vote,
84-
);
84+
];
8585
}
8686

8787
/**

‎Authorization/Voter/ExpressionVoter.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,15 +96,15 @@ private function getVariables(TokenInterface $token, $subject)
9696
$roles = $token->getRoles();
9797
}
9898

99-
$variables = array(
99+
$variables = [
100100
'token' => $token,
101101
'user' => $token->getUser(),
102102
'object' => $subject,
103103
'subject' => $subject,
104104
'roles' => array_map(function ($role) { return $role->getRole(); }, $roles),
105105
'trust_resolver' => $this->trustResolver,
106106
'auth_checker' => $this->authChecker,
107-
);
107+
];
108108

109109
// this is mainly to propose a better experience when the expression is used
110110
// in an access control rule, as the developer does not know that it's going

‎Tests/Authorization/ExpressionLanguageTest.php

Lines changed: 41 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,10 @@ public function testIsAuthenticated($token, $expression, $result)
3535
$trustResolver = new AuthenticationTrustResolver();
3636
$tokenStorage = new TokenStorage();
3737
$tokenStorage->setToken($token);
38-
$accessDecisionManager = new AccessDecisionManager(array(new RoleVoter()));
38+
$accessDecisionManager = new AccessDecisionManager([new RoleVoter()]);
3939
$authChecker = new AuthorizationChecker($tokenStorage, $this->getMockBuilder(AuthenticationManagerInterface::class)->getMock(), $accessDecisionManager);
4040

41-
$context = array();
41+
$context = [];
4242
$context['trust_resolver'] = $trustResolver;
4343
$context['auth_checker'] = $authChecker;
4444
$context['token'] = $token;
@@ -48,65 +48,65 @@ public function testIsAuthenticated($token, $expression, $result)
4848

4949
public function provider()
5050
{
51-
$roles = array('ROLE_USER', 'ROLE_ADMIN');
51+
$roles = ['ROLE_USER', 'ROLE_ADMIN'];
5252
$user = new User('username', 'password', $roles);
5353

5454
$noToken = null;
5555
$anonymousToken = new AnonymousToken('firewall', 'anon.');
5656
$rememberMeToken = new RememberMeToken($user, 'providerkey', 'firewall');
5757
$usernamePasswordToken = new UsernamePasswordToken('username', 'password', 'providerkey', $roles);
5858

59-
return array(
60-
array($noToken, 'is_anonymous()', false),
61-
array($noToken, 'is_authenticated()', false),
62-
array($noToken, 'is_fully_authenticated()', false),
63-
array($noToken, 'is_remember_me()', false),
64-
65-
array($anonymousToken, 'is_anonymous()', true),
66-
array($anonymousToken, 'is_authenticated()', false),
67-
array($anonymousToken, 'is_fully_authenticated()', false),
68-
array($anonymousToken, 'is_remember_me()', false),
69-
array($anonymousToken, "is_granted('ROLE_USER')", false),
70-
71-
array($rememberMeToken, 'is_anonymous()', false),
72-
array($rememberMeToken, 'is_authenticated()', true),
73-
array($rememberMeToken, 'is_fully_authenticated()', false),
74-
array($rememberMeToken, 'is_remember_me()', true),
75-
array($rememberMeToken, "is_granted('ROLE_FOO')", false),
76-
array($rememberMeToken, "is_granted('ROLE_USER')", true),
77-
78-
array($usernamePasswordToken, 'is_anonymous()', false),
79-
array($usernamePasswordToken, 'is_authenticated()', true),
80-
array($usernamePasswordToken, 'is_fully_authenticated()', true),
81-
array($usernamePasswordToken, 'is_remember_me()', false),
82-
array($usernamePasswordToken, "is_granted('ROLE_FOO')", false),
83-
array($usernamePasswordToken, "is_granted('ROLE_USER')", true),
84-
);
59+
return [
60+
[$noToken, 'is_anonymous()', false],
61+
[$noToken, 'is_authenticated()', false],
62+
[$noToken, 'is_fully_authenticated()', false],
63+
[$noToken, 'is_remember_me()', false],
64+
65+
[$anonymousToken, 'is_anonymous()', true],
66+
[$anonymousToken, 'is_authenticated()', false],
67+
[$anonymousToken, 'is_fully_authenticated()', false],
68+
[$anonymousToken, 'is_remember_me()', false],
69+
[$anonymousToken, "is_granted('ROLE_USER')", false],
70+
71+
[$rememberMeToken, 'is_anonymous()', false],
72+
[$rememberMeToken, 'is_authenticated()', true],
73+
[$rememberMeToken, 'is_fully_authenticated()', false],
74+
[$rememberMeToken, 'is_remember_me()', true],
75+
[$rememberMeToken, "is_granted('ROLE_FOO')", false],
76+
[$rememberMeToken, "is_granted('ROLE_USER')", true],
77+
78+
[$usernamePasswordToken, 'is_anonymous()', false],
79+
[$usernamePasswordToken, 'is_authenticated()', true],
80+
[$usernamePasswordToken, 'is_fully_authenticated()', true],
81+
[$usernamePasswordToken, 'is_remember_me()', false],
82+
[$usernamePasswordToken, "is_granted('ROLE_FOO')", false],
83+
[$usernamePasswordToken, "is_granted('ROLE_USER')", true],
84+
];
8585
}
8686

8787
/**
8888
* @dataProvider provideLegacyHasRole
8989
* @group legacy
9090
*/
91-
public function testLegacyHasRole($expression, $result, $roles = array())
91+
public function testLegacyHasRole($expression, $result, $roles = [])
9292
{
9393
$expressionLanguage = new ExpressionLanguage();
94-
$context = array('roles' => $roles);
94+
$context = ['roles' => $roles];
9595

9696
$this->assertEquals($result, $expressionLanguage->evaluate($expression, $context));
9797
}
9898

9999
public function provideLegacyHasRole()
100100
{
101-
$roles = array('ROLE_USER', 'ROLE_ADMIN');
102-
103-
return array(
104-
array("has_role('ROLE_FOO')", false),
105-
array("has_role('ROLE_USER')", false),
106-
array("has_role('ROLE_ADMIN')", false),
107-
array("has_role('ROLE_FOO')", false, $roles),
108-
array("has_role('ROLE_USER')", true, $roles),
109-
array("has_role('ROLE_ADMIN')", true, $roles),
110-
);
101+
$roles = ['ROLE_USER', 'ROLE_ADMIN'];
102+
103+
return [
104+
["has_role('ROLE_FOO')", false],
105+
["has_role('ROLE_USER')", false],
106+
["has_role('ROLE_ADMIN')", false],
107+
["has_role('ROLE_FOO')", false, $roles],
108+
["has_role('ROLE_USER')", true, $roles],
109+
["has_role('ROLE_ADMIN')", true, $roles],
110+
];
111111
}
112112
}

0 commit comments

Comments
 (0)