Merge branch 'master' of https://github.com/irfanevrens/PayPal-PHP-SDK into irfanevrens-master

2015-06-30 11:57:56 -05:00
parent ccb4585a42 70fe1941ad
commit 23b2afc7f1
26 changed files with 75 additions and 46 deletions
--- 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
 *
--- 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
--- 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
--- 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
--- 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
@@ -12,7 +11,7 @@ use PayPal\Rest\ApiContext;
 *
 * @package PayPal\Api
 *
- * @property \PayPal\Api\CreditCard credit_cards
+ * @property \PayPal\Api\CreditCard[] credit_cards
 * @property int count
 * @property string next_id
 */
@@ -20,10 +19,9 @@ class CreditCardHistory extends PayPalModel
 {
    /**
     * A list of credit card resources
-     * 
     *
-     * @param \PayPal\Api\CreditCard $credit-cards
-     * 
+     *
+     * @param \PayPal\Api\CreditCard[] $credit_cards
     * @return $this
     */
    public function setCreditCards($credit_cards)
--- 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;

--- 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
 *
--- 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.
     *
--- 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
 {
--- 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)
--- 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
 {
--- 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
 {
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
 *
--- 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
 *
--- 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
--- 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
--- 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;

 /**
--- 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
--- 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
     */
--- 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
--- a/lib/PayPal/Core/PayPalHttpConnection.php
+++ b/lib/PayPal/Core/PayPalHttpConnection.php
@@ -93,6 +93,8 @@ class PayPalHttpConnection
        switch ($this->httpConfig->getMethod()) {
            case 'POST':
                curl_setopt($ch, CURLOPT_POST, true);
+                curl_setopt($ch, CURLOPT_POSTFIELDS, $data);
+                break;
            case 'PUT':
            case 'PATCH':
            case 'DELETE':