diff options
| author | Fabien Potencier <fabien.potencier@gmail.com> | 2015-04-10 09:19:44 +0200 |
|---|---|---|
| committer | Fabien Potencier <fabien.potencier@gmail.com> | 2015-04-10 09:19:44 +0200 |
| commit | ca5136c47a32cdf685376bf02545bbe510c4968c (patch) | |
| tree | daf9b694ed6b77762e9992d4e717060919acc037 /Acl/Domain/UserSecurityIdentity.php | |
| parent | b071a103319fc4d8549e17e575c75b8b3417d8cd (diff) | |
| parent | c29987543b13344731ec7169e5f81cdee5b9d7d8 (diff) | |
| download | symfony-security-ca5136c47a32cdf685376bf02545bbe510c4968c.zip symfony-security-ca5136c47a32cdf685376bf02545bbe510c4968c.tar.gz symfony-security-ca5136c47a32cdf685376bf02545bbe510c4968c.tar.bz2 | |
Merge branch '2.6' into 2.7
* 2.6:
[Translator] Cache does not take fallback locales into consideration
[VarDumper] Fix call site detection
[Process] Fix volatile test
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
Conflicts:
.travis.yml
src/Symfony/Component/Translation/Translator.php
Diffstat (limited to 'Acl/Domain/UserSecurityIdentity.php')
| -rw-r--r-- | Acl/Domain/UserSecurityIdentity.php | 2 |
1 files changed, 1 insertions, 1 deletions
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; } |