From dbe21cc5a719a62d5f10abbd30da745f832e1fef Mon Sep 17 00:00:00 2001 From: Alex Bilbie Date: Wed, 8 May 2013 19:36:00 -0700 Subject: [PATCH] Removed null as default for parameters --- src/League/OAuth2/Server/Grant/AuthCode.php | 2 +- src/League/OAuth2/Server/Storage/ClientInterface.php | 2 +- src/League/OAuth2/Server/Storage/PDO/Client.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/League/OAuth2/Server/Grant/AuthCode.php b/src/League/OAuth2/Server/Grant/AuthCode.php index 9770c929..9ea1e9da 100644 --- a/src/League/OAuth2/Server/Grant/AuthCode.php +++ b/src/League/OAuth2/Server/Grant/AuthCode.php @@ -127,7 +127,7 @@ class AuthCode implements GrantTypeInterface { } // Validate client ID and redirect URI - $clientDetails = $this->authServer->getStorage('client')->getClient($authParams['client_id'], null, $authParams['redirect_uri']); + $clientDetails = $this->authServer->getStorage('client')->getClient($authParams['client_id'], null, $authParams['redirect_uri'], $this->identifier); if ($clientDetails === false) { throw new Exception\ClientException($this->authServer->getExceptionMessage('invalid_client'), 8); diff --git a/src/League/OAuth2/Server/Storage/ClientInterface.php b/src/League/OAuth2/Server/Storage/ClientInterface.php index d21ecfab..b98da03d 100644 --- a/src/League/OAuth2/Server/Storage/ClientInterface.php +++ b/src/League/OAuth2/Server/Storage/ClientInterface.php @@ -53,5 +53,5 @@ interface ClientInterface * @param string $grantType The grant type used in the request * @return bool|array Returns false if the validation fails, array on success */ - public function getClient($clientId = null, $clientSecret = null, $redirectUri = null, $grantType = null); + public function getClient($clientId, $clientSecret = null, $redirectUri = null, $grantType); } \ No newline at end of file diff --git a/src/League/OAuth2/Server/Storage/PDO/Client.php b/src/League/OAuth2/Server/Storage/PDO/Client.php index fa1f3986..ced1a3ca 100644 --- a/src/League/OAuth2/Server/Storage/PDO/Client.php +++ b/src/League/OAuth2/Server/Storage/PDO/Client.php @@ -6,7 +6,7 @@ use League\OAuth2\Server\Storage\ClientInterface; class Client implements ClientInterface { - public function getClient($clientId = null, $clientSecret = null, $redirectUri = null, $grantType = null) + public function getClient($clientId, $clientSecret = null, $redirectUri = null, $grantType) { $db = \ezcDbInstance::get();