namespace changes

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

6 files changed, 0 insertions, 429 deletions

diff --git a/Authentication/Provider/AnonymousAuthenticationProvider.php b/Authentication/Provider/AnonymousAuthenticationProvider.php
deleted file mode 100644
index 92f668d..0000000
--- a/Authentication/Provider/AnonymousAuthenticationProvider.php
+++ /dev/null
@@ -1,60 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Security\Authentication\Provider;
-
-use Symfony\Component\Security\Authentication\Token\TokenInterface;
-use Symfony\Component\Security\Exception\BadCredentialsException;
-use Symfony\Component\Security\Authentication\Token\AnonymousToken;
-
-/**
- * AnonymousAuthenticationProvider validates AnonymousToken instances.
- *
- * @author Fabien Potencier <fabien.potencier@symfony-project.com>
- */
-class AnonymousAuthenticationProvider implements AuthenticationProviderInterface
-{
-    protected $key;
-
-    /**
-     * Constructor.
-     *
-     * @param string $key The key shared with the authentication token
-     */
-    public function __construct($key)
-    {
-        $this->key = $key;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function authenticate(TokenInterface $token)
-    {
-        if (!$this->supports($token)) {
-            return null;
-        }
-
-        if ($this->key != $token->getKey()) {
-            throw new BadCredentialsException('The Token does not contain the expected key.');
-        }
-
-        return $token;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function supports(TokenInterface $token)
-    {
-        return $token instanceof AnonymousToken;
-    }
-}
diff --git a/Authentication/Provider/AuthenticationProviderInterface.php b/Authentication/Provider/AuthenticationProviderInterface.php
deleted file mode 100644
index 843f05c..0000000
--- a/Authentication/Provider/AuthenticationProviderInterface.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Security\Authentication\Provider;
-
-use Symfony\Component\Security\Authentication\Token\TokenInterface;
-use Symfony\Component\Security\Authentication\AuthenticationManagerInterface;
-
-/**
- * AuthenticationProviderInterface is the interface for for all authentication
- * providers.
- *
- * Concrete implementations processes specific Token instances.
- *
- * @author Fabien Potencier <fabien.potencier@symfony-project.com>
- */
-interface AuthenticationProviderInterface extends AuthenticationManagerInterface
-{
-    /**
-     * Checks whether this provider supports the given token.
-     *
-     * @param TokenInterface $token A TokenInterface instance
-     *
-     * @return Boolean true if the implementation supports the Token, false otherwise
-     */
-     function supports(TokenInterface $token);
-}
diff --git a/Authentication/Provider/DaoAuthenticationProvider.php b/Authentication/Provider/DaoAuthenticationProvider.php
deleted file mode 100644
index 69ef9a3..0000000
--- a/Authentication/Provider/DaoAuthenticationProvider.php
+++ /dev/null
@@ -1,95 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Security\Authentication\Provider;
-
-use Symfony\Component\Security\Authentication\Token\TokenInterface;
-use Symfony\Component\Security\Encoder\EncoderFactoryInterface;
-use Symfony\Component\Security\User\UserProviderInterface;
-use Symfony\Component\Security\User\AccountCheckerInterface;
-use Symfony\Component\Security\User\AccountInterface;
-use Symfony\Component\Security\Exception\UsernameNotFoundException;
-use Symfony\Component\Security\Exception\AuthenticationServiceException;
-use Symfony\Component\Security\Exception\BadCredentialsException;
-use Symfony\Component\Security\Authentication\Token\UsernamePasswordToken;
-
-/**
- * DaoAuthenticationProvider uses a UserProviderInterface to retrieve the user
- * for a UsernamePasswordToken.
- *
- * @author Fabien Potencier <fabien.potencier@symfony-project.com>
- */
-class DaoAuthenticationProvider extends UserAuthenticationProvider
-{
-    protected $encoderFactory;
-    protected $userProvider;
-
-    /**
-     * Constructor.
-     *
-     * @param UserProviderInterface    $userProvider    A UserProviderInterface instance
-     * @param AccountCheckerInterface  $accountChecker  An AccountCheckerInterface instance
-     * @param EncoderFactoryInterface  $encoderFactory  A EncoderFactoryInterface instance
-     */
-    public function __construct(UserProviderInterface $userProvider, AccountCheckerInterface $accountChecker, $providerKey, EncoderFactoryInterface $encoderFactory, $hideUserNotFoundExceptions = true)
-    {
-        parent::__construct($accountChecker, $providerKey, $hideUserNotFoundExceptions);
-
-        $this->encoderFactory = $encoderFactory;
-        $this->userProvider = $userProvider;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function checkAuthentication(AccountInterface $account, UsernamePasswordToken $token)
-    {
-        $user = $token->getUser();
-        if ($user instanceof AccountInterface) {
-            if ($account->getPassword() !== $user->getPassword()) {
-                throw new BadCredentialsException('The credentials were changed from another session.');
-            }
-        } else {
-            if (!$presentedPassword = (string) $token->getCredentials()) {
-                throw new BadCredentialsException('Bad credentials');
-            }
-
-            if (!$this->encoderFactory->getEncoder($account)->isPasswordValid($account->getPassword(), $presentedPassword, $account->getSalt())) {
-                throw new BadCredentialsException('Bad credentials');
-            }
-        }
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function retrieveUser($username, UsernamePasswordToken $token)
-    {
-        $user = $token->getUser();
-        if ($user instanceof AccountInterface) {
-            return $user;
-        }
-
-        try {
-            $user = $this->userProvider->loadUserByUsername($username);
-
-            if (!$user instanceof AccountInterface) {
-                throw new AuthenticationServiceException('The user provider must return an AccountInterface object.');
-            }
-
-            return $user;
-        } catch (UsernameNotFoundException $notFound) {
-            throw $notFound;
-        } catch (\Exception $repositoryProblem) {
-            throw new AuthenticationServiceException($repositoryProblem->getMessage(), $token, 0, $repositoryProblem);
-        }
-    }
-}
diff --git a/Authentication/Provider/PreAuthenticatedAuthenticationProvider.php b/Authentication/Provider/PreAuthenticatedAuthenticationProvider.php
deleted file mode 100644
index 850b1ec..0000000
--- a/Authentication/Provider/PreAuthenticatedAuthenticationProvider.php
+++ /dev/null
@@ -1,81 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Security\Authentication\Provider;
-
-use Symfony\Component\Security\User\AccountInterface;
-use Symfony\Component\Security\User\UserProviderInterface;
-use Symfony\Component\Security\User\AccountCheckerInterface;
-use Symfony\Component\Security\Exception\BadCredentialsException;
-use Symfony\Component\Security\Authentication\Token\PreAuthenticatedToken;
-use Symfony\Component\Security\Authentication\Token\TokenInterface;
-
-/**
- * Processes a pre-authenticated authentication request.
- *
- * This authentication provider will not perform any checks on authentication
- * requests, as they should already be pre-authenticated. However, the
- * UserProviderInterface implementation may still throw a
- * UsernameNotFoundException, for example.
- *
- * @author Fabien Potencier <fabien.potencier@symfony-project.com>
- */
-class PreAuthenticatedAuthenticationProvider implements AuthenticationProviderInterface
-{
-    protected $userProvider;
-    protected $accountChecker;
-    protected $providerKey;
-
-    /**
-     * Constructor.
-     *
-     * @param UserProviderInterface   $userProvider   A UserProviderInterface instance
-     * @param AccountCheckerInterface $accountChecker An AccountCheckerInterface instance
-     */
-    public function __construct(UserProviderInterface $userProvider, AccountCheckerInterface $accountChecker, $providerKey)
-    {
-        $this->userProvider = $userProvider;
-        $this->accountChecker = $accountChecker;
-        $this->providerKey = $providerKey;
-    }
-
-     /**
-      * {@inheritdoc}
-      */
-     public function authenticate(TokenInterface $token)
-     {
-         if (!$this->supports($token)) {
-             return null;
-         }
-
-        if (!$user = $token->getUser()) {
-            throw new BadCredentialsException('No pre-authenticated principal found in request.');
-        }
-/*
-        if (null === $token->getCredentials()) {
-            throw new BadCredentialsException('No pre-authenticated credentials found in request.');
-        }
-*/
-        $user = $this->userProvider->loadUserByUsername($user);
-
-        $this->accountChecker->checkPostAuth($user);
-
-        return new PreAuthenticatedToken($user, $token->getCredentials(), $user->getRoles());
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function supports(TokenInterface $token)
-    {
-        return $token instanceof PreAuthenticatedToken && $this->providerKey === $token->getProviderKey();
-    }
-}
diff --git a/Authentication/Provider/RememberMeAuthenticationProvider.php b/Authentication/Provider/RememberMeAuthenticationProvider.php
deleted file mode 100644
index d2d0268..0000000
--- a/Authentication/Provider/RememberMeAuthenticationProvider.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-namespace Symfony\Component\Security\Authentication\Provider;
-
-use Symfony\Component\Security\User\AccountCheckerInterface;
-use Symfony\Component\Security\User\AccountInterface;
-use Symfony\Component\Security\Authentication\Token\TokenInterface;
-use Symfony\Component\Security\Authentication\Token\RememberMeToken;
-use Symfony\Component\Security\Exception\BadCredentialsException;
-
-class RememberMeAuthenticationProvider implements AuthenticationProviderInterface
-{
-    protected $accountChecker;
-    protected $key;
-    protected $providerKey;
-
-    public function __construct(AccountCheckerInterface $accountChecker, $key, $providerKey)
-    {
-        $this->accountChecker = $accountChecker;
-        $this->key = $key;
-        $this->providerKey = $providerKey;
-    }
-
-    public function authenticate(TokenInterface $token)
-    {
-        if (!$this->supports($token)) {
-            return;
-        }
-
-        if ($this->key !== $token->getKey()) {
-            throw new BadCredentialsException('The presented key does not match.');
-        }
-
-        $user = $token->getUser();
-        $this->accountChecker->checkPreAuth($user);
-        $this->accountChecker->checkPostAuth($user);
-        $token->setAuthenticated(true);
-
-        return $token;
-    }
-
-    public function supports(TokenInterface $token)
-    {
-        return $token instanceof RememberMeToken && $token->getProviderKey() === $this->providerKey;
-    }
-}
\ No newline at end of file
diff --git a/Authentication/Provider/UserAuthenticationProvider.php b/Authentication/Provider/UserAuthenticationProvider.php
deleted file mode 100644
index fa678b7..0000000
--- a/Authentication/Provider/UserAuthenticationProvider.php
+++ /dev/null
@@ -1,113 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Security\Authentication\Provider;
-
-use Symfony\Component\Security\User\AccountInterface;
-use Symfony\Component\Security\User\AccountCheckerInterface;
-use Symfony\Component\Security\Exception\UsernameNotFoundException;
-use Symfony\Component\Security\Exception\AuthenticationException;
-use Symfony\Component\Security\Exception\BadCredentialsException;
-use Symfony\Component\Security\Exception\AuthenticationServiceException;
-use Symfony\Component\Security\Authentication\Token\UsernamePasswordToken;
-use Symfony\Component\Security\Authentication\Token\TokenInterface;
-
-/**
- * UserProviderInterface retrieves users for UsernamePasswordToken tokens.
- *
- * @author Fabien Potencier <fabien.potencier@symfony-project.com>
- */
-abstract class UserAuthenticationProvider implements AuthenticationProviderInterface
-{
-    protected $hideUserNotFoundExceptions;
-    protected $accountChecker;
-    protected $providerKey;
-
-    /**
-     * Constructor.
-     *
-     * @param AccountCheckerInterface $accountChecker             An AccountCheckerInterface interface
-     * @param Boolean                 $hideUserNotFoundExceptions Whether to hide user not found exception or not
-     */
-    public function __construct(AccountCheckerInterface $accountChecker, $providerKey, $hideUserNotFoundExceptions = true)
-    {
-        if (empty($providerKey)) {
-            throw new \InvalidArgumentException('$providerKey must not be empty.');
-        }
-
-        $this->accountChecker = $accountChecker;
-        $this->providerKey = $providerKey;
-        $this->hideUserNotFoundExceptions = $hideUserNotFoundExceptions;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function authenticate(TokenInterface $token)
-    {
-        if (!$this->supports($token)) {
-            return null;
-        }
-
-        $username = null === $token->getUser() ? 'NONE_PROVIDED' : (string) $token;
-
-        try {
-            $user = $this->retrieveUser($username, $token);
-
-            if (!$user instanceof AccountInterface) {
-                throw new AuthenticationServiceException('retrieveUser() must return an AccountInterface.');
-            }
-
-            $this->accountChecker->checkPreAuth($user);
-            $this->checkAuthentication($user, $token);
-            $this->accountChecker->checkPostAuth($user);
-
-            return new UsernamePasswordToken($user, $token->getCredentials(), $this->providerKey, $user->getRoles());
-        } catch (UsernameNotFoundException $notFound) {
-            if ($this->hideUserNotFoundExceptions) {
-                throw new BadCredentialsException('Bad credentials', 0, $notFound);
-            }
-
-            throw $notFound;
-        }
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function supports(TokenInterface $token)
-    {
-        return $token instanceof UsernamePasswordToken && $this->providerKey === $token->getProviderKey();
-    }
-
-    /**
-     * Retrieves the user from an implementation-specific location.
-     *
-     * @param string                $username The username to retrieve
-     * @param UsernamePasswordToken $token    The Token
-     *
-     * @return array The user
-     *
-     * @throws AuthenticationException if the credentials could not be validated
-     */
-    abstract protected function retrieveUser($username, UsernamePasswordToken $token);
-
-    /**
-     * Does additional checks on the user and token (like validating the
-     * credentials).
-     *
-     * @param AccountInterface      $account The retrieved AccountInterface instance
-     * @param UsernamePasswordToken $token   The UsernamePasswordToken token to be authenticated
-     *
-     * @throws AuthenticationException if the credentials could not be validated
-     */
-    abstract protected function checkAuthentication(AccountInterface $account, UsernamePasswordToken $token);
-}