Merge pull request #475 from thephpleague/analysis-zYjdLv

Applied fixes from StyleCI
This commit is contained in:
Alex Bilbie
2016-03-17 15:38:10 +01:00
9 changed files with 18 additions and 15 deletions

View File

@@ -2,12 +2,12 @@
namespace League\OAuth2\Server\AuthorizationValidators; namespace League\OAuth2\Server\AuthorizationValidators;
use League\OAuth2\Server\CryptTrait;
use League\OAuth2\Server\Repositories\AccessTokenRepositoryInterface;
use Psr\Http\Message\ServerRequestInterface;
use Lcobucci\JWT\Parser; use Lcobucci\JWT\Parser;
use Lcobucci\JWT\Signer\Rsa\Sha256; use Lcobucci\JWT\Signer\Rsa\Sha256;
use League\OAuth2\Server\CryptTrait;
use League\OAuth2\Server\Exception\OAuthServerException; use League\OAuth2\Server\Exception\OAuthServerException;
use League\OAuth2\Server\Repositories\AccessTokenRepositoryInterface;
use Psr\Http\Message\ServerRequestInterface;
class BearerTokenValidator implements AuthorizationValidatorInterface class BearerTokenValidator implements AuthorizationValidatorInterface
{ {

View File

@@ -50,6 +50,7 @@ abstract class AbstractAuthorizeGrant extends AbstractGrant
public function makeRedirectUri($uri, $params = [], $queryDelimiter = '?') public function makeRedirectUri($uri, $params = [], $queryDelimiter = '?')
{ {
$uri .= (strstr($uri, $queryDelimiter) === false) ? $queryDelimiter : '&'; $uri .= (strstr($uri, $queryDelimiter) === false) ? $queryDelimiter : '&';
return $uri . http_build_query($params); return $uri . http_build_query($params);
} }
} }

View File

@@ -146,6 +146,7 @@ class AuthCodeGrant extends AbstractAuthorizeGrant
$htmlResponse = new HtmlResponse($this->accessTokenRepository); $htmlResponse = new HtmlResponse($this->accessTokenRepository);
$htmlResponse->setStatusCode(403); $htmlResponse->setStatusCode(403);
$htmlResponse->setHtml($html); $htmlResponse->setHtml($html);
return $htmlResponse; return $htmlResponse;
} }

View File

@@ -144,6 +144,7 @@ class ImplicitGrant extends AbstractAuthorizeGrant
$htmlResponse = new HtmlResponse($this->accessTokenRepository); $htmlResponse = new HtmlResponse($this->accessTokenRepository);
$htmlResponse->setStatusCode(403); $htmlResponse->setStatusCode(403);
$htmlResponse->setHtml($html); $htmlResponse->setHtml($html);
return $htmlResponse; return $htmlResponse;
} }
@@ -155,7 +156,7 @@ class ImplicitGrant extends AbstractAuthorizeGrant
'postback_uri' => $this->makeRedirectUri( 'postback_uri' => $this->makeRedirectUri(
$postbackUri, $postbackUri,
$request->getQueryParams() $request->getQueryParams()
) ),
]); ]);
$htmlResponse = new HtmlResponse($this->accessTokenRepository); $htmlResponse = new HtmlResponse($this->accessTokenRepository);