Skip to content

fix method overrides a parent method but renames a param #195

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ADmad merged 1 commit into from
Jul 8, 2025
Merged

fix method overrides a parent method but renames a param #195

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/OAuth1/AbstractProvider.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,14 +250,14 @@ public function makeAuthUrl(): string
}

/**
* @param array $parameters
* @param array $requestParameters
* @return AccessToken
* @throws InvalidAccessToken
* @throws InvalidResponse
* @throws UnknownAuthorization
* @throws \Psr\Http\Client\ClientExceptionInterface
*/
public function getAccessTokenByRequestParameters(array $parameters)
public function getAccessTokenByRequestParameters(array $requestParameters)
{
$token = $this->session->get('oauth1_request_token');
if (!$token) {
Expand All @@ -266,11 +266,11 @@ public function getAccessTokenByRequestParameters(array $parameters)

$this->session->delete('oauth1_request_token');

if (!isset($parameters['oauth_verifier'])) {
if (!isset($requestParameters['oauth_verifier'])) {
throw new Unauthorized('Unknown oauth_verifier');
}

return $this->getAccessToken($token, $parameters['oauth_verifier']);
return $this->getAccessToken($token, $requestParameters['oauth_verifier']);
}

/**
Expand Down
18 changes: 9 additions & 9 deletions src/OAuth2/AbstractProvider.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ public function getAccessToken(string $code): AccessToken
}

/**
* @param array $parameters
* @param array $requestParameters
* @return AccessToken
* @throws InvalidAccessToken
* @throws InvalidResponse
Expand All @@ -181,18 +181,18 @@ public function getAccessToken(string $code): AccessToken
* @throws UnknownState
* @throws \Psr\Http\Client\ClientExceptionInterface
*/
public function getAccessTokenByRequestParameters(array $parameters)
public function getAccessTokenByRequestParameters(array $requestParameters)
{
if (isset($parameters['error']) && $parameters['error'] === 'access_denied') {
if (isset($requestParameters['error']) && $requestParameters['error'] === 'access_denied') {
throw new Unauthorized();
}

if (!isset($parameters['code'])) {
if (!isset($requestParameters['code'])) {
throw new Unauthorized('Unknown code');
}

if (isset($parameters['device_id'])) {
$this->session->set('device_id', $parameters['device_id']);
if (isset($requestParameters['device_id'])) {
$this->session->set('device_id', $requestParameters['device_id']);
}

if (!$this->getBoolOption('stateless', false)) {
Expand All @@ -201,16 +201,16 @@ public function getAccessTokenByRequestParameters(array $parameters)
throw new UnknownAuthorization();
}

if (!isset($parameters['state'])) {
if (!isset($requestParameters['state'])) {
throw new UnknownState();
}

if ($state !== $parameters['state']) {
if ($state !== $requestParameters['state']) {
throw new InvalidState();
}
}

return $this->getAccessToken($parameters['code']);
return $this->getAccessToken($requestParameters['code']);
}

/**
Expand Down
14 changes: 7 additions & 7 deletions src/OAuth2/Provider/SmashCast.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,9 +89,9 @@ protected function makeAccessTokenRequest(string $code): RequestInterface
/**
* {@inheritdoc}
*/
public function getAccessTokenByRequestParameters(array $parameters)
public function getAccessTokenByRequestParameters(array $requestParameters)
{
if (isset($parameters['error']) && $parameters['error'] === 'access_denied') {
if (isset($requestParameters['error']) && $requestParameters['error'] === 'access_denied') {
throw new Unauthorized();
}

Expand All @@ -101,20 +101,20 @@ public function getAccessTokenByRequestParameters(array $parameters)
throw new UnknownAuthorization();
}

if (!isset($parameters['state'])) {
if (!isset($requestParameters['state'])) {
throw new UnknownState();
}

if ($state !== $parameters['state']) {
if ($state !== $requestParameters['state']) {
throw new InvalidState();
}
}

if (isset($parameters['authToken'])) {
return new AccessToken(['access_token' => $parameters['authToken']]);
if (isset($requestParameters['authToken'])) {
return new AccessToken(['access_token' => $requestParameters['authToken']]);
}

return $this->getAccessToken($parameters['request_token']);
return $this->getAccessToken($requestParameters['request_token']);
}

/**
Expand Down