lxbfYeaa/PayPal-PHP-SDK
Archived
Template
1
0
Fork 0
forked from LiveCarta/PayPal-PHP-SDK
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use restCall object for functions that makes requests (#841)

Browse Source 
* Use restCall object for functions that makes requests
This commit is contained in:
Anton Rusakov
2017-05-11 17:46:16 +01:00
committed by Jay
parent d56305fe63
commit 8d157c3233
3 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
lib/PayPal/Api/FuturePayment.php
View File

@@ -18,13 +18,11 @@ class FuturePayment extends Payment
* *
* @param null $apiContext * @param null $apiContext
* @param string|null $clientMetadataId * @param string|null $clientMetadataId
* @param PayPalRestCall|null $restCall is the Rest Call Service that is used to make rest calls
* @return $this * @return $this
*/ */
public function create($apiContext = null, $clientMetadataId = null) public function create($apiContext = null, $clientMetadataId = null, $restCall = null)
{ {
if ($apiContext == null) {
$apiContext = new ApiContext(self::$credential);
}
$headers = array(); $headers = array();
if ($clientMetadataId != null) { if ($clientMetadataId != null) {
$headers = array( $headers = array(
@@ -32,18 +30,16 @@ class FuturePayment extends Payment
); );
} }
$payLoad = $this->toJSON(); $payLoad = $this->toJSON();
$call = new PayPalRestCall($apiContext); $json = self::executeCall(
$json = $call->execute(
array('PayPal\Handler\RestHandler'),
"/v1/payments/payment", "/v1/payments/payment",
"POST", "POST",
$payLoad, $payLoad,
$headers $headers,
$apiContext,
$restCall
); );
$this->fromJson($json); $this->fromJson($json);
return $this; return $this;
} }
/** /**

6
lib/PayPal/Api/OpenIdTokeninfo.php
View File

@@ -219,9 +219,10 @@ class OpenIdTokeninfo extends PayPalResourceModel
* (optional) grant_type is the Token grant type. Defaults to refresh_token * (optional) grant_type is the Token grant type. Defaults to refresh_token
* (optional) scope is an array that either the same or a subset of the scope passed to the authorization request * (optional) scope is an array that either the same or a subset of the scope passed to the authorization request
* @param APIContext $apiContext Optional API Context * @param APIContext $apiContext Optional API Context
* @param PayPalRestCall $restCall
* @return OpenIdTokeninfo * @return OpenIdTokeninfo
*/ */
public function createFromRefreshToken($params, $apiContext = null) public function createFromRefreshToken($params, $apiContext = null, $restCall = null)
{ {
static $allowedParams = array('grant_type' => 1, 'refresh_token' => 1, 'scope' => 1); static $allowedParams = array('grant_type' => 1, 'refresh_token' => 1, 'scope' => 1);
$apiContext = $apiContext ? $apiContext : new ApiContext(self::$credential); $apiContext = $apiContext ? $apiContext : new ApiContext(self::$credential);
@@ -244,7 +245,8 @@ class OpenIdTokeninfo extends PayPalResourceModel
'Content-Type' => 'application/x-www-form-urlencoded', 'Content-Type' => 'application/x-www-form-urlencoded',
'Authorization' => 'Basic ' . base64_encode($clientId . ":" . $clientSecret) 'Authorization' => 'Basic ' . base64_encode($clientId . ":" . $clientSecret)
), ),
$apiContext $apiContext,
$restCall
); );
$this->fromJson($json); $this->fromJson($json);

6
lib/PayPal/Api/OpenIdUserinfo.php
View File

@@ -505,9 +505,10 @@ class OpenIdUserinfo extends PayPalResourceModel
* @param array $params (allowed values are access_token) * @param array $params (allowed values are access_token)
* access_token - access token from the createFromAuthorizationCode / createFromRefreshToken calls * access_token - access token from the createFromAuthorizationCode / createFromRefreshToken calls
* @param ApiContext $apiContext Optional API Context * @param ApiContext $apiContext Optional API Context
* @param PayPalRestCall $restCall
* @return OpenIdUserinfo * @return OpenIdUserinfo
*/ */
public static function getUserinfo($params, $apiContext = null) public static function getUserinfo($params, $apiContext = null, $restCall = null)
{ {
static $allowedParams = array('schema' => 1); static $allowedParams = array('schema' => 1);
@@ -527,7 +528,8 @@ class OpenIdUserinfo extends PayPalResourceModel
'Authorization' => "Bearer " . $params['access_token'], 'Authorization' => "Bearer " . $params['access_token'],
'Content-Type' => 'x-www-form-urlencoded' 'Content-Type' => 'x-www-form-urlencoded'
), ),
$apiContext $apiContext,
$restCall
); );
$ret = new OpenIdUserinfo(); $ret = new OpenIdUserinfo();