Merge branch '2.3' into 2.6

fabpot · fabpot · commit c29987543b13 · 2015-04-08T07:30:27.000+02:00
* 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
diff --git a/Acl/Domain/RoleSecurityIdentity.php b/Acl/Domain/RoleSecurityIdentity.php
@@ -52,7 +52,7 @@ public function getRole()
      */
     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
@@ -102,7 +102,7 @@ public function getClass()
      */
     public function equals(SecurityIdentityInterface $sid)
     {
-        if (!$sid instanceof UserSecurityIdentity) {
+        if (!$sid instanceof self) {
             return false;
         }
 

Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ public function getRole()`
`52`	`52`	`*/`
`53`	`53`	`public function equals(SecurityIdentityInterface $sid)`
`54`	`54`	`{`
`55`		`- if (!$sid instanceof RoleSecurityIdentity) {`
	`55`	`+ if (!$sid instanceof self) {`
`56`	`56`	`return false;`
`57`	`57`	`}`
`58`	`58`
Original file line number	Diff line number	Diff line change
`@@ -102,7 +102,7 @@ public function getClass()`
`102`	`102`	`*/`
`103`	`103`	`public function equals(SecurityIdentityInterface $sid)`
`104`	`104`	`{`
`105`		`- if (!$sid instanceof UserSecurityIdentity) {`
	`105`	`+ if (!$sid instanceof self) {`
`106`	`106`	`return false;`
`107`	`107`	`}`
`108`	`108`