Tidy use statements. Fix typos in param names. Fix Exception usage an…

…d don't throw an abstract Exception class. Use parameters passed in to ::sendRequest.

src/core/HttpClient.php

@@ -25,12 +25,12 @@ class HttpClient {
  protected $responseHttpStatusCode = 0;
 
  /**
- * @var \GuzzleHttp\Client The Guzzle client
+ * @var Client The Guzzle client
  */
  protected $guzzleClient;
 
  /**
- * @param \GuzzleHttp\Client|null The Guzzle client
+ * @param Client|null The Guzzle client
  */
  public function __construct($guzzleClient) {
  $this->guzzleClient = $guzzleClient;
@@ -71,9 +71,9 @@ public function getResponseHttpStatusCode() {
  * @param string $method The request method
  * @param array $bodyParameters The key value pairs to be sent in the body
  *
- * @return response from the server
+ * @return object - response from the server
  *
- * @throws \Viagogo\ViagogoException
+ * @throws \Viagogo\Exceptions\ViagogoException
  */
  public function send($url, $method = 'GET', $queryParameters = array(), $bodyParameters = array()) {
  $options = array();

src/core/OAuthClient.php

@@ -3,7 +3,6 @@
 namespace Viagogo\Core;
 
 use GuzzleHttp\Client;
-use Viagogo\Exceptions\ViagogoException;
 
 /**
  *
@@ -26,32 +25,29 @@ public function getClientAccessToken($scopes = "") {
  return $this->sendRequest($this->url, "POST", $params);
  }
 
- public function getPasswordAccessToken($login, $passowrd, $scopes) {
+ public function getPasswordAccessToken($login, $password, $scopes) {
  $params = [
  'grant_type' => 'password',
  'username' => $login,
- 'password' => $passowrd,
+ 'password' => $password,
  'scope' => $scopes,
  ];
-
- $token = $this->httpClient->send($this->url, "POST", null, $params);
-
  return $this->sendRequest($this->url, "POST", $params);
  }
 
- public function getRefreshToken($refeshToken = "") {
+ public function getRefreshToken($refreshToken = "") {
  $params = [
  'grant_type' => 'refresh_token',
- 'refresh_token' => $refeshToken,
+ 'refresh_token' => $refreshToken,
  ];
 
  return $this->sendRequest($this->url, "POST", $params);
  }
 
  private function sendRequest($url, $method, $params) {
- $token = $this->httpClient->send($this->url, "POST", null, $params);
+ $token = $this->httpClient->send($url, $method, null, $params);
  if (isset($token->error)) {
- throw new ViagogoException($token->error . "\n" . $token->error_description, 1);
+ throw new \Exception($token->error . "\n" . $token->error, 1);
  }
 
  return new OAuthToken($token);