diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Dariusz Górecki 2012-01-02 21:24:24 +01:00
parent 9d3a49f065
commit d7ffeb5844
2 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Symfony/Component/Security/Core/Authentication/Token/AbstractToken.php
View File

@ -230,7 +230,7 @@ abstract class AbstractToken implements TokenInterface
} }
if ($this->user instanceof EquatableInterface) { if ($this->user instanceof EquatableInterface) {
return !$this->user->isEqualTo($user); return ! (Boolean) $this->user->isEqualTo($user);
} }
if ($this->user->getPassword() !== $user->getPassword()) { if ($this->user->getPassword() !== $user->getPassword()) {

21
tests/Symfony/Tests/Component/Security/Core/Authentication/Token/AbstractTokenTest.php
View File

@ -144,8 +144,10 @@ class AbstractTokenTest extends \PHPUnit_Framework_TestCase
public function getUsers() public function getUsers()
{ {
$user = $this->getMock('Symfony\Component\Security\Core\User\UserInterface'); $user = $this->getMock('Symfony\Component\Security\Core\User\UserInterface');
$advancedUser = $this->getMock('Symfony\Component\Security\Core\User\AdvancedUserInterface');
return array( return array(
array($advancedUser),
array($user), array($user),
array(new TestUser('foo')), array(new TestUser('foo')),
array('foo'), array('foo'),
@ -171,6 +173,7 @@ class AbstractTokenTest extends \PHPUnit_Framework_TestCase
public function getUserChanges() public function getUserChanges()
{ {
$user = $this->getMock('Symfony\Component\Security\Core\User\UserInterface'); $user = $this->getMock('Symfony\Component\Security\Core\User\UserInterface');
$advancedUser = $this->getMock('Symfony\Component\Security\Core\User\AdvancedUserInterface');
return array( return array(
array( array(
@ -182,12 +185,21 @@ class AbstractTokenTest extends \PHPUnit_Framework_TestCase
array( array(
'foo', $user, 'foo', $user,
), ),
array(
'foo', $advancedUser
),
array( array(
$user, 'foo' $user, 'foo'
), ),
array(
$advancedUser, 'foo'
),
array( array(
$user, new TestUser('foo'), $user, new TestUser('foo'),
), ),
array(
$advancedUser, new TestUser('foo'),
),
array( array(
new TestUser('foo'), new TestUser('bar'), new TestUser('foo'), new TestUser('bar'),
), ),
@ -197,6 +209,15 @@ class AbstractTokenTest extends \PHPUnit_Framework_TestCase
array( array(
new TestUser('foo'), $user, new TestUser('foo'), $user,
), ),
array(
new TestUser('foo'), $advancedUser,
),
array(
$user, $advancedUser
),
array(
$advancedUser, $user
),
); );
} }