Merge remote branch 'schmittjoh/security'

src/Symfony/Component/Security/Acl/Dbal/AclProvider.php

@@ -321,7 +321,6 @@ FINDCHILDREN;
             FROM %s o
             INNER JOIN %s c ON c.id = o.class_id
             WHERE o.object_identifier = %s AND c.class_type = %s
-            LIMIT 1
 QUERY;
 
         return sprintf(

src/Symfony/Component/Security/Http/Event/InteractiveLoginEvent.php

@@ -13,6 +13,7 @@ namespace Symfony\Component\Security\Http\Event;
 
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\EventDispatcher\Event;
+use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
 
 class InteractiveLoginEvent extends Event
 {
@@ -20,7 +21,7 @@ class InteractiveLoginEvent extends Event
 
     private $authenticationToken;
 
-    public function __construct(Request $request, $authenticationToken)
+    public function __construct(Request $request, TokenInterface $authenticationToken)
     {
         $this->request = $request;
         $this->authenticationToken = $authenticationToken;

tests/Symfony/Tests/Component/Security/Core/User/UserTest.php

@@ -123,4 +123,22 @@ class UserTest extends \PHPUnit_Framework_TestCase
         $user->eraseCredentials();
         $this->assertEquals('superpass', $user->getPassword());
     }
+
+    public function testUsersAreEqual()
+    {
+        $user1 = new User('fabien', 'superpass', array('ROLE_USER'));
+        $user2 = clone $user1;
+
+        $this->assertTrue($user1->equals($user2));
+        $this->assertTrue($user2->equals($user1));
+    }
+
+    public function testUsersAreNotEqual()
+    {
+        $user1 = new User('fabien', 'superpass', array('ROLE_USER'));
+        $user2 = new User('fabien', 'superpass', array('ROLE_USER'), false);
+
+        $this->assertFalse($user1->equals($user2));
+        $this->assertFalse($user2->equals($user1));
+    }
 }