diff options
| author | Fabien Potencier <fabien.potencier@gmail.com> | 2015-04-08 07:30:27 +0200 |
|---|---|---|
| committer | Fabien Potencier <fabien.potencier@gmail.com> | 2015-04-08 07:30:27 +0200 |
| commit | c29987543b13344731ec7169e5f81cdee5b9d7d8 (patch) | |
| tree | f79ddd9d7b736d10534d4555454a1e0c86468c98 | |
| parent | 06dbcd5a5464cccf4c748071f338f34130ecad06 (diff) | |
| parent | 197fd5c73c06c2b7032abe313a49a7b8d804fc38 (diff) | |
| download | symfony-security-c29987543b13344731ec7169e5f81cdee5b9d7d8.zip symfony-security-c29987543b13344731ec7169e5f81cdee5b9d7d8.tar.gz symfony-security-c29987543b13344731ec7169e5f81cdee5b9d7d8.tar.bz2 | |
Merge branch '2.3' into 2.6
* 2.3:
Remove some useless @group annotations
Removed useless strtolower call
[Validator] Use strict comparisons in loaders
CS: Use "self" keyword instead of class name if possible
| -rw-r--r-- | Acl/Domain/RoleSecurityIdentity.php | 2 | ||||
| -rw-r--r-- | Acl/Domain/UserSecurityIdentity.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Acl/Domain/RoleSecurityIdentity.php b/Acl/Domain/RoleSecurityIdentity.php index 5410a46..c28a1c5 100644 --- a/Acl/Domain/RoleSecurityIdentity.php +++ b/Acl/Domain/RoleSecurityIdentity.php @@ -52,7 +52,7 @@ final class RoleSecurityIdentity implements SecurityIdentityInterface */ public function equals(SecurityIdentityInterface $sid) { - if (!$sid instanceof RoleSecurityIdentity) { + if (!$sid instanceof self) { return false; } diff --git a/Acl/Domain/UserSecurityIdentity.php b/Acl/Domain/UserSecurityIdentity.php index e3d9a34..3bf277f 100644 --- a/Acl/Domain/UserSecurityIdentity.php +++ b/Acl/Domain/UserSecurityIdentity.php @@ -102,7 +102,7 @@ final class UserSecurityIdentity implements SecurityIdentityInterface */ public function equals(SecurityIdentityInterface $sid) { - if (!$sid instanceof UserSecurityIdentity) { + if (!$sid instanceof self) { return false; } |