summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Acl/Model/MutableAclProviderInterface.php2
-rw-r--r--Core/Authentication/Provider/UserAuthenticationProvider.php2
-rw-r--r--Tests/Core/Authentication/AuthenticationTrustResolverTest.php2
-rw-r--r--Tests/Http/Firewall/ChannelListenerTest.php1
-rw-r--r--Tests/Http/Logout/DefaultLogoutSuccessHandlerTest.php1
-rw-r--r--Tests/Http/RememberMe/PersistentTokenBasedRememberMeServicesTest.php1
-rw-r--r--Tests/Http/RememberMe/TokenBasedRememberMeServicesTest.php1
7 files changed, 3 insertions, 7 deletions
diff --git a/Acl/Model/MutableAclProviderInterface.php b/Acl/Model/MutableAclProviderInterface.php
index f94ddc5..95f531e 100644
--- a/Acl/Model/MutableAclProviderInterface.php
+++ b/Acl/Model/MutableAclProviderInterface.php
@@ -11,6 +11,8 @@
namespace Symfony\Component\Security\Acl\Model;
+use Symfony\Component\Security\Acl\Exception\AclAlreadyExistsException;
+
/**
* Provides support for creating and storing ACL instances.
*
diff --git a/Core/Authentication/Provider/UserAuthenticationProvider.php b/Core/Authentication/Provider/UserAuthenticationProvider.php
index 3728c01..b948135 100644
--- a/Core/Authentication/Provider/UserAuthenticationProvider.php
+++ b/Core/Authentication/Provider/UserAuthenticationProvider.php
@@ -113,7 +113,7 @@ abstract class UserAuthenticationProvider implements AuthenticationProviderInter
* @param UserInterface $user The user
* @param TokenInterface $token The token
*
- * @return Role[] The user roles
+ * @return array The user roles
*/
private function getRoles(UserInterface $user, TokenInterface $token)
{
diff --git a/Tests/Core/Authentication/AuthenticationTrustResolverTest.php b/Tests/Core/Authentication/AuthenticationTrustResolverTest.php
index c3b1585..e2fc593 100644
--- a/Tests/Core/Authentication/AuthenticationTrustResolverTest.php
+++ b/Tests/Core/Authentication/AuthenticationTrustResolverTest.php
@@ -11,8 +11,6 @@
namespace Symfony\Component\Security\Tests\Core\Authentication;
-use Symfony\Component\Security\Core\Authentication\Token\AnonymousToken;
-use Symfony\Component\Security\Core\Authentication\Token\RememberMeToken;
use Symfony\Component\Security\Core\Authentication\AuthenticationTrustResolver;
class AuthenticationTrustResolverTest extends \PHPUnit_Framework_TestCase
diff --git a/Tests/Http/Firewall/ChannelListenerTest.php b/Tests/Http/Firewall/ChannelListenerTest.php
index 17bf0a0..e33a8dc 100644
--- a/Tests/Http/Firewall/ChannelListenerTest.php
+++ b/Tests/Http/Firewall/ChannelListenerTest.php
@@ -12,7 +12,6 @@
namespace Symfony\Component\Security\Tests\Http\Firewall;
use Symfony\Component\Security\Http\Firewall\ChannelListener;
-use Symfony\Component\HttpKernel\Event\GetResponseEvent;
use Symfony\Component\HttpFoundation\Response;
class ChannelListenerTest extends \PHPUnit_Framework_TestCase
diff --git a/Tests/Http/Logout/DefaultLogoutSuccessHandlerTest.php b/Tests/Http/Logout/DefaultLogoutSuccessHandlerTest.php
index e1b1227..562d127 100644
--- a/Tests/Http/Logout/DefaultLogoutSuccessHandlerTest.php
+++ b/Tests/Http/Logout/DefaultLogoutSuccessHandlerTest.php
@@ -11,7 +11,6 @@
namespace Symfony\Component\Security\Tests\Http\Logout;
-use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\Security\Http\Logout\DefaultLogoutSuccessHandler;
class DefaultLogoutSuccessHandlerTest extends \PHPUnit_Framework_TestCase
diff --git a/Tests/Http/RememberMe/PersistentTokenBasedRememberMeServicesTest.php b/Tests/Http/RememberMe/PersistentTokenBasedRememberMeServicesTest.php
index 9c650b2..d9593fc 100644
--- a/Tests/Http/RememberMe/PersistentTokenBasedRememberMeServicesTest.php
+++ b/Tests/Http/RememberMe/PersistentTokenBasedRememberMeServicesTest.php
@@ -12,7 +12,6 @@
namespace Symfony\Component\Security\Tests\Http\RememberMe;
use Symfony\Component\Security\Http\RememberMe\RememberMeServicesInterface;
-use Symfony\Component\Security\Core\Authentication\Token\RememberMeToken;
use Symfony\Component\Security\Core\Exception\UsernameNotFoundException;
use Symfony\Component\Security\Core\Authentication\RememberMe\PersistentToken;
use Symfony\Component\HttpFoundation\Request;
diff --git a/Tests/Http/RememberMe/TokenBasedRememberMeServicesTest.php b/Tests/Http/RememberMe/TokenBasedRememberMeServicesTest.php
index ea5b781..c7dfa12 100644
--- a/Tests/Http/RememberMe/TokenBasedRememberMeServicesTest.php
+++ b/Tests/Http/RememberMe/TokenBasedRememberMeServicesTest.php
@@ -12,7 +12,6 @@
namespace Symfony\Component\Security\Tests\Http\RememberMe;
use Symfony\Component\Security\Http\RememberMe\RememberMeServicesInterface;
-use Symfony\Component\Security\Core\Authentication\Token\RememberMeToken;
use Symfony\Component\Security\Core\Exception\UsernameNotFoundException;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response;