Skip to content

Commit 90d5ca9

Browse files
Merge branch '4.4' into 5.1
* 4.4: Update .php_cs.dist Apply "visibility_required" CS rule to constants
2 parents e519029 + d53a010 commit 90d5ca9

File tree

7 files changed

+21
-21
lines changed

7 files changed

+21
-21
lines changed

Authentication/Provider/AuthenticationProviderInterface.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ interface AuthenticationProviderInterface extends AuthenticationManagerInterface
2929
*
3030
* @var string
3131
*/
32-
const USERNAME_NONE_PROVIDED = 'NONE_PROVIDED';
32+
public const USERNAME_NONE_PROVIDED = 'NONE_PROVIDED';
3333

3434
/**
3535
* Checks whether this provider supports the given token.

AuthenticationEvents.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,13 @@ final class AuthenticationEvents
1919
*
2020
* @Event("Symfony\Component\Security\Core\Event\AuthenticationSuccessEvent")
2121
*/
22-
const AUTHENTICATION_SUCCESS = 'security.authentication.success';
22+
public const AUTHENTICATION_SUCCESS = 'security.authentication.success';
2323

2424
/**
2525
* The AUTHENTICATION_FAILURE event occurs after a user cannot be
2626
* authenticated by any of the providers.
2727
*
2828
* @Event("Symfony\Component\Security\Core\Event\AuthenticationFailureEvent")
2929
*/
30-
const AUTHENTICATION_FAILURE = 'security.authentication.failure';
30+
public const AUTHENTICATION_FAILURE = 'security.authentication.failure';
3131
}

Authorization/AccessDecisionManager.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@
2323
*/
2424
class AccessDecisionManager implements AccessDecisionManagerInterface
2525
{
26-
const STRATEGY_AFFIRMATIVE = 'affirmative';
27-
const STRATEGY_CONSENSUS = 'consensus';
28-
const STRATEGY_UNANIMOUS = 'unanimous';
29-
const STRATEGY_PRIORITY = 'priority';
26+
public const STRATEGY_AFFIRMATIVE = 'affirmative';
27+
public const STRATEGY_CONSENSUS = 'consensus';
28+
public const STRATEGY_UNANIMOUS = 'unanimous';
29+
public const STRATEGY_PRIORITY = 'priority';
3030

3131
private $voters;
3232
private $strategy;

Authorization/Voter/AuthenticatedVoter.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,12 @@
2626
*/
2727
class AuthenticatedVoter implements VoterInterface
2828
{
29-
const IS_AUTHENTICATED_FULLY = 'IS_AUTHENTICATED_FULLY';
30-
const IS_AUTHENTICATED_REMEMBERED = 'IS_AUTHENTICATED_REMEMBERED';
31-
const IS_AUTHENTICATED_ANONYMOUSLY = 'IS_AUTHENTICATED_ANONYMOUSLY';
32-
const IS_ANONYMOUS = 'IS_ANONYMOUS';
33-
const IS_IMPERSONATOR = 'IS_IMPERSONATOR';
34-
const IS_REMEMBERED = 'IS_REMEMBERED';
29+
public const IS_AUTHENTICATED_FULLY = 'IS_AUTHENTICATED_FULLY';
30+
public const IS_AUTHENTICATED_REMEMBERED = 'IS_AUTHENTICATED_REMEMBERED';
31+
public const IS_AUTHENTICATED_ANONYMOUSLY = 'IS_AUTHENTICATED_ANONYMOUSLY';
32+
public const IS_ANONYMOUS = 'IS_ANONYMOUS';
33+
public const IS_IMPERSONATOR = 'IS_IMPERSONATOR';
34+
public const IS_REMEMBERED = 'IS_REMEMBERED';
3535

3636
private $authenticationTrustResolver;
3737

Authorization/Voter/VoterInterface.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@
2020
*/
2121
interface VoterInterface
2222
{
23-
const ACCESS_GRANTED = 1;
24-
const ACCESS_ABSTAIN = 0;
25-
const ACCESS_DENIED = -1;
23+
public const ACCESS_GRANTED = 1;
24+
public const ACCESS_ABSTAIN = 0;
25+
public const ACCESS_DENIED = -1;
2626

2727
/**
2828
* Returns the vote for the given parameters.

Encoder/BasePasswordEncoder.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
*/
1919
abstract class BasePasswordEncoder implements PasswordEncoderInterface
2020
{
21-
const MAX_PASSWORD_LENGTH = 4096;
21+
public const MAX_PASSWORD_LENGTH = 4096;
2222

2323
/**
2424
* {@inheritdoc}

Security.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@
2222
*/
2323
class Security
2424
{
25-
const ACCESS_DENIED_ERROR = '_security.403_error';
26-
const AUTHENTICATION_ERROR = '_security.last_error';
27-
const LAST_USERNAME = '_security.last_username';
28-
const MAX_USERNAME_LENGTH = 4096;
25+
public const ACCESS_DENIED_ERROR = '_security.403_error';
26+
public const AUTHENTICATION_ERROR = '_security.last_error';
27+
public const LAST_USERNAME = '_security.last_username';
28+
public const MAX_USERNAME_LENGTH = 4096;
2929

3030
private $container;
3131

0 commit comments

Comments
 (0)