Add some more tests, and enforce boolean return value of interface implementations.

canni · canni · commit d7ffeb5844e4 · 2012-01-10T21:55:05.000+01:00
diff --git a/src/Symfony/Component/Security/Core/Authentication/Token/AbstractToken.php b/src/Symfony/Component/Security/Core/Authentication/Token/AbstractToken.php
@@ -230,7 +230,7 @@ private function hasUserChanged(UserInterface $user)
         }
 
         if ($this->user instanceof EquatableInterface) {
-            return !$this->user->isEqualTo($user);
+            return ! (Boolean) $this->user->isEqualTo($user);
         }
 
         if ($this->user->getPassword() !== $user->getPassword()) {
diff --git a/tests/Symfony/Tests/Component/Security/Core/Authentication/Token/AbstractTokenTest.php b/tests/Symfony/Tests/Component/Security/Core/Authentication/Token/AbstractTokenTest.php
@@ -144,8 +144,10 @@ public function testSetUser($user)
     public function getUsers()
     {
         $user = $this->getMock('Symfony\Component\Security\Core\User\UserInterface');
+        $advancedUser = $this->getMock('Symfony\Component\Security\Core\User\AdvancedUserInterface');
 
         return array(
+            array($advancedUser),
             array($user),
             array(new TestUser('foo')),
             array('foo'),
@@ -171,6 +173,7 @@ public function testSetUserSetsAuthenticatedToFalseWhenUserChanges($firstUser, $
     public function getUserChanges()
     {
         $user = $this->getMock('Symfony\Component\Security\Core\User\UserInterface');
+        $advancedUser = $this->getMock('Symfony\Component\Security\Core\User\AdvancedUserInterface');
 
         return array(
             array(
@@ -182,12 +185,21 @@ public function getUserChanges()
             array(
                 'foo', $user,
             ),
+            array(
+                'foo', $advancedUser
+            ),
             array(
                 $user, 'foo'
             ),
+            array(
+                $advancedUser, 'foo'
+            ),
             array(
                 $user, new TestUser('foo'),
             ),
+            array(
+                $advancedUser, new TestUser('foo'),
+            ),
             array(
                 new TestUser('foo'), new TestUser('bar'),
             ),
@@ -197,6 +209,15 @@ public function getUserChanges()
             array(
                 new TestUser('foo'), $user,
             ),
+            array(
+                new TestUser('foo'), $advancedUser,
+            ),
+            array(
+                $user, $advancedUser
+            ),
+            array(
+                $advancedUser, $user
+            ),
         );
     }
 

Original file line number	Diff line number	Diff line change
`@@ -230,7 +230,7 @@ private function hasUserChanged(UserInterface $user)`
`230`	`230`	`}`
`231`	`231`
`232`	`232`	`if ($this->user instanceof EquatableInterface) {`
`233`		`- return !$this->user->isEqualTo($user);`
	`233`	`+ return ! (Boolean) $this->user->isEqualTo($user);`
`234`	`234`	`}`
`235`	`235`
`236`	`236`	`if ($this->user->getPassword() !== $user->getPassword()) {`