Skip to content
This repository was archived by the owner on May 31, 2024. It is now read-only.

Commit ca5136c

Browse files
committed
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
2 parents b071a10 + c299875 commit ca5136c

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

Acl/Domain/RoleSecurityIdentity.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ public function getRole()
5252
*/
5353
public function equals(SecurityIdentityInterface $sid)
5454
{
55-
if (!$sid instanceof RoleSecurityIdentity) {
55+
if (!$sid instanceof self) {
5656
return false;
5757
}
5858

Acl/Domain/UserSecurityIdentity.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ public function getClass()
102102
*/
103103
public function equals(SecurityIdentityInterface $sid)
104104
{
105-
if (!$sid instanceof UserSecurityIdentity) {
105+
if (!$sid instanceof self) {
106106
return false;
107107
}
108108

0 commit comments

Comments
 (0)