8000 Visibility changes by schmittjoh · Pull Request #198 · symfony/symfony · GitHub
[go: up one dir, main page]
Skip to content

Visibility changes #198

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
6 commits merged into from
Mar 10, 2011
Merged

Visibility changes #198

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1d5538f
[Security] various changes, see below
schmittjoh Mar 7, 2011
5127ece
[Security] fixed some left-overs
schmittjoh Mar 8, 2011
13665fc
[Security] added some more tests
schmittjoh Mar 9, 2011
a64cc0e
[Security] some more visibility changes
schmittjoh Mar 9, 2011
3e5fe74
Merge branch 'master' of git://github.com/petajaros/symfony into visi…
schmittjoh Mar 10, 2011
76e3302
[Security] renamed Twig function has_role to is_granted
schmittjoh Mar 10, 2011
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
[Security] added some more tests
  • Loading branch information
@schmittjoh
schmittjoh committed Mar 10, 2011
commit 13665fc113c1be82a306a691b04c9bd1b1a20e98
2 changes: 1 addition & 1 deletion src/Symfony/Bundle/SecurityBundle/Templating/Helper/SecurityHelper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
/**
* SecurityHelper provides read-only access to the security context.
*
* @author Fabien Potencier <fabien.potencier@symfony-project.com>
* @author Fabien Potencier <fabien@symfony.com>
*/
class SecurityHelper extends Helper
{
Expand Down
8 changes: 6 additions & 2 deletions src/Symfony/Component/Security/Core/Authentication/Token/AbstractToken.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,11 +84,15 @@ public function setUser($user)
if (null === $this->user) {
$changed = false;
} else if ($this->user instanceof UserInterface) {
$changed = $this->user->equals($user);
if (!$user instanceof UserInterface) {
$changed = true;
} else {
$changed = !$this->user->equals($user);
}
} else if ($user instanceof UserInterface) {
$changed = true;
} else {
$changed = (string) $this->user === (string) $user;
$changed = (string) $this->user !== (string) $user;
}

if ($changed) {
Expand Down
11 changes: 10 additions & 1 deletion src/Symfony/Component/Security/Core/Authentication/Token/RememberMeToken.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,16 @@ public function __construct(UserInterface $user, $providerKey, $key, PersistentT
$this->persistentToken = $persistentToken;

$this->setUser($user);
$this->setAuthenticated(true);
parent::setAuthenticated(true);
}

public function setAuthenticated($authenticated)
{
if ($authenticated) {
throw new \RuntimeException('You cannot set this token to authenticated after creation.');
}

parent::setAuthenticated(false);
}

public function getProviderKey()
Expand Down
98 changes: 98 additions & 0 deletions tests/Symfony/Tests/Component/Security/Core/Authentication/Token/AbstractTokenTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,104 @@ public function testAttributes()
}
}

/**
* @dataProvider getUsers
*/
public function testSetUser($user)
{
$token = $this->getToken();
$token->setUser($user);
$this->assertSame($user, $token->getUser());
}

public function getUsers()
{
$user = $this->getMock('Symfony\Component\Security\Core\User\UserInterface');
$user
->expects($this->any())
->method('equals')
->will($this->returnValue(true))
;

return array(
array($user),
array(new TestUser('foo')),
array('foo'),
);
}

/**
* @dataProvider getUserChanges
*/
public function testSetUserSetsAuthenticatedToFalseWhenUserChanges($firstUser, $secondUser)
{
$token = $this->getToken();
$token->setAuthenticated(true);
$this->assertTrue($token->isAuthenticated());

$token->setUser($firstUser);
$this->assertTrue($token->isAuthenticated());

$token->setUser($secondUser);
$this->assertFalse($token->isAuthenticated());
}

public function getUserChanges()
{
$user = $this->getMock('Symfony\Component\Security\Core\User\UserInterface');
$user
->expects($this->any())
->method('equals')
->will($this->returnValue(false))
;

return array(
array(
'foo', 'bar',
),
array(
'foo', new TestUser('bar'),
),
array(
'foo', $user,
),
array(
$user, $user,
),
array(
$user, 'foo'
),
array(
$user, new TestUser('foo'),
),
array(
new TestUser('foo'), new TestUser('bar'),
),
array(
new TestUser('foo'), 'bar',
),
array(
new TestUser('foo'), $user,
),
);
}

/**
* @dataProvider getUsers
*/
public function testSetUserDoesNotSetAuthenticatedToFalseWhenUserDoesNotChange($user)
{
$token = $this->getToken();
$token->setAuthenticated(true);
$this->assertTrue($token->isAuthenticated());

$token->setUser($user);
$this->assertTrue($token->isAuthenticated());

$token->setUser($user);
$this->assertTrue($token->isAuthenticated());
}

protected function getToken(array $roles = array())
{
return $this->getMockForAbstractClass('Symfony\Component\Security\Core\Authentication\Token\AbstractToken', array($roles));
Expand Down
0