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

[PSR] Fixed library source

Browse Source 
- Using `php-cs-fixer` tool.
This commit is contained in:
Jay Patel
2016-07-14 13:06:24 -05:00
parent a46855bfef
commit 1401d5563d
24 changed files with 41 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/PayPal/Cache/AuthorizationCache.php
View File

@@ -20,7 +20,9 @@ abstract class AuthorizationCache
public static function pull($config = null, $clientId = null)
{
// Return if not enabled
if (!self::isEnabled($config)) { return null; }
if (!self::isEnabled($config)) {
return null;
}
$tokens = null;
$cachePath = self::cachePath($config);
@@ -32,7 +34,7 @@ abstract class AuthorizationCache
if ($clientId && is_array($tokens) && array_key_exists($clientId, $tokens)) {
// If client Id is found, just send in that data only
return $tokens[$clientId];
} else if ($clientId) {
} elseif ($clientId) {
// If client Id is provided, but no key in persisted data found matching it.
return null;
}
@@ -54,7 +56,9 @@ abstract class AuthorizationCache
public static function push($config = null, $clientId, $accessToken, $tokenCreateTime, $tokenExpiresIn)
{
// Return if not enabled
if (!self::isEnabled($config)) { return; }
if (!self::isEnabled($config)) {
return;
}
$cachePath = self::cachePath($config);
if (!is_dir(dirname($cachePath))) {
@@ -74,7 +78,7 @@ abstract class AuthorizationCache
'tokenExpiresIn' => $tokenExpiresIn
);
}
if(!file_put_contents($cachePath, json_encode($tokens))) {
if (!file_put_contents($cachePath, json_encode($tokens))) {
throw new \Exception("Failed to write cache");
};
}
@@ -116,6 +120,4 @@ abstract class AuthorizationCache
$config = ($config && is_array($config)) ? $config : PayPalConfigManager::getInstance()->getConfigHashmap();
return (array_key_exists($key, $config)) ? trim($config[$key]) : null;
}
}

13
lib/PayPal/Common/PayPalModel.php
View File

