Merge pull request #195 from GradPV/develop

fix method overrides a parent method but renames a param

Author: ADmad

src/OAuth1/AbstractProvider.php

@@ -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) {
@@ -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']);
     }
 
     /**

src/OAuth2/AbstractProvider.php

@@ -171,7 +171,7 @@ public function getAccessToken(string $code): AccessToken
     }
 
     /**
-     * @param array $parameters
+     * @param array $requestParameters
      * @return AccessToken
      * @throws InvalidAccessToken
      * @throws InvalidResponse
@@ -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)) {
@@ -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']);
     }
 
     /**

src/OAuth2/Provider/SmashCast.php

@@ -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();
         }
 
@@ -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']);
     }
 
     /**