Merge pull request #539 from tomasjav/1.6

fix usages of deprecated constants

Author: GuilhemN

Security/Authentication/Provider/OAuthProvider.php

@@ -12,6 +12,7 @@
 namespace FOS\OAuthServerBundle\Security\Authentication\Provider;
 
 use FOS\OAuthServerBundle\Security\Authentication\Token\OAuthToken;
+use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Security\Core\Authentication\Provider\AuthenticationProviderInterface;
 use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
 use Symfony\Component\Security\Core\Exception\AuthenticationException;
@@ -74,7 +75,7 @@ public function authenticate(TokenInterface $token)
                     try {
                         $this->userChecker->checkPreAuth($user);
                     } catch (AccountStatusException $e) {
-                        throw new OAuth2AuthenticateException(OAuth2::HTTP_UNAUTHORIZED,
+                        throw new OAuth2AuthenticateException(Response::HTTP_UNAUTHORIZED,
                             OAuth2::TOKEN_TYPE_BEARER,
                             $this->serverService->getVariable(OAuth2::CONFIG_WWW_REALM),
                             'access_denied',
@@ -103,7 +104,7 @@ public function authenticate(TokenInterface $token)
                     try {
                         $this->userChecker->checkPostAuth($user);
                     } catch (AccountStatusException $e) {
-                        throw new OAuth2AuthenticateException(OAuth2::HTTP_UNAUTHORIZED,
+                        throw new OAuth2AuthenticateException(Response::HTTP_UNAUTHORIZED,
                             OAuth2::TOKEN_TYPE_BEARER,
                             $this->serverService->getVariable(OAuth2::CONFIG_WWW_REALM),
                             'access_denied',

Security/EntryPoint/OAuthEntryPoint.php

@@ -11,6 +11,7 @@
 
 namespace FOS\OAuthServerBundle\Security\EntryPoint;
 
+use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Security\Http\EntryPoint\AuthenticationEntryPointInterface;
 use Symfony\Component\Security\Core\Exception\AuthenticationException;
 use Symfony\Component\HttpFoundation\Request;
@@ -29,7 +30,7 @@ public function __construct(OAuth2 $serverService)
     public function start(Request $request, AuthenticationException $authException = null)
     {
         $exception = new OAuth2AuthenticateException(
-            OAuth2::HTTP_UNAUTHORIZED,
+            Response::HTTP_UNAUTHORIZED,
             OAuth2::TOKEN_TYPE_BEARER,
             $this->serverService->getVariable(OAuth2::CONFIG_WWW_REALM),
             'access_denied',

Storage/OAuthStorage.php

@@ -16,6 +16,7 @@
 use FOS\OAuthServerBundle\Model\AuthCodeManagerInterface;
 use FOS\OAuthServerBundle\Model\ClientManagerInterface;
 use FOS\OAuthServerBundle\Model\ClientInterface;
+use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Security\Core\User\UserProviderInterface;
 use Symfony\Component\Security\Core\Encoder\EncoderFactoryInterface;
 use Symfony\Component\Security\Core\Exception\AuthenticationException;
@@ -255,7 +256,7 @@ public function unsetRefreshToken($tokenString)
     public function checkGrantExtension(IOAuth2Client $client, $uri, array $inputData, array $authHeaders)
     {
         if (!isset($this->grantExtensions[$uri])) {
-            throw new OAuth2ServerException(OAuth2::HTTP_BAD_REQUEST, OAuth2::ERROR_UNSUPPORTED_GRANT_TYPE);
+            throw new OAuth2ServerException(Response::HTTP_BAD_REQUEST, OAuth2::ERROR_UNSUPPORTED_GRANT_TYPE);
         }
 
         $grantExtension = $this->grantExtensions[$uri];