From cefecede817036c7761870a17fb2fe92ad2d1b5b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=B0rfan=20Evrens?= <irfanevrens@gmail.com>
Date: Thu, 25 Jun 2015 23:08:11 +0300
Subject: [PATCH] Tiny improvements.

---
 lib/PayPal/Api/Address.php                |  2 --
 lib/PayPal/Api/Agreement.php              |  3 +--
 lib/PayPal/Api/Authorization.php          |  3 +--
 lib/PayPal/Api/Capture.php                |  3 +--
 lib/PayPal/Api/CreditCardHistory.php      |  6 ++----
 lib/PayPal/Api/FuturePayment.php          |  1 -
 lib/PayPal/Api/InvoiceAddress.php         |  2 --
 lib/PayPal/Api/OpenIdAddress.php          | 11 ++++++++++-
 lib/PayPal/Api/OpenIdError.php            |  6 ++++++
 lib/PayPal/Api/OpenIdSession.php          | 10 ++++++----
 lib/PayPal/Api/OpenIdTokeninfo.php        | 10 +++++++++-
 lib/PayPal/Api/OpenIdUserinfo.php         | 24 +++++++++++++++++++++++
 lib/PayPal/Api/Order.php                  |  4 +---
 lib/PayPal/Api/Payee.php                  |  1 -
 lib/PayPal/Api/Payment.php                |  4 +---
 lib/PayPal/Api/Plan.php                   |  3 +--
 lib/PayPal/Api/Sale.php                   |  3 ++-
 lib/PayPal/Api/ShippingAddress.php        |  2 --
 lib/PayPal/Api/TransactionBase.php        |  3 ---
 lib/PayPal/Api/Transactions.php           |  1 -
 lib/PayPal/Api/WebProfile.php             |  3 +--
 lib/PayPal/Api/Webhook.php                |  3 +--
 lib/PayPal/Api/WebhookEventType.php       |  3 +--
 lib/PayPal/Auth/OAuthTokenCredential.php  |  3 +++
 lib/PayPal/Common/PayPalResourceModel.php |  3 +--
 lib/PayPal/Core/PayPalHttpConnection.php  |  1 +
 26 files changed, 73 insertions(+), 45 deletions(-)

diff --git a/lib/PayPal/Api/Address.php b/lib/PayPal/Api/Address.php
index 175db20..a8f72fd 100644
--- a/lib/PayPal/Api/Address.php
+++ b/lib/PayPal/Api/Address.php
@@ -2,8 +2,6 @@
 
 namespace PayPal\Api;
 
-use PayPal\Common\PayPalModel;
-
 /**
  * Class Address
  *
diff --git a/lib/PayPal/Api/Agreement.php b/lib/PayPal/Api/Agreement.php
index b0899b8..810dde2 100644
--- a/lib/PayPal/Api/Agreement.php
+++ b/lib/PayPal/Api/Agreement.php
@@ -4,10 +4,9 @@ namespace PayPal\Api;
 
 use PayPal\Common\PayPalResourceModel;
 use PayPal\Core\PayPalConstants;
-use PayPal\Validation\ArgumentValidator;
-use PayPal\Api\AgreementTransactions;
 use PayPal\Rest\ApiContext;
 use PayPal\Transport\PayPalRestCall;
+use PayPal\Validation\ArgumentValidator;
 
 /**
  * Class Agreement
diff --git a/lib/PayPal/Api/Authorization.php b/lib/PayPal/Api/Authorization.php
index f424790..68a72fe 100644
--- a/lib/PayPal/Api/Authorization.php
+++ b/lib/PayPal/Api/Authorization.php
@@ -3,10 +3,9 @@
 namespace PayPal\Api;
 
 use PayPal\Common\PayPalResourceModel;
-use PayPal\Validation\ArgumentValidator;
-use PayPal\Api\Capture;
 use PayPal\Rest\ApiContext;
 use PayPal\Transport\PayPalRestCall;
+use PayPal\Validation\ArgumentValidator;
 
 /**
  * Class Authorization
diff --git a/lib/PayPal/Api/Capture.php b/lib/PayPal/Api/Capture.php
index 288d67f..7a573c1 100644
--- a/lib/PayPal/Api/Capture.php
+++ b/lib/PayPal/Api/Capture.php
@@ -3,10 +3,9 @@
 namespace PayPal\Api;
 
 use PayPal\Common\PayPalResourceModel;
-use PayPal\Validation\ArgumentValidator;
-use PayPal\Api\Refund;
 use PayPal\Rest\ApiContext;
 use PayPal\Transport\PayPalRestCall;
+use PayPal\Validation\ArgumentValidator;
 
 /**
  * Class Capture
diff --git a/lib/PayPal/Api/CreditCardHistory.php b/lib/PayPal/Api/CreditCardHistory.php
index 636429c..2c0874e 100644
--- a/lib/PayPal/Api/CreditCardHistory.php
+++ b/lib/PayPal/Api/CreditCardHistory.php
@@ -3,7 +3,6 @@
 namespace PayPal\Api;
 
 use PayPal\Common\PayPalModel;
-use PayPal\Rest\ApiContext;
 
 /**
  * Class CreditCardHistory
@@ -20,10 +19,9 @@ class CreditCardHistory extends PayPalModel
 {
     /**
      * A list of credit card resources
-     * 
      *
-     * @param \PayPal\Api\CreditCard $credit-cards
-     * 
+     *
+     * @param $credit_cards
      * @return $this
      */
     public function setCreditCards($credit_cards)
