summaryrefslogtreecommitdiffstats
path: root/Core
diff options
context:
space:
mode:
Diffstat (limited to 'Core')
-rw-r--r--Core/Tests/Authentication/Token/RememerMeTokenTest.php83
-rw-r--r--Core/Tests/User/AccountCheckerTest.php108
-rw-r--r--Core/Tests/User/InMemoryProviderTest.php62
-rw-r--r--Core/User/UserChecker.php32
4 files changed, 16 insertions, 269 deletions
diff --git a/Core/Tests/Authentication/Token/RememerMeTokenTest.php b/Core/Tests/Authentication/Token/RememerMeTokenTest.php
deleted file mode 100644
index 691f54c..0000000
--- a/Core/Tests/Authentication/Token/RememerMeTokenTest.php
+++ /dev/null
@@ -1,83 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Security\Core\Tests\Authentication\Token;
-
-use Symfony\Component\Security\Core\Authentication\Token\RememberMeToken;
-use Symfony\Component\Security\Core\Role\Role;
-
-class RememberMeTokenTest extends \PHPUnit_Framework_TestCase
-{
- public function testConstructor()
- {
- $user = $this->getUser();
- $token = new RememberMeToken($user, 'fookey', 'foo');
-
- $this->assertEquals('fookey', $token->getProviderKey());
- $this->assertEquals('foo', $token->getKey());
- $this->assertEquals(array(new Role('ROLE_FOO')), $token->getRoles());
- $this->assertSame($user, $token->getUser());
- $this->assertTrue($token->isAuthenticated());
- }
-
- /**
- * @expectedException \InvalidArgumentException
- */
- public function testConstructorKeyCannotBeNull()
- {
- new RememberMeToken(
- $this->getUser(),
- null,
- null
- );
- }
-
- /**
- * @expectedException \InvalidArgumentException
- */
- public function testConstructorKeyCannotBeEmptyString()
- {
- new RememberMeToken(
- $this->getUser(),
- '',
- ''
- );
- }
-
- /**
- * @expectedException \PHPUnit_Framework_Error
- * @dataProvider getUserArguments
- */
- public function testConstructorUserCannotBeNull($user)
- {
- new RememberMeToken($user, 'foo', 'foo');
- }
-
- public function getUserArguments()
- {
- return array(
- array(null),
- array('foo'),
- );
- }
-
- protected function getUser($roles = array('ROLE_FOO'))
- {
- $user = $this->getMock('Symfony\Component\Security\Core\User\UserInterface');
- $user
- ->expects($this->once())
- ->method('getRoles')
- ->will($this->returnValue($roles))
- ;
-
- return $user;
- }
-}
diff --git a/Core/Tests/User/AccountCheckerTest.php b/Core/Tests/User/AccountCheckerTest.php
deleted file mode 100644
index 8d5e203..0000000
--- a/Core/Tests/User/AccountCheckerTest.php
+++ /dev/null
@@ -1,108 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Security\Core\Tests\User;
-
-use Symfony\Component\Security\Core\User\UserChecker;
-
-class UserCheckerTest extends \PHPUnit_Framework_TestCase
-{
- public function testCheckPreAuthNotAdvancedUserInterface()
- {
- $checker = new UserChecker();
-
- $this->assertNull($checker->checkPreAuth($this->getMock('Symfony\Component\Security\Core\User\UserInterface')));
- }
-
- public function testCheckPreAuthPass()
- {
- $checker = new UserChecker();
-
- $account = $this->getMock('Symfony\Component\Security\Core\User\AdvancedUserInterface');
- $account->expects($this->once())->method('isCredentialsNonExpired')->will($this->returnValue(true));
-
- $this->assertNull($checker->checkPreAuth($account));
- }
-
- /**
- * @expectedException \Symfony\Component\Security\Core\Exception\CredentialsExpiredException
- */
- public function testCheckPreAuthCredentialsExpired()
- {
- $checker = new UserChecker();
-
- $account = $this->getMock('Symfony\Component\Security\Core\User\AdvancedUserInterface');
- $account->expects($this->once())->method('isCredentialsNonExpired')->will($this->returnValue(false));
-
- $checker->checkPreAuth($account);
- }
-
- public function testCheckPostAuthNotAdvancedUserInterface()
- {
- $checker = new UserChecker();
-
- $this->assertNull($checker->checkPostAuth($this->getMock('Symfony\Component\Security\Core\User\UserInterface')));
- }
-
- public function testCheckPostAuthPass()
- {
- $checker = new UserChecker();
-
- $account = $this->getMock('Symfony\Component\Security\Core\User\AdvancedUserInterface');
- $account->expects($this->once())->method('isAccountNonLocked')->will($this->returnValue(true));
- $account->expects($this->once())->method('isEnabled')->will($this->returnValue(true));
- $account->expects($this->once())->method('isAccountNonExpired')->will($this->returnValue(true));
-
- $this->assertNull($checker->checkPostAuth($account));
- }
-
- /**
- * @expectedException \Symfony\Component\Security\Core\Exception\LockedException
- */
- public function testCheckPostAuthAccountLocked()
- {
- $checker = new UserChecker();
-
- $account = $this->getMock('Symfony\Component\Security\Core\User\AdvancedUserInterface');
- $account->expects($this->once())->method('isAccountNonLocked')->will($this->returnValue(false));
-
- $checker->checkPostAuth($account);
- }
-
- /**
- * @expectedException \Symfony\Component\Security\Core\Exception\DisabledException
- */
- public function testCheckPostAuthDisabled()
- {
- $checker = new UserChecker();
-
- $account = $this->getMock('Symfony\Component\Security\Core\User\AdvancedUserInterface');
- $account->expects($this->once())->method('isAccountNonLocked')->will($this->returnValue(true));
- $account->expects($this->once())->method('isEnabled')->will($this->returnValue(false));
-
- $checker->checkPostAuth($account);
- }
-
- /**
- * @expectedException \Symfony\Component\Security\Core\Exception\AccountExpiredException
- */
- public function testCheckPostAuthAccountExpired()
- {
- $checker = new UserChecker();
-
- $account = $this->getMock('Symfony\Component\Security\Core\User\AdvancedUserInterface');
- $account->expects($this->once())->method('isAccountNonLocked')->will($this->returnValue(true));
- $account->expects($this->once())->method('isEnabled')->will($this->returnValue(true));
- $account->expects($this->once())->method('isAccountNonExpired')->will($this->returnValue(false));
-
- $checker->checkPostAuth($account);
- }
-}
diff --git a/Core/Tests/User/InMemoryProviderTest.php b/Core/Tests/User/InMemoryProviderTest.php
deleted file mode 100644
index eccb596..0000000
--- a/Core/Tests/User/InMemoryProviderTest.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Security\Core\Tests\User;
-
-use Symfony\Component\Security\Core\User\InMemoryUserProvider;
-use Symfony\Component\Security\Core\User\User;
-
-class InMemoryUserProviderTest extends \PHPUnit_Framework_TestCase
-{
- public function testConstructor()
- {
- $provider = new InMemoryUserProvider(array(
- 'fabien' => array(
- 'password' => 'foo',
- 'enabled' => false,
- 'roles' => array('ROLE_USER'),
- ),
- ));
-
- $user = $provider->loadUserByUsername('fabien');
- $this->assertEquals('foo', $user->getPassword());
- $this->assertEquals(array('ROLE_USER'), $user->getRoles());
- $this->assertFalse($user->isEnabled());
- }
-
- public function testCreateUser()
- {
- $provider = new InMemoryUserProvider();
- $provider->createUser(new User('fabien', 'foo'));
-
- $user = $provider->loadUserByUsername('fabien');
- $this->assertEquals('foo', $user->getPassword());
- }
-
- /**
- * @expectedException \LogicException
- */
- public function testCreateUserAlreadyExist()
- {
- $provider = new InMemoryUserProvider();
- $provider->createUser(new User('fabien', 'foo'));
- $provider->createUser(new User('fabien', 'foo'));
- }
-
- /**
- * @expectedException \Symfony\Component\Security\Core\Exception\UsernameNotFoundException
- */
- public function testLoadUserByUsernameDoesNotExist()
- {
- $provider = new InMemoryUserProvider();
- $provider->loadUserByUsername('fabien');
- }
-}
diff --git a/Core/User/UserChecker.php b/Core/User/UserChecker.php
index 8dde3a6..ac577a3 100644
--- a/Core/User/UserChecker.php
+++ b/Core/User/UserChecker.php
@@ -32,22 +32,6 @@ class UserChecker implements UserCheckerInterface
return;
}
- if (!$user->isCredentialsNonExpired()) {
- $ex = new CredentialsExpiredException('User credentials have expired.');
- $ex->setUser($user);
- throw $ex;
- }
- }
-
- /**
- * {@inheritdoc}
- */
- public function checkPostAuth(UserInterface $user)
- {
- if (!$user instanceof AdvancedUserInterface) {
- return;
- }
-
if (!$user->isAccountNonLocked()) {
$ex = new LockedException('User account is locked.');
$ex->setUser($user);
@@ -66,4 +50,20 @@ class UserChecker implements UserCheckerInterface
throw $ex;
}
}
+
+ /**
+ * {@inheritdoc}
+ */
+ public function checkPostAuth(UserInterface $user)
+ {
+ if (!$user instanceof AdvancedUserInterface) {
+ return;
+ }
+
+ if (!$user->isCredentialsNonExpired()) {
+ $ex = new CredentialsExpiredException('User credentials have expired.');
+ $ex->setUser($user);
+ throw $ex;
+ }
+ }
}
generated by cgit v1.1 at 2025-05-17 03:23:45 +0000