diff options
| author | Fabien Potencier <fabien.potencier@gmail.com> | 2013-09-19 11:45:20 +0200 |
|---|---|---|
| committer | Fabien Potencier <fabien.potencier@gmail.com> | 2013-09-19 11:45:20 +0200 |
| commit | fad88962af2ecb3e54e13c1f9e8045fd589e693f (patch) | |
| tree | 9e24da773d04ada4b25b778c25392512e10d91e6 /Core | |
| parent | 249d6e8f35504cb9bfcc3fb1895f41393e8c9e96 (diff) | |
| parent | c30af3532143759579e27c90c01e7c38e830cc80 (diff) | |
| download | symfony-security-fad88962af2ecb3e54e13c1f9e8045fd589e693f.zip symfony-security-fad88962af2ecb3e54e13c1f9e8045fd589e693f.tar.gz symfony-security-fad88962af2ecb3e54e13c1f9e8045fd589e693f.tar.bz2 | |
Merge branch '2.2' into 2.3
* 2.2:
Fix some annotates
[FrameworkBundle] made sure that the debug event dispatcher is used everywhere
[HttpKernel] remove unneeded strtoupper
updated the composer install command to reflect changes in Composer
Conflicts:
src/Symfony/Component/Console/Application.php
src/Symfony/Component/Console/Command/Command.php
src/Symfony/Component/Console/Input/InputDefinition.php
src/Symfony/Component/CssSelector/Node/CombinedSelectorNode.php
src/Symfony/Component/Form/Form.php
src/Symfony/Component/HttpKernel/Debug/ErrorHandler.php
src/Symfony/Component/HttpKernel/DependencyInjection/RegisterListenersPass.php
src/Symfony/Component/HttpKernel/Tests/DependencyInjection/RegisterListenersPassTest.php
src/Symfony/Component/Locale/Locale.php
src/Symfony/Component/Locale/README.md
src/Symfony/Component/Locale/Stub/DateFormat/FullTransformer.php
Diffstat (limited to 'Core')
| -rw-r--r-- | Core/Authentication/RememberMe/PersistentToken.php | 2 | ||||
| -rw-r--r-- | Core/Authentication/RememberMe/TokenProviderInterface.php | 2 | ||||
| -rw-r--r-- | Core/Authentication/Token/AnonymousToken.php | 2 | ||||
| -rw-r--r-- | Core/Authentication/Token/UsernamePasswordToken.php | 2 | ||||
| -rw-r--r-- | Core/User/UserInterface.php | 2 |
5 files changed, 9 insertions, 1 deletions
diff --git a/Core/Authentication/RememberMe/PersistentToken.php b/Core/Authentication/RememberMe/PersistentToken.php index f3f6858..8919be9 100644 --- a/Core/Authentication/RememberMe/PersistentToken.php +++ b/Core/Authentication/RememberMe/PersistentToken.php @@ -100,7 +100,7 @@ final class PersistentToken implements PersistentTokenInterface /** * Returns the time the token was last used * - * @return DateTime + * @return \DateTime */ public function getLastUsed() { diff --git a/Core/Authentication/RememberMe/TokenProviderInterface.php b/Core/Authentication/RememberMe/TokenProviderInterface.php index 44bf4b0..93ed8d3 100644 --- a/Core/Authentication/RememberMe/TokenProviderInterface.php +++ b/Core/Authentication/RememberMe/TokenProviderInterface.php @@ -11,6 +11,8 @@ namespace Symfony\Component\Security\Core\Authentication\RememberMe; +use Symfony\Component\Security\Core\Exception\TokenNotFoundException; + /** * Interface for TokenProviders * diff --git a/Core/Authentication/Token/AnonymousToken.php b/Core/Authentication/Token/AnonymousToken.php index 9b0a084..cabb6d5 100644 --- a/Core/Authentication/Token/AnonymousToken.php +++ b/Core/Authentication/Token/AnonymousToken.php @@ -11,6 +11,8 @@ namespace Symfony\Component\Security\Core\Authentication\Token; +use Symfony\Component\Security\Core\Role\RoleInterface; + /** * AnonymousToken represents an anonymous token. * diff --git a/Core/Authentication/Token/UsernamePasswordToken.php b/Core/Authentication/Token/UsernamePasswordToken.php index d6e3998..3854242 100644 --- a/Core/Authentication/Token/UsernamePasswordToken.php +++ b/Core/Authentication/Token/UsernamePasswordToken.php @@ -11,6 +11,8 @@ namespace Symfony\Component\Security\Core\Authentication\Token; +use Symfony\Component\Security\Core\Role\RoleInterface; + /** * UsernamePasswordToken implements a username and password token. * diff --git a/Core/User/UserInterface.php b/Core/User/UserInterface.php index 6e9b0f1..1b52dab 100644 --- a/Core/User/UserInterface.php +++ b/Core/User/UserInterface.php @@ -11,6 +11,8 @@ namespace Symfony\Component\Security\Core\User; +use Symfony\Component\Security\Core\Role\Role; + /** * Represents the interface that all user classes must implement. * |