diff --git a/lib/PayPal/Api/FuturePayment.php b/lib/PayPal/Api/FuturePayment.php
index 2bdc991..7e49a37 100644
--- a/lib/PayPal/Api/FuturePayment.php
+++ b/lib/PayPal/Api/FuturePayment.php
@@ -2,7 +2,6 @@
 
 namespace PayPal\Api;
 
-use PayPal\Common\PayPalModel;
 use PayPal\Rest\ApiContext;
 use PayPal\Transport\PayPalRestCall;
 
diff --git a/lib/PayPal/Api/InvoiceAddress.php b/lib/PayPal/Api/InvoiceAddress.php
index b8cd850..7e8786a 100644
--- a/lib/PayPal/Api/InvoiceAddress.php
+++ b/lib/PayPal/Api/InvoiceAddress.php
@@ -2,8 +2,6 @@
 
 namespace PayPal\Api;
 
-use PayPal\Common\PayPalModel;
-
 /**
  * Class InvoiceAddress
  *
diff --git a/lib/PayPal/Api/OpenIdAddress.php b/lib/PayPal/Api/OpenIdAddress.php
index 4bfe2dd..306abf6 100644
--- a/lib/PayPal/Api/OpenIdAddress.php
+++ b/lib/PayPal/Api/OpenIdAddress.php
@@ -5,11 +5,20 @@ namespace PayPal\Api;
 use PayPal\Common\PayPalModel;
 
 /**
+ * Class OpenIdAddress
+ *
  * End-User's preferred address.
+ *
+ * @package PayPal\Api
+ *
+ * @property string street_address
+ * @property string locality
+ * @property string region
+ * @property string postal_code
+ * @property string country
  */
 class OpenIdAddress extends PayPalModel
 {
-
     /**
      * Full street address component, which may include house number, street name.
      *
diff --git a/lib/PayPal/Api/OpenIdError.php b/lib/PayPal/Api/OpenIdError.php
index 18b488b..4b9b956 100644
--- a/lib/PayPal/Api/OpenIdError.php
+++ b/lib/PayPal/Api/OpenIdError.php
@@ -4,7 +4,13 @@ namespace PayPal\Api;
 use PayPal\Common\PayPalModel;
 
 /**
+ * Class OpenIdError
+ *
  * Error resource
+ *
+ * @property string error
+ * @property string error_description
+ * @property string error_uri
  */
 class OpenIdError extends PayPalModel
 {
diff --git a/lib/PayPal/Api/OpenIdSession.php b/lib/PayPal/Api/OpenIdSession.php
index cd6c397..088026d 100644
--- a/lib/PayPal/Api/OpenIdSession.php
+++ b/lib/PayPal/Api/OpenIdSession.php
@@ -12,13 +12,15 @@ class OpenIdSession
      * Returns the PayPal URL to which the user must be redirected to
      * start the authentication / authorization process.
      *
-     * @param string     $redirectUri   Uri on merchant website to where
+     * @param string $redirectUri Uri on merchant website to where
      *                                  the user must be redirected to post paypal login
-     * @param array      $scope         The access privilges that you are requesting for
+     * @param array $scope The access privilges that you are requesting for
      *                                  from the user. Pass empty array for all scopes.
-     * @param string     $clientId      client id from developer portal
+     * @param string $clientId client id from developer portal
      *                                  See https://developer.paypal.com/webapps/developer/docs/integration/direct/log-in-with-paypal/detailed/#attributes for more
-     * @param ApiContext $apiContext    Optional API Context
+     * @param null $nonce
+     * @param null $state
+     * @param ApiContext $apiContext Optional API Context
      * @return string Authorization URL
      */
     public static function getAuthorizationUrl($redirectUri, $scope, $clientId, $nonce = null, $state = null, $apiContext = null)
diff --git a/lib/PayPal/Api/OpenIdTokeninfo.php b/lib/PayPal/Api/OpenIdTokeninfo.php
index 39a660a..7d9cc97 100644
--- a/lib/PayPal/Api/OpenIdTokeninfo.php
+++ b/lib/PayPal/Api/OpenIdTokeninfo.php
@@ -1,13 +1,21 @@
 <?php
 namespace PayPal\Api;
 
-
 use PayPal\Common\PayPalResourceModel;
 use PayPal\Rest\ApiContext;
 use PayPal\Transport\PayPalRestCall;
 
 /**
+ * Class OpenIdTokeninfo
+ *
  * Token grant resource
+ *
+ * @property string scope
+ * @property string access_token
+ * @property string refresh_token
+ * @property string token_type
+ * @property string id_token
+ * @property int expires_in
  */
 class OpenIdTokeninfo extends PayPalResourceModel
 {
diff --git a/lib/PayPal/Api/OpenIdUserinfo.php b/lib/PayPal/Api/OpenIdUserinfo.php
index 445505a..46c00b8 100644
--- a/lib/PayPal/Api/OpenIdUserinfo.php
+++ b/lib/PayPal/Api/OpenIdUserinfo.php
@@ -5,7 +5,31 @@ use PayPal\Common\PayPalResourceModel;
 use PayPal\Rest\ApiContext;
 
 /**
+ * Class OpenIdUserinfo
+ *
  * OpenIdConnect UserInfo Resource
+ *
+ * @property string user_id
+ * @property string sub
+ * @property mixed name
+ * @property string given_name
+ * @property string family_name
+ * @property string middle_name
+ * @property string picture
+ * @property string email
+ * @property bool email_verified
+ * @property string gender
+ * @property string birthday
+ * @property string zoneinfo
+ * @property string locale
+ * @property string language
+ * @property bool verified
+ * @property string phone_number
+ * @property OpenIdAddress address
+ * @property mixed verified_account
+ * @property mixed account_type
+ * @property string age_range
+ * @property string payer_id
  */
 class OpenIdUserinfo extends PayPalResourceModel
 {
diff --git a/lib/PayPal/Api/Order.php b/lib/PayPal/Api/Order.php
index fd84dc6..d8153db 100644
--- a/lib/PayPal/Api/Order.php
+++ b/lib/PayPal/Api/Order.php
@@ -3,11 +3,9 @@
 namespace PayPal\Api;
 
 use PayPal\Common\PayPalResourceModel;
-use PayPal\Validation\ArgumentValidator;
-use PayPal\Api\Capture;
-use PayPal\Api\Authorization;
 use PayPal\Rest\ApiContext;
 use PayPal\Transport\PayPalRestCall;
+use PayPal\Validation\ArgumentValidator;
 
 /**
  * Class Order
diff --git a/lib/PayPal/Api/Payee.php b/lib/PayPal/Api/Payee.php
index 31344cd..6225f6b 100644
--- a/lib/PayPal/Api/Payee.php
+++ b/lib/PayPal/Api/Payee.php
@@ -3,7 +3,6 @@
 namespace PayPal\Api;
 
 use PayPal\Common\PayPalModel;
-use PayPal\Rest\ApiContext;
 
 /**
  * Class Payee
diff --git a/lib/PayPal/Api/Payment.php b/lib/PayPal/Api/Payment.php
index 502d327..968170e 100644
--- a/lib/PayPal/Api/Payment.php
+++ b/lib/PayPal/Api/Payment.php
@@ -4,11 +4,9 @@ namespace PayPal\Api;
 
 use PayPal\Common\PayPalResourceModel;
 use PayPal\Core\PayPalConstants;
-use PayPal\Validation\ArgumentValidator;
-use PayPal\Api\object;
-use PayPal\Api\PaymentHistory;
 use PayPal\Rest\ApiContext;
 use PayPal\Transport\PayPalRestCall;
+use PayPal\Validation\ArgumentValidator;
 
 /**
  * Class Payment
diff --git a/lib/PayPal/Api/Plan.php b/lib/PayPal/Api/Plan.php
index 4201903..630a9dc 100644
--- a/lib/PayPal/Api/Plan.php
+++ b/lib/PayPal/Api/Plan.php
@@ -4,10 +4,9 @@ namespace PayPal\Api;
 
 use PayPal\Common\PayPalModel;
 use PayPal\Common\PayPalResourceModel;
-use PayPal\Validation\ArgumentValidator;
-use PayPal\Api\PlanList;
 use PayPal\Rest\ApiContext;
 use PayPal\Transport\PayPalRestCall;
+use PayPal\Validation\ArgumentValidator;
 
 /**
  * Class Plan
diff --git a/lib/PayPal/Api/Sale.php b/lib/PayPal/Api/Sale.php
index d5e0a65..9301b0d 100644
--- a/lib/PayPal/Api/Sale.php
+++ b/lib/PayPal/Api/Sale.php
@@ -3,9 +3,9 @@
 namespace PayPal\Api;
 
 use PayPal\Common\PayPalResourceModel;
-use PayPal\Validation\ArgumentValidator;
 use PayPal\Rest\ApiContext;
 use PayPal\Transport\PayPalRestCall;
+use PayPal\Validation\ArgumentValidator;
 
 /**
  * Class Sale
@@ -15,6 +15,7 @@ use PayPal\Transport\PayPalRestCall;
  * @package PayPal\Api
  *
  * @property string id
+ * @property string purchase_unit_reference_id
  * @property string create_time
  * @property string update_time
  * @property \PayPal\Api\Amount amount
diff --git a/lib/PayPal/Api/ShippingAddress.php b/lib/PayPal/Api/ShippingAddress.php
index 4f5ef07..9bde918 100644
--- a/lib/PayPal/Api/ShippingAddress.php
+++ b/lib/PayPal/Api/ShippingAddress.php
@@ -2,8 +2,6 @@
 
 namespace PayPal\Api;
 
-use PayPal\Common\PayPalModel;
-
 /**
  * Class ShippingAddress
  *
diff --git a/lib/PayPal/Api/TransactionBase.php b/lib/PayPal/Api/TransactionBase.php
index 9038065..bf92833 100644
--- a/lib/PayPal/Api/TransactionBase.php
+++ b/lib/PayPal/Api/TransactionBase.php
@@ -2,9 +2,6 @@
 
 namespace PayPal\Api;
 
-use PayPal\Common\PayPalModel;
-use PayPal\Rest\ApiContext;
-
 /**
  * Class TransactionBase
  *
diff --git a/lib/PayPal/Api/Transactions.php b/lib/PayPal/Api/Transactions.php
index 100fff5..f7a09c1 100644
--- a/lib/PayPal/Api/Transactions.php
+++ b/lib/PayPal/Api/Transactions.php
@@ -3,7 +3,6 @@
 namespace PayPal\Api;
 
 use PayPal\Common\PayPalModel;
-use PayPal\Rest\ApiContext;
 
 /**
  * Class Transactions
diff --git a/lib/PayPal/Api/WebProfile.php b/lib/PayPal/Api/WebProfile.php
index 3f9c209..0d5a8f6 100644
--- a/lib/PayPal/Api/WebProfile.php
+++ b/lib/PayPal/Api/WebProfile.php
@@ -3,10 +3,9 @@
 namespace PayPal\Api;
 
 use PayPal\Common\PayPalResourceModel;
-use PayPal\Validation\ArgumentValidator;
-use PayPal\Api\CreateProfileResponse;
 use PayPal\Rest\ApiContext;
 use PayPal\Transport\PayPalRestCall;
+use PayPal\Validation\ArgumentValidator;
 
 /**
  * Class WebProfile
diff --git a/lib/PayPal/Api/Webhook.php b/lib/PayPal/Api/Webhook.php
index d6098f4..de02b77 100644
--- a/lib/PayPal/Api/Webhook.php
+++ b/lib/PayPal/Api/Webhook.php
@@ -3,10 +3,9 @@
 namespace PayPal\Api;
 
 use PayPal\Common\PayPalResourceModel;
-use PayPal\Validation\ArgumentValidator;
-use PayPal\Api\WebhookList;
 use PayPal\Rest\ApiContext;
 use PayPal\Transport\PayPalRestCall;
+use PayPal\Validation\ArgumentValidator;
 use PayPal\Validation\UrlValidator;
 
 /**
diff --git a/lib/PayPal/Api/WebhookEventType.php b/lib/PayPal/Api/WebhookEventType.php
index 23dcbb6..ad3d579 100644
--- a/lib/PayPal/Api/WebhookEventType.php
+++ b/lib/PayPal/Api/WebhookEventType.php
@@ -3,10 +3,9 @@
 namespace PayPal\Api;
 
 use PayPal\Common\PayPalResourceModel;
-use PayPal\Validation\ArgumentValidator;
-use PayPal\Api\WebhookEventList;
 use PayPal\Rest\ApiContext;
 use PayPal\Transport\PayPalRestCall;
+use PayPal\Validation\ArgumentValidator;
 
 /**
  * Class WebhookEventType
diff --git a/lib/PayPal/Auth/OAuthTokenCredential.php b/lib/PayPal/Auth/OAuthTokenCredential.php
index d84dfe0..750ab7d 100644
--- a/lib/PayPal/Auth/OAuthTokenCredential.php
+++ b/lib/PayPal/Auth/OAuthTokenCredential.php
@@ -198,6 +198,8 @@ class OAuthTokenCredential extends PayPalResourceModel
         if ($response != null && isset($response["refresh_token"])) {
             return $response['refresh_token'];
         }
+
+        return null;
     }
 
     /**
@@ -251,6 +253,7 @@ class OAuthTokenCredential extends PayPalResourceModel
      * Generates a new access token
      *
      * @param array $config
+     * @param null|string $refreshToken
      * @return null
      * @throws PayPalConnectionException
      */
diff --git a/lib/PayPal/Common/PayPalResourceModel.php b/lib/PayPal/Common/PayPalResourceModel.php
index 6b9ec01..7662db1 100644
--- a/lib/PayPal/Common/PayPalResourceModel.php
+++ b/lib/PayPal/Common/PayPalResourceModel.php
@@ -1,12 +1,11 @@
 <?php
 
 namespace PayPal\Common;
-use PayPal\Handler\IPayPalHandler;
+
 use PayPal\Rest\ApiContext;
 use PayPal\Rest\IResource;
 use PayPal\Transport\PayPalRestCall;
 
-
 /**
  * Class PayPalResourceModel
  * An Executable PayPalModel Class
diff --git a/lib/PayPal/Core/PayPalHttpConnection.php b/lib/PayPal/Core/PayPalHttpConnection.php
index ffc05d2..251908a 100644
--- a/lib/PayPal/Core/PayPalHttpConnection.php
+++ b/lib/PayPal/Core/PayPalHttpConnection.php
@@ -93,6 +93,7 @@ class PayPalHttpConnection
         switch ($this->httpConfig->getMethod()) {
             case 'POST':
                 curl_setopt($ch, CURLOPT_POST, true);
+                break;
             case 'PUT':
             case 'PATCH':
             case 'DELETE':