From cbc9055e4d1b2b77067fa88e50c9f8076eb2798a Mon Sep 17 00:00:00 2001 From: aydiv Date: Thu, 25 Apr 2013 18:04:49 +0530 Subject: [PATCH] Adding apiContext arg for static methods --- lib/PayPal/Api/CreditCard.php | 11 +++++++---- lib/PayPal/Api/Payment.php | 22 ++++++++++++++-------- lib/PayPal/Api/Refund.php | 9 ++++++--- lib/PayPal/Api/Sale.php | 11 +++++++---- 4 files changed, 34 insertions(+), 19 deletions(-) diff --git a/lib/PayPal/Api/CreditCard.php b/lib/PayPal/Api/CreditCard.php index 424cb81..db2613e 100644 --- a/lib/PayPal/Api/CreditCard.php +++ b/lib/PayPal/Api/CreditCard.php @@ -230,7 +230,7 @@ class CreditCard extends Resource implements IResource { * @path /v1/vault/credit-card * @method POST - * @param PayPal\Rest\ApiContext $apiContext optional + * @param PayPal\Rest\ApiContext $apiContext optional */ public function create( $apiContext=null) { $payLoad = $this->toJSON(); @@ -248,15 +248,18 @@ class CreditCard extends Resource implements IResource { /** * @path /v1/vault/credit-card/:credit-card-id * @method GET - * @param string $creditcardid + * @param string $creditcardid + * @param PayPal\Rest\ApiContext $apiContext optional */ public static function get( $creditcardid) { if (($creditcardid == null) || (strlen($creditcardid) <= 0)) { throw new \InvalidArgumentException("creditcardid cannot be null or empty"); } $payLoad = ""; - - $apiContext = new ApiContext(self::$credential); $call = new \PPRestCall(); + if($apiContext == null) { + $apiContext = new ApiContext(self::$credential); + } + $call = new \PPRestCall(); $json = $call->execute($apiContext, array('PayPal\Rest\RestHandler'), "/v1/vault/credit-card/$creditcardid", "GET", $payLoad); diff --git a/lib/PayPal/Api/Payment.php b/lib/PayPal/Api/Payment.php index fc71a30..7fa2dd0 100644 --- a/lib/PayPal/Api/Payment.php +++ b/lib/PayPal/Api/Payment.php @@ -176,13 +176,16 @@ class Payment extends Resource implements IResource { * payee_id, * sort_by, * sort_order, - * All other keys in the map are ignored by the SDK + * All other keys in the map are ignored by the SDK + * @param PayPal\Rest\ApiContext $apiContext optional */ public static function all($params) { $payLoad = ""; $allowedParams = array('count' => 1, 'start_id' => 1, 'start_index' => 1, 'start_time' => 1, 'end_time' => 1, 'payee_id' => 1, 'sort_by' => 1, 'sort_order' => 1, ); - - $apiContext = new ApiContext(self::$credential); $call = new \PPRestCall(); + if($apiContext == null) { + $apiContext = new ApiContext(self::$credential); + } + $call = new \PPRestCall(); $json = $call->execute($apiContext, array('PayPal\Rest\RestHandler'), "/v1/payments/payment?" . http_build_query(array_intersect_key($params, $allowedParams)), "GET", $payLoad); @@ -196,7 +199,7 @@ class Payment extends Resource implements IResource { * @path /v1/payments/payment * @method POST - * @param PayPal\Rest\ApiContext $apiContext optional + * @param PayPal\Rest\ApiContext $apiContext optional */ public function create( $apiContext=null) { $payLoad = $this->toJSON(); @@ -214,15 +217,18 @@ class Payment extends Resource implements IResource { /** * @path /v1/payments/payment/:payment-id * @method GET - * @param string $paymentid + * @param string $paymentid + * @param PayPal\Rest\ApiContext $apiContext optional */ public static function get( $paymentid) { if (($paymentid == null) || (strlen($paymentid) <= 0)) { throw new \InvalidArgumentException("paymentid cannot be null or empty"); } $payLoad = ""; - - $apiContext = new ApiContext(self::$credential); $call = new \PPRestCall(); + if($apiContext == null) { + $apiContext = new ApiContext(self::$credential); + } + $call = new \PPRestCall(); $json = $call->execute($apiContext, array('PayPal\Rest\RestHandler'), "/v1/payments/payment/$paymentid", "GET", $payLoad); @@ -236,7 +242,7 @@ class Payment extends Resource implements IResource { * @path /v1/payments/payment/:payment-id/execute * @method POST * @param PaymentExecution $payment_execution - * @param PayPal\Rest\ApiContext $apiContext optional + * @param PayPal\Rest\ApiContext $apiContext optional */ public function execute( $payment_execution, $apiContext=null) { if ($payment_execution == null) { diff --git a/lib/PayPal/Api/Refund.php b/lib/PayPal/Api/Refund.php index cb52e26..61db1dd 100644 --- a/lib/PayPal/Api/Refund.php +++ b/lib/PayPal/Api/Refund.php @@ -181,15 +181,18 @@ class Refund extends Resource implements IResource { /** * @path /v1/payments/refund/:refund-id * @method GET - * @param string $refundid + * @param string $refundid + * @param PayPal\Rest\ApiContext $apiContext optional */ public static function get( $refundid) { if (($refundid == null) || (strlen($refundid) <= 0)) { throw new \InvalidArgumentException("refundid cannot be null or empty"); } $payLoad = ""; - - $apiContext = new ApiContext(self::$credential); $call = new \PPRestCall(); + if($apiContext == null) { + $apiContext = new ApiContext(self::$credential); + } + $call = new \PPRestCall(); $json = $call->execute($apiContext, array('PayPal\Rest\RestHandler'), "/v1/payments/refund/$refundid", "GET", $payLoad); diff --git a/lib/PayPal/Api/Sale.php b/lib/PayPal/Api/Sale.php index 1b62ef4..46f8aa5 100644 --- a/lib/PayPal/Api/Sale.php +++ b/lib/PayPal/Api/Sale.php @@ -133,15 +133,18 @@ class Sale extends Resource implements IResource { /** * @path /v1/payments/sale/:sale-id * @method GET - * @param string $saleid + * @param string $saleid + * @param PayPal\Rest\ApiContext $apiContext optional */ public static function get( $saleid) { if (($saleid == null) || (strlen($saleid) <= 0)) { throw new \InvalidArgumentException("saleid cannot be null or empty"); } $payLoad = ""; - - $apiContext = new ApiContext(self::$credential); $call = new \PPRestCall(); + if($apiContext == null) { + $apiContext = new ApiContext(self::$credential); + } + $call = new \PPRestCall(); $json = $call->execute($apiContext, array('PayPal\Rest\RestHandler'), "/v1/payments/sale/$saleid", "GET", $payLoad); @@ -155,7 +158,7 @@ class Sale extends Resource implements IResource { * @path /v1/payments/sale/:sale-id/refund * @method POST * @param Refund $refund - * @param PayPal\Rest\ApiContext $apiContext optional + * @param PayPal\Rest\ApiContext $apiContext optional */ public function refund( $refund, $apiContext=null) { if ($refund == null) {