namespace changes

Symfony\Component\Security -> Symfony\Component\Security\Core
Symfony\Component\Security\Acl remains unchanged
Symfony\Component\HttpKernel\Security -> Symfony\Component\Security\Http

src/Symfony/Bundle/DoctrineBundle/Security/EntityUserProvider.php

@@ -11,10 +11,10 @@
 
 namespace Symfony\Bundle\DoctrineBundle\Security;
 
-use Symfony\Component\Security\User\AccountInterface;
+use Symfony\Component\Security\Core\User\AccountInterface;
-use Symfony\Component\Security\User\UserProviderInterface;
+use Symfony\Component\Security\Core\User\UserProviderInterface;
-use Symfony\Component\Security\Exception\UnsupportedAccountException;
+use Symfony\Component\Security\Core\Exception\UnsupportedAccountException;
-use Symfony\Component\Security\Exception\UsernameNotFoundException;
+use Symfony\Component\Security\Core\Exception\UsernameNotFoundException;
 
 class EntityUserProvider implements UserProviderInterface
 {

src/Symfony/Bundle/DoctrineMongoDBBundle/Security/DocumentUserProvider.php

@@ -11,10 +11,10 @@
 
 namespace Symfony\Bundle\DoctrineMongoDBBundle\Security;
 
-use Symfony\Component\Security\User\AccountInterface;
+use Symfony\Component\Security\Core\User\AccountInterface;
-use Symfony\Component\Security\User\UserProviderInterface;
+use Symfony\Component\Security\Core\User\UserProviderInterface;
-use Symfony\Component\Security\Exception\UnsupportedAccountException;
+use Symfony\Component\Security\Core\Exception\UnsupportedAccountException;
-use Symfony\Component\Security\Exception\UsernameNotFoundException;
+use Symfony\Component\Security\Core\Exception\UsernameNotFoundException;
 
 class DocumentUserProvider implements UserProviderInterface
 {

src/Symfony/Bundle/FrameworkBundle/Controller/ExceptionController.php

@@ -74,7 +74,7 @@ class ExceptionController extends ContainerAware
     protected function getStatusCode(FlattenException $exception)
     {
         switch ($exception->getClass()) {
-            case 'Symfony\Component\Security\Exception\AccessDeniedException':
+            case 'Symfony\Component\Security\Core\Exception\AccessDeniedException':
                 return 403;
             case 'Symfony\Component\HttpKernel\Exception\NotFoundHttpException':
                 return 404;

src/Symfony/Bundle/SecurityBundle/DataCollector/SecurityDataCollector.php

@@ -11,7 +11,7 @@
 
 namespace Symfony\Bundle\SecurityBundle\DataCollector;
 
-use Symfony\Component\Security\SecurityContext;
+use Symfony\Component\Security\Core\SecurityContext;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 

src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php

@@ -596,7 +596,7 @@ class SecurityExtension extends Extension
             $userId = $name.'_'.md5(serialize(array($username, $user['password'], $user['roles'])));
 
             $container
-                ->register($userId, 'Symfony\Component\Security\User\User')
+                ->register($userId, 'Symfony\Component\Security\Core\User\User')
                 ->setArguments(array($username, $user['password'], $user['roles']))
                 ->setPublic(false)
             ;

src/Symfony/Bundle/SecurityBundle/Resources/config/security.xml

@@ -5,61 +5,61 @@
     xsi:schemaLocation="http://www.symfony-project.org/schema/dic/services http://www.symfony-project.org/schema/dic/services/services-1.0.xsd">
 
     <parameters>
-        <parameter key="security.context.class">Symfony\Component\Security\SecurityContext</parameter>
+        <parameter key="security.context.class">Symfony\Component\Security\Core\SecurityContext</parameter>
         <parameter key="security.context.always_authenticate">false</parameter>
 
-        <parameter key="security.account_checker.class">Symfony\Component\Security\User\AccountChecker</parameter>
+        <parameter key="security.account_checker.class">Symfony\Component\Security\Core\User\AccountChecker</parameter>
 
         <parameter key="security.access_denied.url">null</parameter>
 
-        <parameter key="security.encoder_factory.generic.class">Symfony\Component\Security\Encoder\EncoderFactory</parameter>
+        <parameter key="security.encoder_factory.generic.class">Symfony\Component\Security\Core\Encoder\EncoderFactory</parameter>
-        <parameter key="security.encoder.digest.class">Symfony\Component\Security\Encoder\MessageDigestPasswordEncoder</parameter>
+        <parameter key="security.encoder.digest.class">Symfony\Component\Security\Core\Encoder\MessageDigestPasswordEncoder</parameter>
-        <parameter key="security.encoder.plain.class">Symfony\Component\Security\Encoder\PlaintextPasswordEncoder</parameter>
+        <parameter key="security.encoder.plain.class">Symfony\Component\Security\Core\Encoder\PlaintextPasswordEncoder</parameter>
 
-        <parameter key="security.user.provider.in_memory.class">Symfony\Component\Security\User\InMemoryUserProvider</parameter>
+        <parameter key="security.user.provider.in_memory.class">Symfony\Component\Security\Core\User\InMemoryUserProvider</parameter>
 
-        <parameter key="security.authentication.trust_resolver.class">Symfony\Component\Security\Authentication\AuthenticationTrustResolver</parameter>
+        <parameter key="security.authentication.trust_resolver.class">Symfony\Component\Security\Core\Authentication\AuthenticationTrustResolver</parameter>
-        <parameter key="security.authentication.trust_resolver.anonymous_class">Symfony\Component\Security\Authentication\Token\AnonymousToken</parameter>
+        <parameter key="security.authentication.trust_resolver.anonymous_class">Symfony\Component\Security\Core\Authentication\Token\AnonymousToken</parameter>
-        <parameter key="security.authentication.trust_resolver.rememberme_class">Symfony\Component\Security\Authentication\Token\RememberMeToken</parameter>
+        <parameter key="security.authentication.trust_resolver.rememberme_class">Symfony\Component\Security\Core\Authentication\Token\RememberMeToken</parameter>
 
-        <parameter key="security.authentication.provider.dao.class">Symfony\Component\Security\Authentication\Provider\DaoAuthenticationProvider</parameter>
+        <parameter key="security.authentication.provider.dao.class">Symfony\Component\Security\Core\Authentication\Provider\DaoAuthenticationProvider</parameter>
-        <parameter key="security.authentication.provider.pre_authenticated.class">Symfony\Component\Security\Authentication\Provider\PreAuthenticatedAuthenticationProvider</parameter>
+        <parameter key="security.authentication.provider.pre_authenticated.class">Symfony\Component\Security\Core\Authentication\Provider\PreAuthenticatedAuthenticationProvider</parameter>
-        <parameter key="security.authentication.provider.rememberme.class">Symfony\Component\Security\Authentication\Provider\RememberMeAuthenticationProvider</parameter>
+        <parameter key="security.authentication.provider.rememberme.class">Symfony\Component\Security\Core\Authentication\Provider\RememberMeAuthenticationProvider</parameter>
 
-        <parameter key="security.authentication.manager.class">Symfony\Component\Security\Authentication\AuthenticationProviderManager</parameter>
+        <parameter key="security.authentication.manager.class">Symfony\Component\Security\Core\Authentication\AuthenticationProviderManager</parameter>
         
-        <parameter key="security.authentication.retry_entry_point.class">Symfony\Bundle\SecurityBundle\Security\EntryPoint\RetryAuthenticationEntryPoint</parameter>
+        <parameter key="security.authentication.retry_entry_point.class">Symfony\Component\Security\Http\EntryPoint\RetryAuthenticationEntryPoint</parameter>
 
-        <parameter key="security.authentication.session_strategy.class">Symfony\Bundle\SecurityBundle\Security\Session\SessionAuthenticationStrategy</parameter>
+        <parameter key="security.authentication.session_strategy.class">Symfony\Component\Security\Http\Session\SessionAuthenticationStrategy</parameter>
         <parameter key="security.authentication.session_strategy.strategy">migrate</parameter>
 
-        <parameter key="security.authentication.form_entry_point.class">Symfony\Bundle\SecurityBundle\Security\EntryPoint\FormAuthenticationEntryPoint</parameter>
+        <parameter key="security.authentication.form_entry_point.class">Symfony\Component\Security\Http\EntryPoint\FormAuthenticationEntryPoint</parameter>
-        <parameter key="security.authentication.listener.form.class">Symfony\Bundle\SecurityBundle\Security\Firewall\UsernamePasswordFormAuthenticationListener</parameter>
+        <parameter key="security.authentication.listener.form.class">Symfony\Component\Security\Http\Firewall\UsernamePasswordFormAuthenticationListener</parameter>
         <parameter key="security.authentication.form.options" type="collection" />
 
-        <parameter key="security.authentication.basic_entry_point.class">Symfony\Bundle\SecurityBundle\Security\EntryPoint\BasicAuthenticationEntryPoint</parameter>
+        <parameter key="security.authentication.basic_entry_point.class">Symfony\Component\Security\Http\EntryPoint\BasicAuthenticationEntryPoint</parameter>
         <parameter key="security.authentication.basic_entry_point.realm">Symfony2</parameter>
 
-        <parameter key="security.authentication.digest_entry_point.class">Symfony\Bundle\SecurityBundle\Security\EntryPoint\DigestAuthenticationEntryPoint</parameter>
+        <parameter key="security.authentication.digest_entry_point.class">Symfony\Component\Security\Http\EntryPoint\DigestAuthenticationEntryPoint</parameter>
         <parameter key="security.authentication.digest_entry_point.realm">Symfony2</parameter>
         <parameter key="security.authentication.digest_entry_point.key">SomethingUnique</parameter>
 
-        <parameter key="security.authentication.listener.x509.class">Symfony\Bundle\SecurityBundle\Security\Firewall\X509AuthenticationListener</parameter>
+        <parameter key="security.authentication.listener.x509.class">Symfony\Component\Security\Http\Firewall\X509AuthenticationListener</parameter>
         <parameter key="security.authentication.x509.user">SSL_CLIENT_S_DN_Email</parameter>
         <parameter key="security.authentication.x509.credentials">SSL_CLIENT_S_DN</parameter>
 
-        <parameter key="security.authentication.listener.basic.class">Symfony\Bundle\SecurityBundle\Security\Firewall\BasicAuthenticationListener</parameter>
+        <parameter key="security.authentication.listener.basic.class">Symfony\Component\Security\Http\Firewall\BasicAuthenticationListener</parameter>
-        <parameter key="security.authentication.listener.digest.class">Symfony\Bundle\SecurityBundle\Security\Firewall\DigestAuthenticationListener</parameter>
+        <parameter key="security.authentication.listener.digest.class">Symfony\Component\Security\Http\Firewall\DigestAuthenticationListener</parameter>
-        <parameter key="security.authentication.listener.anonymous.class">Symfony\Bundle\SecurityBundle\Security\Firewall\AnonymousAuthenticationListener</parameter>
+        <parameter key="security.authentication.listener.anonymous.class">Symfony\Component\Security\Http\Firewall\AnonymousAuthenticationListener</parameter>
         
-        <parameter key="security.authentication.provider.anonymous">Symfony\Component\Security\Authentication\Provider\AnonymousAuthenticationProvider</parameter>
+        <parameter key="security.authentication.provider.anonymous">Symfony\Component\Security\Core\Authentication\Provider\AnonymousAuthenticationProvider</parameter>
         <parameter key="security.anonymous.key">SomeRandomValue</parameter>
 
-        <parameter key="security.authentication.listener.rememberme.class">Symfony\Bundle\SecurityBundle\Security\Firewall\RememberMeListener</parameter>
+        <parameter key="security.authentication.listener.rememberme.class">Symfony\Component\Security\Http\Firewall\RememberMeListener</parameter>
-        <parameter key="security.rembemerme.token.provider.in_memory.class">Symfony\Component\Security\Authentication\RememberMe\InMemoryTokenProvider</parameter>
+        <parameter key="security.rembemerme.token.provider.in_memory.class">Symfony\Component\Security\Core\Authentication\RememberMe\InMemoryTokenProvider</parameter>
         
-        <parameter key="security.authentication.rememberme.services.persistent.class">Symfony\Bundle\SecurityBundle\Security\RememberMe\PersistentTokenBasedRememberMeServices</parameter>
+        <parameter key="security.authentication.rememberme.services.persistent.class">Symfony\Component\Security\Http\RememberMe\PersistentTokenBasedRememberMeServices</parameter>
-        <parameter key="security.authentication.rememberme.services.simplehash.class">Symfony\Bundle\SecurityBundle\Security\RememberMe\TokenBasedRememberMeServices</parameter>
+        <parameter key="security.authentication.rememberme.services.simplehash.class">Symfony\Component\Security\Http\RememberMe\TokenBasedRememberMeServices</parameter>
         <parameter key="security.authentication.rememberme.services.options.name">SYMFONY_REMEMBERME</parameter>
         <parameter key="security.authentication.rememberme.services.options.lifetime">31536000</parameter>
         <parameter key="security.authentication.rememberme.services.options.path">/</parameter>
@@ -69,39 +69,39 @@
         <parameter key="security.authentication.rememberme.services.options.always_remember_me">false</parameter>
         <parameter key="security.authentication.rememberme.services.options.remember_me_parameter">_remember_me</parameter>
         
-        <parameter key="security.channel_listener.class">Symfony\Bundle\SecurityBundle\Security\Firewall\ChannelListener</parameter>
+        <parameter key="security.channel_listener.class">Symfony\Component\Security\Http\Firewall\ChannelListener</parameter>
 
-        <parameter key="security.logout_listener.class">Symfony\Bundle\SecurityBundle\Security\Firewall\LogoutListener</parameter>
+        <parameter key="security.logout_listener.class">Symfony\Component\Security\Http\Firewall\LogoutListener</parameter>
         <parameter key="security.logout.path">/logout</parameter>
         <parameter key="security.logout.target_path">/</parameter>
-        <parameter key="security.logout.handler.session.class">Symfony\Bundle\SecurityBundle\Security\Logout\SessionLogoutHandler</parameter>
+        <parameter key="security.logout.handler.session.class">Symfony\Component\Security\Http\Logout\SessionLogoutHandler</parameter>
-        <parameter key="security.logout.handler.cookie_clearing.class">Symfony\Bundle\SecurityBundle\Security\Logout\CookieClearingLogoutHandler</parameter>
+        <parameter key="security.logout.handler.cookie_clearing.class">Symfony\Component\Security\Http\Logout\CookieClearingLogoutHandler</parameter>
 
-        <parameter key="security.authentication.switchuser_listener.class">Symfony\Bundle\SecurityBundle\Security\Firewall\SwitchUserListener</parameter>
+        <parameter key="security.authentication.switchuser_listener.class">Symfony\Component\Security\Http\Firewall\SwitchUserListener</parameter>
         <parameter key="security.authentication.switchuser.role">ROLE_ALLOWED_TO_SWITCH</parameter>
         <parameter key="security.authentication.switchuser.parameter">_switch_user</parameter>
 
-        <parameter key="security.access.decision_manager.class">Symfony\Component\Security\Authorization\AccessDecisionManager</parameter>
+        <parameter key="security.access.decision_manager.class">Symfony\Component\Security\Core\Authorization\AccessDecisionManager</parameter>
         <parameter key="security.access.decision_manager.strategy">affirmative</parameter>
         <parameter key="security.access.decision_manager.allow_if_all_abstain">false</parameter>
         <parameter key="security.access.decision_manager.allow_if_equal_granted_denied">true</parameter>
         
         <parameter key="security.access.denied_url">/access_denied</parameter>
         
-        <parameter key="security.access.simple_role_voter.class">Symfony\Component\Security\Authorization\Voter\RoleVoter</parameter>
+        <parameter key="security.access.simple_role_voter.class">Symfony\Component\Security\Core\Authorization\Voter\RoleVoter</parameter>
-        <parameter key="security.access.authenticated_voter.class">Symfony\Component\Security\Authorization\Voter\AuthenticatedVoter</parameter>
+        <parameter key="security.access.authenticated_voter.class">Symfony\Component\Security\Core\Authorization\Voter\AuthenticatedVoter</parameter>
-        <parameter key="security.access.role_hierarchy_voter.class">Symfony\Component\Security\Authorization\Voter\RoleHierarchyVoter</parameter>
+        <parameter key="security.access.role_hierarchy_voter.class">Symfony\Component\Security\Core\Authorization\Voter\RoleHierarchyVoter</parameter>
 
-        <parameter key="security.access_listener.class">Symfony\Bundle\SecurityBundle\Security\Firewall\AccessListener</parameter>
+        <parameter key="security.access_listener.class">Symfony\Component\Security\Http\Firewall\AccessListener</parameter>
-        <parameter key="security.access_map.class">Symfony\Bundle\SecurityBundle\Security\AccessMap</parameter>
+        <parameter key="security.access_map.class">Symfony\Component\Security\Http\AccessMap</parameter>
-        <parameter key="security.exception_listener.class">Symfony\Bundle\SecurityBundle\Security\Firewall\ExceptionListener</parameter>
+        <parameter key="security.exception_listener.class">Symfony\Component\Security\Http\Firewall\ExceptionListener</parameter>
-        <parameter key="security.context_listener.class">Symfony\Bundle\SecurityBundle\Security\Firewall\ContextListener</parameter>
+        <parameter key="security.context_listener.class">Symfony\Component\Security\Http\Firewall\ContextListener</parameter>
-        <parameter key="security.firewall.class">Symfony\Bundle\SecurityBundle\Security\Firewall</parameter>
+        <parameter key="security.firewall.class">Symfony\Component\Security\Http\Firewall</parameter>
         <parameter key="security.firewall.map.class">Symfony\Bundle\SecurityBundle\Security\FirewallMap</parameter>
         <parameter key="security.firewall.context.class">Symfony\Bundle\SecurityBundle\Security\FirewallContext</parameter>
         <parameter key="security.matcher.class">Symfony\Component\HttpFoundation\RequestMatcher</parameter>
 
-        <parameter key="security.role_hierarchy.class">Symfony\Component\Security\Role\RoleHierarchy</parameter>
+        <parameter key="security.role_hierarchy.class">Symfony\Component\Security\Core\Role\RoleHierarchy</parameter>
     </parameters>
 
     <services>

src/Symfony/Bundle/SecurityBundle/Security/FirewallContext.php

@@ -2,7 +2,7 @@
 
 namespace Symfony\Bundle\SecurityBundle\Security;
 
-use Symfony\Bundle\SecurityBundle\Security\Firewall\ExceptionListener;
+use Symfony\Component\Security\Http\Firewall\ExceptionListener;
 
 /**
  * This is a wrapper around the actual firewall configuration which allows us

src/Symfony/Bundle/SecurityBundle/Security/FirewallMap.php

@@ -2,7 +2,7 @@
 
 namespace Symfony\Bundle\SecurityBundle\Security;
 
-use Symfony\Bundle\SecurityBundle\Security\FirewallMapInterface;
+use Symfony\Component\Security\Http\FirewallMapInterface;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 

src/Symfony/Bundle/SecurityBundle/Templating/Helper/SecurityHelper.php

@@ -12,7 +12,7 @@
 namespace Symfony\Bundle\SecurityBundle\Templating\Helper;
 
 use Symfony\Component\Templating\Helper\Helper;
-use Symfony\Component\Security\SecurityContext;
+use Symfony\Component\Security\Core\SecurityContext;
 
 /**
  * SecurityHelper provides read-only access to the security context.

src/Symfony/Bundle/SecurityBundle/Twig/Extension/SecurityExtension.php

@@ -11,7 +11,7 @@
 
 namespace Symfony\Bundle\SecurityBundle\Twig\Extension;
 
-use Symfony\Component\Security\SecurityContext;
+use Symfony\Component\Security\Core\SecurityContext;
 
 /**
  * SecurityExtension exposes security context features.

src/Symfony/Component/Security/Acl/Domain/RoleSecurityIdentity.php

@@ -12,7 +12,7 @@
 namespace Symfony\Component\Security\Acl\Domain;
 
 use Symfony\Component\Security\Acl\Model\SecurityIdentityInterface;
-use Symfony\Component\Security\Role\Role;
+use Symfony\Component\Security\Core\Role\Role;
 
 /**
  * A SecurityIdentity implementation for roles

src/Symfony/Component/Security/Acl/Domain/SecurityIdentityRetrievalStrategy.php

@@ -11,14 +11,14 @@
 
 namespace Symfony\Component\Security\Acl\Domain;
 
-use Symfony\Component\Security\Authentication\Token\AnonymousToken;
+use Symfony\Component\Security\Core\Authentication\Token\AnonymousToken;
 
-use Symfony\Component\Security\User\AccountInterface;
+use Symfony\Component\Security\Core\User\AccountInterface;
-use Symfony\Component\Security\Authentication\Token\TokenInterface;
+use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
 use Symfony\Component\Security\Acl\Model\SecurityIdentityRetrievalStrategyInterface;
-use Symfony\Component\Security\Authentication\AuthenticationTrustResolver;
+use Symfony\Component\Security\Core\Authentication\AuthenticationTrustResolver;
-use Symfony\Component\Security\Role\RoleHierarchyInterface;
+use Symfony\Component\Security\Core\Role\RoleHierarchyInterface;
-use Symfony\Component\Security\Authorization\Voter\AuthenticatedVoter;
+use Symfony\Component\Security\Core\Authorization\Voter\AuthenticatedVoter;
 
 /**
  * Strategy for retrieving security identities

src/Symfony/Component/Security/Acl/Domain/UserSecurityIdentity.php

@@ -11,8 +11,8 @@
 
 namespace Symfony\Component\Security\Acl\Domain;
 
-use Symfony\Component\Security\Authentication\Token\TokenInterface;
+use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
-use Symfony\Component\Security\User\AccountInterface;
+use Symfony\Component\Security\Core\User\AccountInterface;
 use Symfony\Component\Security\Acl\Model\SecurityIdentityInterface;
 
 /**

src/Symfony/Component/Security/Acl/Model/SecurityIdentityRetrievalStrategyInterface.php

@@ -11,7 +11,7 @@
 
 namespace Symfony\Component\Security\Acl\Model;
 
-use Symfony\Component\Security\Authentication\Token\TokenInterface;
+use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
 
 /**
  * Interface for retrieving security identities from tokens

src/Symfony/Component/Security/Acl/Voter/AclVoter.php

@@ -21,9 +21,9 @@ use Symfony\Component\Security\Acl\Model\AclProviderInterface;
 use Symfony\Component\Security\Acl\Permission\PermissionMapInterface;
 use Symfony\Component\Security\Acl\Model\SecurityIdentityRetrievalStrategyInterface;
 use Symfony\Component\Security\Acl\Model\ObjectIdentityRetrievalStrategyInterface;
-use Symfony\Component\Security\Authentication\Token\TokenInterface;
+use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
-use Symfony\Component\Security\Authorization\Voter\VoterInterface;
+use Symfony\Component\Security\Core\Authorization\Voter\VoterInterface;
-use Symfony\Component\Security\Role\RoleHierarchyInterface;
+use Symfony\Component\Security\Core\Role\RoleHierarchyInterface;
 
 /**
  * This voter can be used as a base class for implementing your own permissions.

src/Symfony/Component/Security/Core/Authentication/AuthenticationManagerInterface.php

@@ -9,10 +9,10 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\Security\Authentication;
+namespace Symfony\Component\Security\Core\Authentication;
 
-use Symfony\Component\Security\Authentication\Token\TokenInterface;
+use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
-use Symfony\Component\Security\Exception\AuthenticationException;
+use Symfony\Component\Security\Core\Exception\AuthenticationException;
 
 /**
  * AuthenticationManagerInterface is the interface for authentication managers,

src/Symfony/Component/Security/Core/Authentication/AuthenticationProviderManager.php

@@ -9,13 +9,13 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\Security\Authentication;
+namespace Symfony\Component\Security\Core\Authentication;
 
-use Symfony\Component\Security\Exception\AccountStatusException;
+use Symfony\Component\Security\Core\Exception\AccountStatusException;
-use Symfony\Component\Security\Exception\AuthenticationException;
+use Symfony\Component\Security\Core\Exception\AuthenticationException;
-use Symfony\Component\Security\Exception\ProviderNotFoundException;
+use Symfony\Component\Security\Core\Exception\ProviderNotFoundException;
-use Symfony\Component\Security\Authentication\Provider\AuthenticationProviderInterface;
+use Symfony\Component\Security\Core\Authentication\Provider\AuthenticationProviderInterface;
-use Symfony\Component\Security\Authentication\Token\TokenInterface;
+use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
 
 /**
  * AuthenticationProviderManager uses a list of AuthenticationProviderInterface

src/Symfony/Component/Security/Core/Authentication/AuthenticationTrustResolver.php

@@ -9,9 +9,9 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\Security\Authentication;
+namespace Symfony\Component\Security\Core\Authentication;
 
-use Symfony\Component\Security\Authentication\Token\TokenInterface;
+use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
 
 /**
  * The default implementation of the authentication trust resolver.

src/Symfony/Component/Security/Core/Authentication/AuthenticationTrustResolverInterface.php

@@ -9,9 +9,9 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\Security\Authentication;
+namespace Symfony\Component\Security\Core\Authentication;
 
-use Symfony\Component\Security\Authentication\Token\TokenInterface;
+use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
 
 /**
  * Interface for resolving the authentication status of a given token.

src/Symfony/Component/Security/Core/Authentication/EntryPoint/AuthenticationEntryPointInterface.php

@@ -9,9 +9,9 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\Security\Authentication\EntryPoint;
+namespace Symfony\Component\Security\Core\Authentication\EntryPoint;
 
-use Symfony\Component\Security\Exception\AuthenticationException;
+use Symfony\Component\Security\Core\Exception\AuthenticationException;
 use Symfony\Component\HttpFoundation\Request;
 
 /**

src/Symfony/Component/Security/Core/Authentication/Provider/AnonymousAuthenticationProvider.php

@@ -9,11 +9,11 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\Security\Authentication\Provider;
+namespace Symfony\Component\Security\Core\Authentication\Provider;
 
-use Symfony\Component\Security\Authentication\Token\TokenInterface;
+use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
-use Symfony\Component\Security\Exception\BadCredentialsException;
+use Symfony\Component\Security\Core\Exception\BadCredentialsException;
-use Symfony\Component\Security\Authentication\Token\AnonymousToken;
+use Symfony\Component\Security\Core\Authentication\Token\AnonymousToken;
 
 /**
  * AnonymousAuthenticationProvider validates AnonymousToken instances.

src/Symfony/Component/Security/Core/Authentication/Provider/AuthenticationProviderInterface.php

@@ -9,10 +9,10 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\Security\Authentication\Provider;
+namespace Symfony\Component\Security\Core\Authentication\Provider;
 
-use Symfony\Component\Security\Authentication\Token\TokenInterface;
+use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
-use Symfony\Component\Security\Authentication\AuthenticationManagerInterface;
+use Symfony\Component\Security\Core\Authentication\AuthenticationManagerInterface;
 
 /**
  * AuthenticationProviderInterface is the interface for for all authentication

src/Symfony/Component/Security/Core/Authentication/Provider/DaoAuthenticationProvider.php

@@ -9,17 +9,17 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\Security\Authentication\Provider;
+namespace Symfony\Component\Security\Core\Authentication\Provider;
 
-use Symfony\Component\Security\Authentication\Token\TokenInterface;
+use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
-use Symfony\Component\Security\Encoder\EncoderFactoryInterface;
+use Symfony\Component\Security\Core\Encoder\EncoderFactoryInterface;
-use Symfony\Component\Security\User\UserProviderInterface;
+use Symfony\Component\Security\Core\User\UserProviderInterface;
-use Symfony\Component\Security\User\AccountCheckerInterface;
+use Symfony\Component\Security\Core\User\AccountCheckerInterface;
-use Symfony\Component\Security\User\AccountInterface;
+use Symfony\Component\Security\Core\User\AccountInterface;
-use Symfony\Component\Security\Exception\UsernameNotFoundException;
+use Symfony\Component\Security\Core\Exception\UsernameNotFoundException;
-use Symfony\Component\Security\Exception\AuthenticationServiceException;
+use Symfony\Component\Security\Core\Exception\AuthenticationServiceException;
-use Symfony\Component\Security\Exception\BadCredentialsException;
+use Symfony\Component\Security\Core\Exception\BadCredentialsException;
-use Symfony\Component\Security\Authentication\Token\UsernamePasswordToken;
+use Symfony\Component\Security\Core\Authentication\Token\UsernamePasswordToken;
 
 /**
  * DaoAuthenticationProvider uses a UserProviderInterface to retrieve the user

src/Symfony/Component/Security/Core/Authentication/Provider/PreAuthenticatedAuthenticationProvider.php

@@ -9,14 +9,14 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\Security\Authentication\Provider;
+namespace Symfony\Component\Security\Core\Authentication\Provider;
 
-use Symfony\Component\Security\User\AccountInterface;
+use Symfony\Component\Security\Core\User\AccountInterface;
-use Symfony\Component\Security\User\UserProviderInterface;
+use Symfony\Component\Security\Core\User\UserProviderInterface;
-use Symfony\Component\Security\User\AccountCheckerInterface;
+use Symfony\Component\Security\Core\User\AccountCheckerInterface;
-use Symfony\Component\Security\Exception\BadCredentialsException;
+use Symfony\Component\Security\Core\Exception\BadCredentialsException;
-use Symfony\Component\Security\Authentication\Token\PreAuthenticatedToken;
+use Symfony\Component\Security\Core\Authentication\Token\PreAuthenticatedToken;
-use Symfony\Component\Security\Authentication\Token\TokenInterface;
+use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
 
 /**
  * Processes a pre-authenticated authentication request.

src/Symfony/Component/Security/Core/Authentication/Provider/RememberMeAuthenticationProvider.php

@@ -1,11 +1,11 @@
 <?php
-namespace Symfony\Component\Security\Authentication\Provider;
+namespace Symfony\Component\Security\Core\Authentication\Provider;
 
-use Symfony\Component\Security\User\AccountCheckerInterface;
+use Symfony\Component\Security\Core\User\AccountCheckerInterface;
-use Symfony\Component\Security\User\AccountInterface;
+use Symfony\Component\Security\Core\User\AccountInterface;
-use Symfony\Component\Security\Authentication\Token\TokenInterface;
+use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
-use Symfony\Component\Security\Authentication\Token\RememberMeToken;
+use Symfony\Component\Security\Core\Authentication\Token\RememberMeToken;
-use Symfony\Component\Security\Exception\BadCredentialsException;
+use Symfony\Component\Security\Core\Exception\BadCredentialsException;
 
 class RememberMeAuthenticationProvider implements AuthenticationProviderInterface
 {

src/Symfony/Component/Security/Core/Authentication/Provider/UserAuthenticationProvider.php

@@ -9,16 +9,16 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\Security\Authentication\Provider;
+namespace Symfony\Component\Security\Core\Authentication\Provider;
 
-use Symfony\Component\Security\User\AccountInterface;
+use Symfony\Component\Security\Core\User\AccountInterface;
-use Symfony\Component\Security\User\AccountCheckerInterface;
+use Symfony\Component\Security\Core\User\AccountCheckerInterface;
-use Symfony\Component\Security\Exception\UsernameNotFoundException;
+use Symfony\Component\Security\Core\Exception\UsernameNotFoundException;
-use Symfony\Component\Security\Exception\AuthenticationException;
+use Symfony\Component\Security\Core\Exception\AuthenticationException;
-use Symfony\Component\Security\Exception\BadCredentialsException;
+use Symfony\Component\Security\Core\Exception\BadCredentialsException;
-use Symfony\Component\Security\Exception\AuthenticationServiceException;
+use Symfony\Component\Security\Core\Exception\AuthenticationServiceException;
-use Symfony\Component\Security\Authentication\Token\UsernamePasswordToken;
+use Symfony\Component\Security\Core\Authentication\Token\UsernamePasswordToken;
-use Symfony\Component\Security\Authentication\Token\TokenInterface;
+use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
 
 /**
  * UserProviderInterface retrieves users for UsernamePasswordToken tokens.

src/Symfony/Component/Security/Core/Authentication/RememberMe/InMemoryTokenProvider.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace Symfony\Component\Security\Authentication\RememberMe;
+namespace Symfony\Component\Security\Core\Authentication\RememberMe;
 
-use Symfony\Component\Security\Exception\TokenNotFoundException;
+use Symfony\Component\Security\Core\Exception\TokenNotFoundException;
 
 /**
  * This class is used for testing purposes, and is not really suited for production.

src/Symfony/Component/Security/Core/Authentication/RememberMe/PersistentToken.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Symfony\Component\Security\Authentication\RememberMe;
+namespace Symfony\Component\Security\Core\Authentication\RememberMe;
 
 /*
  * This file is part of the Symfony package.

src/Symfony/Component/Security/Core/Authentication/RememberMe/PersistentTokenInterface.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Symfony\Component\Security\Authentication\RememberMe;
+namespace Symfony\Component\Security\Core\Authentication\RememberMe;
 
 /*
  * This file is part of the Symfony package.

src/Symfony/Component/Security/Core/Authentication/RememberMe/TokenProviderInterface.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Symfony\Component\Security\Authentication\RememberMe;
+namespace Symfony\Component\Security\Core\Authentication\RememberMe;
 
 /*
  * This file is part of the Symfony package.

src/Symfony/Component/Security/Core/Authentication/Token/AnonymousToken.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\Security\Authentication\Token;
+namespace Symfony\Component\Security\Core\Authentication\Token;
 
 /**
  * AnonymousToken represents an anonymous token.

src/Symfony/Component/Security/Core/Authentication/Token/PreAuthenticatedToken.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\Security\Authentication\Token;
+namespace Symfony\Component\Security\Core\Authentication\Token;
 
 /**
  * PreAuthenticatedToken implements a pre-authenticated token.

src/Symfony/Component/Security/Core/Authentication/Token/RememberMeToken.php

@@ -9,10 +9,10 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\Security\Authentication\Token;
+namespace Symfony\Component\Security\Core\Authentication\Token;
 
-use Symfony\Component\Security\Authentication\RememberMe\PersistentTokenInterface;
+use Symfony\Component\Security\Core\Authentication\RememberMe\PersistentTokenInterface;
-use Symfony\Component\Security\User\AccountInterface;
+use Symfony\Component\Security\Core\User\AccountInterface;
 
 /**
  * Base class for "Remember Me" tokens

src/Symfony/Component/Security/Core/Authentication/Token/Token.php

@@ -9,11 +9,11 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\Security\Authentication\Token;
+namespace Symfony\Component\Security\Core\Authentication\Token;
 
-use Symfony\Component\Security\Role\RoleInterface;
+use Symfony\Component\Security\Core\Role\RoleInterface;
-use Symfony\Component\Security\Role\Role;
+use Symfony\Component\Security\Core\Role\Role;
-use Symfony\Component\Security\User\AccountInterface;
+use Symfony\Component\Security\Core\User\AccountInterface;
 
 /**
  * Base class for Token instances.

src/Symfony/Component/Security/Core/Authentication/Token/TokenInterface.php

@@ -9,9 +9,9 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\Security\Authentication\Token;
+namespace Symfony\Component\Security\Core\Authentication\Token;
 
-use Symfony\Component\Security\User\AccountInterface;
+use Symfony\Component\Security\Core\User\AccountInterface;
 
 /**
  * TokenInterface is the interface for the user authentication information.

src/Symfony/Component/Security/Core/Authentication/Token/UsernamePasswordToken.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\Security\Authentication\Token;
+namespace Symfony\Component\Security\Core\Authentication\Token;
 
 /**
  * UsernamePasswordToken implements a username and password token.

src/Symfony/Component/Security/Core/Authorization/AccessDecisionManager.php

@@ -9,10 +9,10 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\Security\Authorization;
+namespace Symfony\Component\Security\Core\Authorization;
 
-use Symfony\Component\Security\Authorization\Voter\VoterInterface;
+use Symfony\Component\Security\Core\Authorization\Voter\VoterInterface;
-use Symfony\Component\Security\Authentication\Token\TokenInterface;
+use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
 
 /**
  * AccessDecisionManager is the base class for all access decision managers

src/Symfony/Component/Security/Core/Authorization/AccessDecisionManagerInterface.php

@@ -9,9 +9,9 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\Security\Authorization;
+namespace Symfony\Component\Security\Core\Authorization;
 
-use Symfony\Component\Security\Authentication\Token\TokenInterface;
+use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
 
 /**
  * AccessDecisionManagerInterface makes authorization decisions.

src/Symfony/Component/Security/Core/Authorization/Voter/AuthenticatedVoter.php

@@ -9,10 +9,10 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\Security\Authorization\Voter;
+namespace Symfony\Component\Security\Core\Authorization\Voter;
 
-use Symfony\Component\Security\Authentication\AuthenticationTrustResolverInterface;
+use Symfony\Component\Security\Core\Authentication\AuthenticationTrustResolverInterface;
-use Symfony\Component\Security\Authentication\Token\TokenInterface;
+use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
 
 /**
  * AuthenticatedVoter votes if an attribute like IS_AUTHENTICATED_FULLY,

src/Symfony/Component/Security/Core/Authorization/Voter/RoleHierarchyVoter.php

@@ -9,10 +9,10 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\Security\Authorization\Voter;
+namespace Symfony\Component\Security\Core\Authorization\Voter;
 
-use Symfony\Component\Security\Authentication\Token\TokenInterface;
+use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
-use Symfony\Component\Security\Role\RoleHierarchyInterface;
+use Symfony\Component\Security\Core\Role\RoleHierarchyInterface;
 
 /**
  * RoleHierarchyVoter uses a RoleHierarchy to determine the roles granted to

src/Symfony/Component/Security/Core/Authorization/Voter/RoleVoter.php

@@ -9,9 +9,9 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\Security\Authorization\Voter;
+namespace Symfony\Component\Security\Core\Authorization\Voter;
 
-use Symfony\Component\Security\Authentication\Token\TokenInterface;
+use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
 
 /**
  * RoleVoter votes if any attribute starts with a given prefix.

src/Symfony/Component/Security/Core/Authorization/Voter/VoterInterface.php

@@ -9,9 +9,9 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\Security\Authorization\Voter;
+namespace Symfony\Component\Security\Core\Authorization\Voter;
 
-use Symfony\Component\Security\Authentication\Token\TokenInterface;
+use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
 
 /**
  * VoterInterface is the interface implemented by all voters.

src/Symfony/Component/Security/Core/Encoder/BasePasswordEncoder.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\Security\Encoder;
+namespace Symfony\Component\Security\Core\Encoder;
 
 /**
  * BasePasswordEncoder is the base class for all password encoders.

src/Symfony/Component/Security/Core/Encoder/EncoderFactory.php

@@ -9,9 +9,9 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\Security\Encoder;
+namespace Symfony\Component\Security\Core\Encoder;
 
-use Symfony\Component\Security\User\AccountInterface;
+use Symfony\Component\Security\Core\User\AccountInterface;
 
 /**
  * A generic encoder factory implementation

src/Symfony/Component/Security/Core/Encoder/EncoderFactoryInterface.php

@@ -9,9 +9,9 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\Security\Encoder;
+namespace Symfony\Component\Security\Core\Encoder;
 
-use Symfony\Component\Security\User\AccountInterface;
+use Symfony\Component\Security\Core\User\AccountInterface;
 
 /**
  * EncoderFactoryInterface to support different encoders for different accounts.

src/Symfony/Component/Security/Core/Encoder/MessageDigestPasswordEncoder.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\Security\Encoder;
+namespace Symfony\Component\Security\Core\Encoder;
 
 /**
  * MessageDigestPasswordEncoder uses a message digest algorithm.

src/Symfony/Component/Security/Core/Encoder/PasswordEncoderInterface.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\Security\Encoder;
+namespace Symfony\Component\Security\Core\Encoder;
 
 /**
  * PasswordEncoderInterface is the interface for all encoders.

src/Symfony/Component/Security/Core/Encoder/PlaintextPasswordEncoder.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\Security\Encoder;
+namespace Symfony\Component\Security\Core\Encoder;
 
 /**
  * PlaintextPasswordEncoder does not do any encoding.

src/Symfony/Component/Security/Core/Exception/AccessDeniedException.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\Security\Exception;
+namespace Symfony\Component\Security\Core\Exception;
 
 /**
  * AccessDeniedException is thrown when the account has not the required role.

src/Symfony/Component/Security/Core/Exception/AccountExpiredException.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\Security\Exception;
+namespace Symfony\Component\Security\Core\Exception;
 
 /**
  * AccountExpiredException is thrown when the user account has expired.

src/Symfony/Component/Security/Core/Exception/AccountStatusException.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\Security\Exception;
+namespace Symfony\Component\Security\Core\Exception;
 
 /**
  * AccountStatusException is the base class for authentication exceptions

src/Symfony/Component/Security/Core/Exception/AuthenticationCredentialsNotFoundException.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\Security\Exception;
+namespace Symfony\Component\Security\Core\Exception;
 
 /**
  * AuthenticationCredentialsNotFoundException is thrown when an authentication is rejected

src/Symfony/Component/Security/Core/Exception/AuthenticationException.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\Security\Exception;
+namespace Symfony\Component\Security\Core\Exception;
 
 /**
  * AuthenticationException is the base class for all authentication exceptions.

src/Symfony/Component/Security/Core/Exception/AuthenticationServiceException.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\Security\Exception;
+namespace Symfony\Component\Security\Core\Exception;
 
 /**
  * AuthenticationServiceException is thrown when an authentication request could not be processed due to a system problem.

src/Symfony/Component/Security/Core/Exception/BadCredentialsException.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\Security\Exception;
+namespace Symfony\Component\Security\Core\Exception;
 
 /**
  * BadCredentialsException is thrown when the user credentials are invalid.

src/Symfony/Component/Security/Core/Exception/CookieTheftException.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Symfony\Component\Security\Exception;
+namespace Symfony\Component\Security\Core\Exception;
 
 /*
  * This file is part of the Symfony package.

src/Symfony/Component/Security/Core/Exception/CredentialsExpiredException.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\Security\Exception;
+namespace Symfony\Component\Security\Core\Exception;
 
 /**
  * CredentialsExpiredException is thrown when the user account credentials have expired.

src/Symfony/Component/Security/Core/Exception/DisabledException.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\Security\Exception;
+namespace Symfony\Component\Security\Core\Exception;
 
 /**
  * DisabledException is thrown when the user account is disabled.

src/Symfony/Component/Security/Core/Exception/InsufficientAuthenticationException.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\Security\Exception;
+namespace Symfony\Component\Security\Core\Exception;
 
 /**
  * InsufficientAuthenticationException is thrown if the user credentials are not sufficiently trusted.

src/Symfony/Component/Security/Core/Exception/LockedException.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\Security\Exception;
+namespace Symfony\Component\Security\Core\Exception;
 
 /**
  * LockedException is thrown if the user account is locked.

src/Symfony/Component/Security/Core/Exception/NonceExpiredException.php

@@ -11,8 +11,8 @@
 
 namespace Symfony\Component\HttpKernel\Security\EntryPoint;
 
-use Symfony\Component\Security\Exception\AuthenticationException;
+use Symfony\Component\Security\Core\Exception\AuthenticationException;
-use Symfony\Component\Security\Authentication\EntryPoint\AuthenticationEntryPointInterface;
+use Symfony\Component\Security\Core\Authentication\EntryPoint\AuthenticationEntryPointInterface;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Log\LoggerInterface;
 

src/Symfony/Component/Security/Core/Exception/ProviderNotFoundException.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\Security\Exception;
+namespace Symfony\Component\Security\Core\Exception;
 
 /**
  * ProviderNotFoundException is thrown when no AuthenticationProviderInterface instance

src/Symfony/Component/Security/Core/Exception/TokenNotFoundException.php

@@ -1,5 +1,5 @@
 <?php 
-namespace Symfony\Component\Security\Exception;
+namespace Symfony\Component\Security\Core\Exception;
 
 /*
  * This file is part of the Symfony package.

src/Symfony/Component/Security/Core/Exception/UnsupportedAccountException.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\Security\Exception;
+namespace Symfony\Component\Security\Core\Exception;
 
 /**
  * This exception is thrown when an account is reloaded from a provider which

src/Symfony/Component/Security/Core/Exception/UsernameNotFoundException.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\Security\Exception;
+namespace Symfony\Component\Security\Core\Exception;
 
 /**
  * UsernameNotFoundException is thrown if a User cannot be found by its username.

src/Symfony/Component/Security/Core/Role/Role.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\Security\Role;
+namespace Symfony\Component\Security\Core\Role;
 
 /**
  * Role is a simple implementation of a RoleInterface where the role is a

src/Symfony/Component/Security/Core/Role/RoleHierarchy.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\Security\Role;
+namespace Symfony\Component\Security\Core\Role;
 
 /**
  * RoleHierarchy defines a role hierarchy.

src/Symfony/Component/Security/Core/Role/RoleHierarchyInterface.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\Security\Role;
+namespace Symfony\Component\Security\Core\Role;
 
 /**
  * RoleHierarchyInterface is the interface for a role hierarchy.

src/Symfony/Component/Security/Core/Role/RoleInterface.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\Security\Role;
+namespace Symfony\Component\Security\Core\Role;
 
 /**
  * RoleInterface represents a role granted to a user.

src/Symfony/Component/Security/Core/Role/SwitchUserRole.php

@@ -9,9 +9,9 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\Security\Role;
+namespace Symfony\Component\Security\Core\Role;
 
-use Symfony\Component\Security\Authentication\Token\TokenInterface;
+use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
 
 /**
  * SwitchUserRole is used when the current user temporarily impersonates

src/Symfony/Component/Security/Core/SecurityContext.php

@@ -9,11 +9,11 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\Security;
+namespace Symfony\Component\Security\Core;
 
-use Symfony\Component\Security\Authorization\AccessDecisionManagerInterface;
+use Symfony\Component\Security\Core\Authorization\AccessDecisionManagerInterface;
-use Symfony\Component\Security\Authentication\AuthenticationManagerInterface;
+use Symfony\Component\Security\Core\Authentication\AuthenticationManagerInterface;
-use Symfony\Component\Security\Authentication\Token\TokenInterface;
+use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
 use Symfony\Component\Security\Acl\Voter\FieldVote;
 
 /**

src/Symfony/Component/Security/Core/User/AccountChecker.php

@@ -9,12 +9,12 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\Security\User;
+namespace Symfony\Component\Security\Core\User;
 
-use Symfony\Component\Security\Exception\CredentialsExpiredException;
+use Symfony\Component\Security\Core\Exception\CredentialsExpiredException;
-use Symfony\Component\Security\Exception\LockedException;
+use Symfony\Component\Security\Core\Exception\LockedException;
-use Symfony\Component\Security\Exception\DisabledException;
+use Symfony\Component\Security\Core\Exception\DisabledException;
-use Symfony\Component\Security\Exception\AccountExpiredException;
+use Symfony\Component\Security\Core\Exception\AccountExpiredException;
 
 /**
  * AccountChecker checks the user account flags.

src/Symfony/Component/Security/Core/User/AccountCheckerInterface.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\Security\User;
+namespace Symfony\Component\Security\Core\User;
 
 /**
  * AccountCheckerInterface checks user account when authentication occurs.

src/Symfony/Component/Security/Core/User/AccountInterface.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\Security\User;
+namespace Symfony\Component\Security\Core\User;
 
 /**
  * AccountInterface is the interface that user classes must implement.

src/Symfony/Component/Security/Core/User/AdvancedAccountInterface.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\Security\User;
+namespace Symfony\Component\Security\Core\User;
 
 /**
  * AdvancedAccountInterface adds status flags to a regular account.

src/Symfony/Component/Security/Core/User/InMemoryUserProvider.php

@@ -9,10 +9,10 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\Security\User;
+namespace Symfony\Component\Security\Core\User;
 
-use Symfony\Component\Security\Exception\UsernameNotFoundException;
+use Symfony\Component\Security\Core\Exception\UsernameNotFoundException;
-use Symfony\Component\Security\Exception\UnsupportedAccountException;
+use Symfony\Component\Security\Core\Exception\UnsupportedAccountException;
 
 /**
  * InMemoryUserProvider is a simple non persistent user provider.
@@ -93,6 +93,6 @@ class InMemoryUserProvider implements UserProviderInterface
      */
     public function supportsClass($class)
     {
-        return $class === 'Symfony\Component\Security\User\User';
+        return $class === 'Symfony\Component\Security\Core\User\User';
     }
 }

src/Symfony/Component/Security/Core/User/User.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\Security\User;
+namespace Symfony\Component\Security\Core\User;
 
 /**
  * User is the user implementation used by the in-memory user provider.

src/Symfony/Component/Security/Core/User/UserProviderInterface.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\Security\User;
+namespace Symfony\Component\Security\Core\User;
 
 /**
  * UserProviderInterface is the implementation that all user provider must

src/Symfony/Component/Security/Http/AccessMap.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Bundle\SecurityBundle\Security;
+namespace Symfony\Component\Security\Http;
 
 use Symfony\Component\HttpFoundation\RequestMatcherInterface;
 use Symfony\Component\HttpFoundation\Request;

src/Symfony/Component/Security/Http/Authentication/AuthenticationFailureHandlerInterface.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Symfony\Bundle\SecurityBundle\Security\Authentication;
+namespace Symfony\Component\Security\Http\Authentication;
 
 use Symfony\Component\EventDispatcher\EventInterface;
 use Symfony\Component\HttpFoundation\Request;

src/Symfony/Component/Security/Http/Authentication/AuthenticationSuccessHandlerInterface.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace Symfony\Bundle\SecurityBundle\Security\Authentication;
+namespace Symfony\Component\Security\Http\Authentication;
 
 use Symfony\Component\EventDispatcher\EventInterface;
-use Symfony\Component\Security\Authentication\Token\TokenInterface;
+use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
 use Symfony\Component\HttpFoundation\Request;
 
 interface AuthenticationSuccessHandlerInterface

src/Symfony/Component/Security/Http/EntryPoint/BasicAuthenticationEntryPoint.php

@@ -9,10 +9,10 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Bundle\SecurityBundle\Security\EntryPoint;
+namespace Symfony\Component\Security\Http\EntryPoint;
 
-use Symfony\Component\Security\Exception\AuthenticationException;
+use Symfony\Component\Security\Core\Exception\AuthenticationException;
-use Symfony\Component\Security\Authentication\EntryPoint\AuthenticationEntryPointInterface;
+use Symfony\Component\Security\Core\Authentication\EntryPoint\AuthenticationEntryPointInterface;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpFoundation\Request;
 

src/Symfony/Component/Security/Http/EntryPoint/DigestAuthenticationEntryPoint.php

@@ -9,11 +9,11 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Bundle\SecurityBundle\Security\EntryPoint;
+namespace Symfony\Component\Security\Http\EntryPoint;
 
-use Symfony\Component\Security\Exception\AuthenticationException;
+use Symfony\Component\Security\Core\Exception\AuthenticationException;
-use Symfony\Component\Security\Authentication\EntryPoint\AuthenticationEntryPointInterface;
+use Symfony\Component\Security\Core\Authentication\EntryPoint\AuthenticationEntryPointInterface;
-use Symfony\Component\Security\Exception\NonceExpiredException;
+use Symfony\Component\Security\Core\Exception\NonceExpiredException;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpKernel\Log\LoggerInterface;

src/Symfony/Component/Security/Http/EntryPoint/FormAuthenticationEntryPoint.php

@@ -9,13 +9,13 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Bundle\SecurityBundle\Security\EntryPoint;
+namespace Symfony\Component\Security\Http\EntryPoint;
 
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\Security\Exception\AuthenticationException;
+use Symfony\Component\Security\Core\Exception\AuthenticationException;
-use Symfony\Component\Security\Authentication\EntryPoint\AuthenticationEntryPointInterface;
+use Symfony\Component\Security\Core\Authentication\EntryPoint\AuthenticationEntryPointInterface;
-use Symfony\Component\Security\SecurityContext;
+use Symfony\Component\Security\Core\SecurityContext;
 
 /**
  * FormAuthenticationEntryPoint starts an authentication via a login form.

src/Symfony/Component/Security/Http/EntryPoint/RetryAuthenticationEntryPoint.php

@@ -9,10 +9,10 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Bundle\SecurityBundle\Security\EntryPoint;
+namespace Symfony\Component\Security\Http\EntryPoint;
 
-use Symfony\Component\Security\Exception\AuthenticationException;
+use Symfony\Component\Security\Core\Exception\AuthenticationException;
-use Symfony\Component\Security\Authentication\EntryPoint\AuthenticationEntryPointInterface;
+use Symfony\Component\Security\Core\Authentication\EntryPoint\AuthenticationEntryPointInterface;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpFoundation\Request;
 

src/Symfony/Component/Security/Http/ExceptionTranslation/AccessDeniedHandlerInterface.php

@@ -1,10 +1,10 @@
 <?php
 
-namespace Symfony\Bundle\SecurityBundle\Security\ExceptionTranslation;
+namespace Symfony\Component\Security\Http\ExceptionTranslation;
 
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\EventDispatcher\EventInterface;
-use Symfony\Component\Security\Exception\AccessDeniedException;
+use Symfony\Component\Security\Core\Exception\AccessDeniedException;
 
 /**
  * This is used by the ExceptionListener to translate an AccessDeniedException

src/Symfony/Component/Security/Http/Firewall.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Bundle\SecurityBundle\Security;
+namespace Symfony\Component\Security\Http;
 
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\EventDispatcher\EventInterface;

src/Symfony/Component/Security/Http/Firewall/AbstractAuthenticationListener.php

@@ -9,24 +9,24 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Bundle\SecurityBundle\Security\Firewall;
+namespace Symfony\Component\Security\Http\Firewall;
 
 use Symfony\Component\EventDispatcher\Event;
 
-use Symfony\Bundle\SecurityBundle\Security\Session\SessionAuthenticationStrategyInterface;
+use Symfony\Component\Security\Http\Session\SessionAuthenticationStrategyInterface;
-use Symfony\Bundle\SecurityBundle\Security\Authentication\AuthenticationFailureHandlerInterface;
+use Symfony\Component\Security\Http\Authentication\AuthenticationFailureHandlerInterface;
-use Symfony\Bundle\SecurityBundle\Security\Authentication\AuthenticationSuccessHandlerInterface;
+use Symfony\Component\Security\Http\Authentication\AuthenticationSuccessHandlerInterface;
-use Symfony\Bundle\SecurityBundle\Security\RememberMe\RememberMeServicesInterface;
+use Symfony\Component\Security\Http\RememberMe\RememberMeServicesInterface;
-use Symfony\Component\Security\SecurityContext;
+use Symfony\Component\Security\Core\SecurityContext;
-use Symfony\Component\Security\Authentication\AuthenticationManagerInterface;
+use Symfony\Component\Security\Core\Authentication\AuthenticationManagerInterface;
 use Symfony\Component\HttpKernel\Log\LoggerInterface;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\EventDispatcher\EventInterface;
-use Symfony\Component\Security\Exception\AuthenticationException;
+use Symfony\Component\Security\Core\Exception\AuthenticationException;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpKernel\HttpKernelInterface;
 use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\Security\Authentication\Token\TokenInterface;
+use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
 
 /**
  * The AbstractAuthenticationListener is the preferred base class for all
@@ -152,9 +152,9 @@ abstract class AbstractAuthenticationListener implements ListenerInterface
             $response = $this->onFailure($event, $request, $failed);
         }
 
-        $event->setReturnValue($response);
+        $event->setProcessed();
 
-        return true;
+        return $response;
     }
 
     /**

src/Symfony/Component/Security/Http/Firewall/AccessListener.php

@@ -9,17 +9,17 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Bundle\SecurityBundle\Security\Firewall;
+namespace Symfony\Component\Security\Http\Firewall;
 
-use Symfony\Component\Security\SecurityContext;
+use Symfony\Component\Security\Core\SecurityContext;
-use Symfony\Component\Security\Authorization\AccessDecisionManagerInterface;
+use Symfony\Component\Security\Core\Authorization\AccessDecisionManagerInterface;
-use Symfony\Bundle\SecurityBundle\Security\AccessMap;
+use Symfony\Component\Security\Http\AccessMap;
-use Symfony\Component\Security\Authentication\AuthenticationManagerInterface;
+use Symfony\Component\Security\Core\Authentication\AuthenticationManagerInterface;
 use Symfony\Component\HttpKernel\Log\LoggerInterface;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\EventDispatcher\EventInterface;
-use Symfony\Component\Security\Exception\AuthenticationCredentialsNotFoundException;
+use Symfony\Component\Security\Core\Exception\AuthenticationCredentialsNotFoundException;
-use Symfony\Component\Security\Exception\AccessDeniedException;
+use Symfony\Component\Security\Core\Exception\AccessDeniedException;
 
 /**
  * AccessListener enforces access control rules.

src/Symfony/Component/Security/Http/Firewall/AnonymousAuthenticationListener.php

@@ -9,13 +9,13 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Bundle\SecurityBundle\Security\Firewall;
+namespace Symfony\Component\Security\Http\Firewall;
 
-use Symfony\Component\Security\SecurityContext;
+use Symfony\Component\Security\Core\SecurityContext;
 use Symfony\Component\HttpKernel\Log\LoggerInterface;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\EventDispatcher\EventInterface;
-use Symfony\Component\Security\Authentication\Token\AnonymousToken;
+use Symfony\Component\Security\Core\Authentication\Token\AnonymousToken;
 
 /**
  * AnonymousAuthenticationListener automatically addds a Token if none is

src/Symfony/Component/Security/Http/Firewall/BasicAuthenticationListener.php

@@ -9,16 +9,16 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Bundle\SecurityBundle\Security\Firewall;
+namespace Symfony\Component\Security\Http\Firewall;
 
-use Symfony\Component\Security\SecurityContext;
+use Symfony\Component\Security\Core\SecurityContext;
-use Symfony\Component\Security\Authentication\AuthenticationManagerInterface;
+use Symfony\Component\Security\Core\Authentication\AuthenticationManagerInterface;
-use Symfony\Component\Security\Authentication\EntryPoint\AuthenticationEntryPointInterface;
+use Symfony\Component\Security\Core\Authentication\EntryPoint\AuthenticationEntryPointInterface;
 use Symfony\Component\HttpKernel\Log\LoggerInterface;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\EventDispatcher\EventInterface;
-use Symfony\Component\Security\Authentication\Token\UsernamePasswordToken;
+use Symfony\Component\Security\Core\Authentication\Token\UsernamePasswordToken;
-use Symfony\Component\Security\Exception\AuthenticationException;
+use Symfony\Component\Security\Core\Exception\AuthenticationException;
 
 /**
  * BasicAuthenticationListener implements Basic HTTP authentication.

src/Symfony/Component/Security/Http/Firewall/ChannelListener.php

@@ -9,10 +9,10 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Bundle\SecurityBundle\Security\Firewall;
+namespace Symfony\Component\Security\Http\Firewall;
 
-use Symfony\Bundle\SecurityBundle\Security\AccessMap;
+use Symfony\Component\Security\Http\AccessMap;
-use Symfony\Component\Security\Authentication\EntryPoint\AuthenticationEntryPointInterface;
+use Symfony\Component\Security\Core\Authentication\EntryPoint\AuthenticationEntryPointInterface;
 use Symfony\Component\HttpKernel\Log\LoggerInterface;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\EventDispatcher\EventInterface;

src/Symfony/Component/Security/Http/Firewall/ContextListener.php

@@ -9,19 +9,19 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Bundle\SecurityBundle\Security\Firewall;
+namespace Symfony\Component\Security\Http\Firewall;
 
 use Symfony\Component\EventDispatcher\EventInterface;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\HttpKernelInterface;
 use Symfony\Component\HttpKernel\Log\LoggerInterface;
-use Symfony\Component\Security\Authentication\Token\AnonymousToken;
+use Symfony\Component\Security\Core\Authentication\Token\AnonymousToken;
-use Symfony\Component\Security\Authentication\Token\TokenInterface;
+use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
-use Symfony\Component\Security\Exception\UsernameNotFoundException;
+use Symfony\Component\Security\Core\Exception\UsernameNotFoundException;
-use Symfony\Component\Security\Exception\UnsupportedAccountException;
+use Symfony\Component\Security\Core\Exception\UnsupportedAccountException;
-use Symfony\Component\Security\SecurityContext;
+use Symfony\Component\Security\Core\SecurityContext;
-use Symfony\Component\Security\User\AccountInterface;
+use Symfony\Component\Security\Core\User\AccountInterface;
 
 /**
  * ContextListener manages the SecurityContext persistence through a session.

src/Symfony/Component/Security/Http/Firewall/DigestAuthenticationListener.php

@@ -9,21 +9,21 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Bundle\SecurityBundle\Security\Firewall;
+namespace Symfony\Component\Security\Http\Firewall;
 
-use Symfony\Component\Security\SecurityContext;
+use Symfony\Component\Security\Core\SecurityContext;
-use Symfony\Component\Security\User\UserProviderInterface;
+use Symfony\Component\Security\Core\User\UserProviderInterface;
-use Symfony\Bundle\SecurityBundle\Security\EntryPoint\DigestAuthenticationEntryPoint;
+use Symfony\Component\Security\Http\EntryPoint\DigestAuthenticationEntryPoint;
 use Symfony\Component\HttpKernel\Log\LoggerInterface;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\EventDispatcher\EventInterface;
-use Symfony\Component\Security\Authentication\Token\UsernamePasswordToken;
+use Symfony\Component\Security\Core\Authentication\Token\UsernamePasswordToken;
-use Symfony\Component\Security\Exception\BadCredentialsException;
+use Symfony\Component\Security\Core\Exception\BadCredentialsException;
-use Symfony\Component\Security\Exception\AuthenticationServiceException;
+use Symfony\Component\Security\Core\Exception\AuthenticationServiceException;
-use Symfony\Component\Security\Exception\UsernameNotFoundException;
+use Symfony\Component\Security\Core\Exception\UsernameNotFoundException;
-use Symfony\Bundle\SecurityBundle\Security\EntryPoint\NonceExpiredException;
+use Symfony\Component\Security\Http\EntryPoint\NonceExpiredException;
 use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\Security\Exception\AuthenticationException;
+use Symfony\Component\Security\Core\Exception\AuthenticationException;
 
 /**
  * DigestAuthenticationListener implements Digest HTTP authentication.

src/Symfony/Component/Security/Http/Firewall/ExceptionListener.php

@@ -9,21 +9,21 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Bundle\SecurityBundle\Security\Firewall;
+namespace Symfony\Component\Security\Http\Firewall;
 
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Bundle\SecurityBundle\Security\AccessDeniedHandler;
-use Symfony\Bundle\SecurityBundle\Security\ExceptionTranslation\AccessDeniedHandlerInterface;
+use Symfony\Component\Security\Http\ExceptionTranslation\AccessDeniedHandlerInterface;
-use Symfony\Component\Security\SecurityContext;
+use Symfony\Component\Security\Core\SecurityContext;
-use Symfony\Component\Security\Authentication\AuthenticationTrustResolverInterface;
+use Symfony\Component\Security\Core\Authentication\AuthenticationTrustResolverInterface;
-use Symfony\Component\Security\Authentication\EntryPoint\AuthenticationEntryPointInterface;
+use Symfony\Component\Security\Core\Authentication\EntryPoint\AuthenticationEntryPointInterface;
 use Symfony\Component\HttpKernel\Log\LoggerInterface;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\EventDispatcher\EventInterface;
-use Symfony\Component\Security\Exception\AuthenticationException;
+use Symfony\Component\Security\Core\Exception\AuthenticationException;
-use Symfony\Component\Security\Exception\AccessDeniedException;
+use Symfony\Component\Security\Core\Exception\AccessDeniedException;
-use Symfony\Component\Security\Authentication\Token\AnonymousToken;
+use Symfony\Component\Security\Core\Authentication\Token\AnonymousToken;
-use Symfony\Component\Security\Exception\InsufficientAuthenticationException;
+use Symfony\Component\Security\Core\Exception\InsufficientAuthenticationException;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpKernel\HttpKernelInterface;
 

src/Symfony/Component/Security/Http/Firewall/ListenerInterface.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Bundle\SecurityBundle\Security\Firewall;
+namespace Symfony\Component\Security\Http\Firewall;
 
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 

src/Symfony/Component/Security/Http/Firewall/LogoutListener.php

@@ -9,10 +9,10 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Bundle\SecurityBundle\Security\Firewall;
+namespace Symfony\Component\Security\Http\Firewall;
 
-use Symfony\Bundle\SecurityBundle\Security\Logout\LogoutHandlerInterface;
+use Symfony\Component\Security\Http\Logout\LogoutHandlerInterface;
-use Symfony\Component\Security\SecurityContext;
+use Symfony\Component\Security\Core\SecurityContext;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\EventDispatcher\EventInterface;
 use Symfony\Component\HttpFoundation\Response;

src/Symfony/Component/Security/Http/Firewall/PreAuthenticatedListener.php

@@ -9,15 +9,15 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Bundle\SecurityBundle\Security\Firewall;
+namespace Symfony\Component\Security\Http\Firewall;
 
-use Symfony\Component\Security\SecurityContext;
+use Symfony\Component\Security\Core\SecurityContext;
-use Symfony\Component\Security\Authentication\AuthenticationManagerInterface;
+use Symfony\Component\Security\Core\Authentication\AuthenticationManagerInterface;
 use Symfony\Component\HttpKernel\Log\LoggerInterface;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\EventDispatcher\EventInterface;
-use Symfony\Component\Security\Authentication\Token\PreAuthenticatedToken;
+use Symfony\Component\Security\Core\Authentication\Token\PreAuthenticatedToken;
-use Symfony\Component\Security\Exception\AuthenticationException;
+use Symfony\Component\Security\Core\Exception\AuthenticationException;
 use Symfony\Component\HttpFoundation\Request;
 
 /**

src/Symfony/Component/Security/Http/Firewall/RememberMeListener.php

@@ -1,18 +1,18 @@
 <?php
 
-namespace Symfony\Bundle\SecurityBundle\Security\Firewall;
+namespace Symfony\Component\Security\Http\Firewall;
 
-use Symfony\Component\Security\Authentication\Token\TokenInterface;
+use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
-use Symfony\Component\Security\Exception\AuthenticationException;
+use Symfony\Component\Security\Core\Exception\AuthenticationException;
-use Symfony\Component\Security\Exception\CookieTheftException;
+use Symfony\Component\Security\Core\Exception\CookieTheftException;
 use Symfony\Component\HttpKernel\HttpKernelInterface;
 use Symfony\Component\HttpKernel\Log\LoggerInterface;
-use Symfony\Component\Security\Authentication\AuthenticationManagerInterface;
+use Symfony\Component\Security\Core\Authentication\AuthenticationManagerInterface;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\EventDispatcher\EventInterface;
 use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\Security\SecurityContext;
+use Symfony\Component\Security\Core\SecurityContext;
-use Symfony\Bundle\SecurityBundle\Security\RememberMe\RememberMeServicesInterface;
+use Symfony\Component\Security\Http\RememberMe\RememberMeServicesInterface;
 
 /*
  * This file is part of the Symfony framework.

src/Symfony/Component/Security/Http/Firewall/SwitchUserListener.php

@@ -9,22 +9,22 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Bundle\SecurityBundle\Security\Firewall;
+namespace Symfony\Component\Security\Http\Firewall;
 
-use Symfony\Component\Security\SecurityContext;
+use Symfony\Component\Security\Core\SecurityContext;
-use Symfony\Component\Security\User\UserProviderInterface;
+use Symfony\Component\Security\Core\User\UserProviderInterface;
-use Symfony\Component\Security\User\AccountCheckerInterface;
+use Symfony\Component\Security\Core\User\AccountCheckerInterface;
-use Symfony\Component\Security\Authorization\AccessDecisionManagerInterface;
+use Symfony\Component\Security\Core\Authorization\AccessDecisionManagerInterface;
 use Symfony\Component\HttpKernel\Log\LoggerInterface;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\EventDispatcher\EventInterface;
-use Symfony\Component\Security\Exception\AuthenticationException;
+use Symfony\Component\Security\Core\Exception\AuthenticationException;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\Security\Role\SwitchUserRole;
+use Symfony\Component\Security\Core\Role\SwitchUserRole;
-use Symfony\Component\Security\Authentication\Token\UsernamePasswordToken;
+use Symfony\Component\Security\Core\Authentication\Token\UsernamePasswordToken;
-use Symfony\Component\Security\Exception\AuthenticationCredentialsNotFoundException;
+use Symfony\Component\Security\Core\Exception\AuthenticationCredentialsNotFoundException;
-use Symfony\Component\Security\Authentication\Token\TokenInterface;
+use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
 
 /**
  * SwitchUserListener allows a user to impersonate another one temporarly