@@ -1,6 +1,7 @@
<?php
namespace PayPal\Common;
use PayPal\Validation\JsonValidator;
use PayPal\Validation\ModelAccessorValidator;
@@ -67,7 +68,9 @@ class PayPalModel
public static function getList($data)
{
// Return Null if Null
if ($data === null) { return null; }
if ($data === null) {
return null;
}
if (is_a($data, get_class(new \stdClass()))) {
//This means, root element is object
@@ -173,9 +176,9 @@ class PayPalModel
foreach ($param as $k => $v) {
if ($v instanceof PayPalModel) {
$ret[$k] = $v->toArray();
} else if (sizeof($v) <= 0 && is_array($v)) {
} elseif (sizeof($v) <= 0 && is_array($v)) {
$ret[$k] = array();
} else if (is_array($v)) {
} elseif (is_array($v)) {
$ret[$k] = $this->_convertToArray($v);
} else {
$ret[$k] = $v;
@@ -204,9 +207,9 @@ class PayPalModel
// If the value is an array, it means, it is an object after conversion
if (is_array($v)) {
// Determine the class of the object
if (($clazz = ReflectionUtil::getPropertyClass(get_class($this), $k)) != null){
if (($clazz = ReflectionUtil::getPropertyClass(get_class($this), $k)) != null) {
// If the value is an associative array, it means, its an object. Just make recursive call to it.
if (empty($v)){
if (empty($v)) {
if (ReflectionUtil::isPropertyClassArray(get_class($this), $k)) {
// It means, it is an array of objects.
$this->assignValue($k, array());

1
lib/PayPal/Common/PayPalUserAgent.php
View File

@@ -21,7 +21,6 @@ class PayPalUserAgent
*/
public static function getValue($sdkName, $sdkVersion)
{
$featureList = array(
'platform-ver=' . PHP_VERSION,
'bit=' . self::_getPHPBit(),

5
lib/PayPal/Common/ReflectionUtil.php
View File

@@ -1,6 +1,7 @@
<?php
namespace PayPal\Common;
use PayPal\Exception\PayPalConfigurationException;
/**
@@ -112,7 +113,7 @@ class ReflectionUtil
}
// todo: smarter regexp
if ( !preg_match_all(
if (!preg_match_all(
'~\@([^\s@\(]+)[\t ]*(?:\(?([^\n@]+)\)?)?~i',
$refl->getDocComment(),
$annots,
@@ -120,7 +121,7 @@ class ReflectionUtil
return null;
}
foreach ($annots[1] as $i => $annot) {
$annotations[strtolower($annot)] = empty($annots[2][$i]) ? TRUE : rtrim($annots[2][$i], " \t\n\r)");
$annotations[strtolower($annot)] = empty($annots[2][$i]) ? true : rtrim($annots[2][$i], " \t\n\r)");
}
return $annotations;

2
lib/PayPal/Converter/FormatConverter.php
View File

@@ -53,7 +53,7 @@ class FormatConverter
throw new \InvalidArgumentException("value cannot have decimals for $currency currency");
}
$decimals = $currencyDecimals[$currency];
} else if (strpos($value, ".") === false) {
} elseif (strpos($value, ".") === false) {
// Check if value has decimal values. If not no need to assign 2 decimals with .00 at the end
$decimals = 0;
}

6
lib/PayPal/Core/PayPalConfigManager.php
View File

@@ -95,7 +95,6 @@ class PayPalConfigManager
*/
public function get($searchKey)
{
if (array_key_exists($searchKey, $this->configs)) {
return $this->configs[$searchKey];
} else {
@@ -108,7 +107,6 @@ class PayPalConfigManager
return $arr;
}
}
/**
@@ -123,7 +121,6 @@ class PayPalConfigManager
*/
public function getIniPrefix($userId = null)
{
if ($userId == null) {
$arr = array();
foreach ($this->configs as $key => $value) {
@@ -157,7 +154,4 @@ class PayPalConfigManager
{
trigger_error('Clone is not allowed.', E_USER_ERROR);
}
}

4
lib/PayPal/Core/PayPalCredentialManager.php
View File

@@ -113,7 +113,6 @@ class PayPalCredentialManager
$suffix++;
$key = $prefix . $suffix;
}
}
/**
@@ -146,7 +145,7 @@ class PayPalCredentialManager
{
if ($userId == null && array_key_exists($this->defaultAccountName, $this->credentialHashmap)) {
$credObj = $this->credentialHashmap[$this->defaultAccountName];
} else if (array_key_exists($userId, $this->credentialHashmap)) {
} elseif (array_key_exists($userId, $this->credentialHashmap)) {
$credObj = $this->credentialHashmap[$userId];
}
@@ -164,5 +163,4 @@ class PayPalCredentialManager
{
trigger_error('Clone is not allowed.', E_USER_ERROR);
}
}

2
lib/PayPal/Core/PayPalHttpConfig.php
View File

@@ -21,7 +21,7 @@ class PayPalHttpConfig
public static $defaultCurlOptions = array(
CURLOPT_SSLVERSION => 6,
CURLOPT_CONNECTTIMEOUT => 10,
CURLOPT_RETURNTRANSFER => TRUE,
CURLOPT_RETURNTRANSFER => true,
CURLOPT_TIMEOUT => 60, // maximum number of seconds to allow cURL functions to execute
CURLOPT_USERAGENT => 'PayPal-PHP-SDK',
CURLOPT_HTTPHEADER => array(),

12
lib/PayPal/Core/PayPalHttpConnection.php
View File

@@ -55,7 +55,6 @@ class PayPalHttpConnection
*/
private function getHttpHeaders()
{
$ret = array();
foreach ($this->httpConfig->getHeaders() as $k => $v) {
$ret[] = "$k: $v";
@@ -78,8 +77,8 @@ class PayPalHttpConnection
//Initialize Curl Options
$ch = curl_init($this->httpConfig->getUrl());
$options = $this->httpConfig->getCurlOptions();
if(empty($options[CURLOPT_HTTPHEADER])) {
unset ($options[CURLOPT_HTTPHEADER]);
if (empty($options[CURLOPT_HTTPHEADER])) {
unset($options[CURLOPT_HTTPHEADER]);
}
curl_setopt_array($ch, $options);
curl_setopt($ch, CURLOPT_URL, $this->httpConfig->getUrl());
@@ -101,7 +100,7 @@ class PayPalHttpConnection
}
//Default Option if Method not of given types in switch case
if ($this->httpConfig->getMethod() != NULL) {
if ($this->httpConfig->getMethod() != null) {
curl_setopt($ch, CURLOPT_CUSTOMREQUEST, $this->httpConfig->getMethod());
}
@@ -174,14 +173,14 @@ class PayPalHttpConnection
"Retried $retries times." . $result);
$this->logger->debug("\n\n" . str_repeat('=', 128) . "\n");
throw $ex;
} else if ($httpStatus < 200 || $httpStatus >= 300) {
} elseif ($httpStatus < 200 || $httpStatus >= 300) {
$ex = new PayPalConnectionException(
$this->httpConfig->getUrl(),
"Got Http response code $httpStatus when accessing {$this->httpConfig->getUrl()}.",
$httpStatus
);
$ex->setData($result);
$this->logger->error("Got Http response code $httpStatus when accessing {$this->httpConfig->getUrl()}. " . $result );
$this->logger->error("Got Http response code $httpStatus when accessing {$this->httpConfig->getUrl()}. " . $result);
$this->logger->debug("\n\n" . str_repeat('=', 128) . "\n");
throw $ex;
}
@@ -191,5 +190,4 @@ class PayPalHttpConnection
//Return result object
return $result;
}
}

1
lib/PayPal/Core/PayPalLoggingManager.php
View File

@@ -116,5 +116,4 @@ class PayPalLoggingManager
$this->logger->debug($message);
}
}
}

1
lib/PayPal/Exception/PayPalInvalidCredentialException.php
View File

@@ -32,5 +32,4 @@ class PayPalInvalidCredentialException extends \Exception
. ': <b>' . $this->getMessage() . '</b>';
return $errorMsg;
}
}

1
lib/PayPal/Exception/PayPalMissingCredentialException.php
View File

@@ -33,5 +33,4 @@ class PayPalMissingCredentialException extends \Exception
return $errorMsg;
}
}

4
lib/PayPal/Handler/OauthHandler.php
View File

@@ -78,9 +78,9 @@ class OauthHandler implements IPayPalHandler
{
if (isset($config['oauth.EndPoint'])) {
$baseEndpoint = $config['oauth.EndPoint'];
} else if (isset($config['service.EndPoint'])) {
} elseif (isset($config['service.EndPoint'])) {
$baseEndpoint = $config['service.EndPoint'];
} else if (isset($config['mode'])) {
} elseif (isset($config['mode'])) {
switch (strtoupper($config['mode'])) {
case 'SANDBOX':
$baseEndpoint = PayPalConstants::REST_SANDBOX_ENDPOINT;

3
lib/PayPal/Handler/RestHandler.php
View File

@@ -47,7 +47,6 @@ class RestHandler implements IPayPalHandler
*/
public function handle($httpConfig, $request, $options)
{
$credential = $this->apiContext->getCredential();
$config = $this->apiContext->getConfig();
@@ -105,7 +104,7 @@ class RestHandler implements IPayPalHandler
{
if (isset($config['service.EndPoint'])) {
return $config['service.EndPoint'];
} else if (isset($config['mode'])) {
} elseif (isset($config['mode'])) {
switch (strtoupper($config['mode'])) {
case 'SANDBOX':
return PayPalConstants::REST_SANDBOX_ENDPOINT;

1
lib/PayPal/Log/PayPalLogFactory.php
View File

@@ -13,5 +13,4 @@ interface PayPalLogFactory
* @return LoggerInterface instance of logger object implementing LoggerInterface
*/
public function getLogger($className);
}

3
lib/PayPal/Log/PayPalLogger.php
View File

@@ -6,7 +6,6 @@ use PayPal\Core\PayPalConfigManager;
use Psr\Log\AbstractLogger;
use Psr\Log\LogLevel;
class PayPalLogger extends AbstractLogger
{
@@ -75,7 +74,7 @@ class PayPalLogger extends AbstractLogger
public function log($level, $message, array $context = array())
{
if($this->isLoggingEnabled) {
if ($this->isLoggingEnabled) {
// Checks if the message is at level below configured logging level
if (array_search($level, $this->loggingLevels) <= array_search($this->loggingLevel, $this->loggingLevels)) {
error_log("[" . date('d-m-Y h:i:s') . "] " . $this->loggerName . " : " . strtoupper($level) . ": $message\n", 3, $this->loggerFile);

6
lib/PayPal/Security/Cipher.php
View File

@@ -18,7 +18,7 @@ class Cipher
*/
const IV_SIZE = 16;
function __construct($secretKey)
public function __construct($secretKey)
{
$this->secretKey = $secretKey;
}
@@ -29,7 +29,7 @@ class Cipher
* @param $input
* @return string
*/
function encrypt($input)
public function encrypt($input)
{
// Create a random IV. Not using mcrypt to generate one, as to not have a dependency on it.
$iv = substr(uniqid("", true), 0, Cipher::IV_SIZE);
@@ -45,7 +45,7 @@ class Cipher
* @param $input
* @return string
*/
function decrypt($input)
public function decrypt($input)
{
// Decode the IV + data
$input = base64_decode($input);

2
lib/PayPal/Transport/PayPalRestCall.php
View File

@@ -52,7 +52,6 @@ class PayPalRestCall
*/
public function execute($handlers = array(), $path, $method, $data = '', $headers = array())
{
$config = $this->apiContext->getConfig();
$httpConfig = new PayPalHttpConfig(null, $method, $config);
$headers = $headers ? $headers : array();
@@ -75,5 +74,4 @@ class PayPalRestCall
return $response;
}
}

2
lib/PayPal/Validation/ArgumentValidator.php
View File

@@ -23,7 +23,7 @@ class ArgumentValidator
if ($argument === null) {
// Error if Object Null
throw new \InvalidArgumentException("$argumentName cannot be null");
} else if (gettype($argument) == 'string' && trim($argument) == ''){
} elseif (gettype($argument) == 'string' && trim($argument) == '') {
// Error if String Empty
throw new \InvalidArgumentException("$argumentName string cannot be empty");
}

1
lib/PayPal/Validation/NumericValidator.php
View File

@@ -21,7 +21,6 @@ class NumericValidator
{
if (trim($argument) != null && !is_numeric($argument)) {
throw new \InvalidArgumentException("$argumentName is not a valid numeric value");
}
return true;
}