Merge pull request #607 from paypal/psr

Fixed PSR code style errors

lib/PayPal/Cache/AuthorizationCache.php

@@ -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;
     }
-
-
 }

lib/PayPal/Common/PayPalModel.php

@@ -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());

lib/PayPal/Common/PayPalUserAgent.php

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

lib/PayPal/Common/ReflectionUtil.php

@@ -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;

lib/PayPal/Converter/FormatConverter.php

@@ -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;
         }

lib/PayPal/Core/PayPalConfigManager.php

@@ -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);
     }
-
 }
-
-    

lib/PayPal/Core/PayPalCredentialManager.php

@@ -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);
     }
-
 }

lib/PayPal/Core/PayPalHttpConfig.php

@@ -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(),

lib/PayPal/Core/PayPalHttpConnection.php

@@ -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])) {
+        if (empty($options[CURLOPT_HTTPHEADER])) {
-            unset ($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;
     }
-
 }

lib/PayPal/Core/PayPalLoggingManager.php

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

lib/PayPal/Exception/PayPalInvalidCredentialException.php

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

lib/PayPal/Exception/PayPalMissingCredentialException.php

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

lib/PayPal/Handler/OauthHandler.php

@@ -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;

lib/PayPal/Handler/RestHandler.php

@@ -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;

lib/PayPal/Log/PayPalLogFactory.php

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

lib/PayPal/Log/PayPalLogger.php

@@ -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);

lib/PayPal/Security/Cipher.php

@@ -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);

lib/PayPal/Transport/PayPalRestCall.php

@@ -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;
     }
-
 }

lib/PayPal/Validation/ArgumentValidator.php

@@ -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");
         }

lib/PayPal/Validation/NumericValidator.php

@@ -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;
     }

sample/billing/CreateBillingAgreementWithCreditCard.php

@@ -99,7 +99,6 @@ $request = clone $agreement;
 try {
     // Please note that as the agreement has not yet activated, we wont be receiving the ID just yet.
     $agreement = $agreement->create($apiContext);
-
 } catch (Exception $ex) {
     // NOTE: PLEASE DO NOT USE RESULTPRINTER CLASS IN YOUR ORIGINAL CODE. FOR SAMPLE ONLY
     ResultPrinter::printError("Created Billing Agreement.", "Agreement", $agreement->getId(), $request, $ex);

sample/billing/CreateBillingAgreementWithPayPal.php

@@ -74,7 +74,6 @@ try {
     // the buyer to. Retrieve the url from the $agreement->getApprovalLink()
     // method
     $approvalUrl = $agreement->getApprovalLink();
-
 } catch (Exception $ex) {
     // NOTE: PLEASE DO NOT USE RESULTPRINTER CLASS IN YOUR ORIGINAL CODE. FOR SAMPLE ONLY
     ResultPrinter::printError("Created Billing Agreement.", "Agreement", null, $request, $ex);

sample/billing/ExecuteAgreement.php

@@ -8,7 +8,6 @@ require __DIR__ . '/../bootstrap.php';
 // ## Approval Status
 // Determine if the user accepted or denied the request
 if (isset($_GET['success']) && $_GET['success'] == 'true') {
-
     $token = $_GET['token'];
     $agreement = new \PayPal\Api\Agreement();
     try {
@@ -36,7 +35,6 @@ if (isset($_GET['success']) && $_GET['success'] == 'true') {
 
     // NOTE: PLEASE DO NOT USE RESULTPRINTER CLASS IN YOUR ORIGINAL CODE. FOR SAMPLE ONLY
     ResultPrinter::printResult("Get Agreement", "Agreement", $agreement->getId(), null, $agreement);
-
 } else {
     // NOTE: PLEASE DO NOT USE RESULTPRINTER CLASS IN YOUR ORIGINAL CODE. FOR SAMPLE ONLY
     ResultPrinter::printResult("User Cancelled the Approval", null);

sample/billing/ReactivateBillingAgreement.php

@@ -18,12 +18,10 @@ $agreementStateDescriptor = new AgreementStateDescriptor();
 $agreementStateDescriptor->setNote("Reactivating the agreement");
 
 try {
-
     $suspendedAgreement->reActivate($agreementStateDescriptor, $apiContext);
 
     // Lets get the updated Agreement Object
     $agreement = Agreement::get($suspendedAgreement->getId(), $apiContext);
-
 } catch (Exception $ex) {
     // NOTE: PLEASE DO NOT USE RESULTPRINTER CLASS IN YOUR ORIGINAL CODE. FOR SAMPLE ONLY
     ResultPrinter::printResult("Reactivate the Agreement", "Agreement", $agreement->getId(), $suspendedAgreement, $ex);

sample/billing/SuspendBillingAgreement.php

@@ -18,12 +18,10 @@ $agreementStateDescriptor = new AgreementStateDescriptor();
 $agreementStateDescriptor->setNote("Suspending the agreement");
 
 try {
-
     $createdAgreement->suspend($agreementStateDescriptor, $apiContext);
 
     // Lets get the updated Agreement Object
     $agreement = Agreement::get($createdAgreement->getId(), $apiContext);
-
 } catch (Exception $ex) {
     // NOTE: PLEASE DO NOT USE RESULTPRINTER CLASS IN YOUR ORIGINAL CODE. FOR SAMPLE ONLY
     ResultPrinter::printError("Suspended the Agreement", "Agreement", null, $agreementStateDescriptor, $ex);

sample/billing/UpdateBillingAgreement.php

@@ -35,7 +35,6 @@ try {
 
     // Lets get the updated Agreement Object
     $agreement = Agreement::get($createdAgreement->getId(), $apiContext);
-
 } catch (Exception $ex) {
     // NOTE: PLEASE DO NOT USE RESULTPRINTER CLASS IN YOUR ORIGINAL CODE. FOR SAMPLE ONLY
     ResultPrinter::printError("Updated the Agreement with new Description and Updated Shipping Address", "Agreement", null, $patchRequest, $ex);

sample/billing/UpdatePlan.php

@@ -34,7 +34,6 @@ try {
     $createdPlan->update($patchRequest, $apiContext);
 
     $plan = Plan::get($createdPlan->getId(), $apiContext);
-
 } catch (Exception $ex) {
     // NOTE: PLEASE DO NOT USE RESULTPRINTER CLASS IN YOUR ORIGINAL CODE. FOR SAMPLE ONLY
     ResultPrinter::printError("Updated the Plan to Active State", "Plan", null, $patchRequest, $ex);

sample/billing/UpdatePlanPaymentDefinitions.php

@@ -40,7 +40,6 @@ try {
     $createdPlan->update($patchRequest, $apiContext);
 
     $plan = Plan::get($createdPlan->getId(), $apiContext);
-
 } catch (Exception $ex) {
     // NOTE: PLEASE DO NOT USE RESULTPRINTER CLASS IN YOUR ORIGINAL CODE. FOR SAMPLE ONLY
     ResultPrinter::printError("Updated the Plan Payment Definition", "Plan", null, $patchRequest, $ex);

sample/common.php

@@ -41,7 +41,6 @@ class ResultPrinter
             self::printConsoleObject($response, $errorMessage);
             printf("\n-------------------------------------------------------------\n\n");
         } else {
-
             if (self::$printResultCounter == 0) {
                 include "header.html";
                 echo '

sample/invoice/RetrieveQRCode.php

@@ -23,8 +23,6 @@ try {
     // 'saveToFile' method with proper file name.
     // This will save the image as /samples/invoice/images/sample.png
     $path = $image->saveToFile("images/sample.png");
-
-
 } catch (Exception $ex) {
     // NOTE: PLEASE DO NOT USE RESULTPRINTER CLASS IN YOUR ORIGINAL CODE. FOR SAMPLE ONLY
     ResultPrinter::printError("Retrieved QR Code for Invoice", "Invoice", $invoice->getId(), null, $ex);
@@ -39,4 +37,3 @@ try {
 // One of the ways, you could directly inject the base64-encoded string
 // with proper image information in front of it.
 echo '<img src="data:image/png;base64,'. $image->getImage() . '" alt="Invoice QR Code" />';
-

sample/lipp/GenerateAccessTokenFromRefreshToken.php

@@ -9,10 +9,8 @@ use PayPal\Api\OpenIdTokeninfo;
 $refreshToken = 'yzX4AkmMyBKR4on7vB5he-tDu38s24Zy-kTibhSuqA8kTdy0Yinxj7NpAyULx0bxqC5G8dbXOt0aVMlMmtpiVmSzhcjVZhYDM7WUQLC9KpaXGBHyltJPkLLQkXE';
 
 try {
-
     $tokenInfo = new OpenIdTokeninfo();
     $tokenInfo = $tokenInfo->createFromRefreshToken(array('refresh_token' => $refreshToken), $apiContext);
-
 } catch (Exception $ex) {
     // NOTE: PLEASE DO NOT USE RESULTPRINTER CLASS IN YOUR ORIGINAL CODE. FOR SAMPLE ONLY
     ResultPrinter::printError("Obtained Access Token From Refresh Token", "Access Token", null, null, $ex);

sample/lipp/GetUserInfo.php

@@ -21,13 +21,11 @@ use PayPal\Api\OpenIdUserinfo;
 $refreshToken = 'W1JmxG-Cogm-4aSc5Vlen37XaQTj74aQcQiTtXax5UgY7M_AJ--kLX8xNVk8LtCpmueFfcYlRK6UgQLJ-XHsxpw6kZzPpKKccRQeC4z2ldTMfXdIWajZ6CHuebs';
 
 try {
-
     $tokenInfo = new OpenIdTokeninfo();
     $tokenInfo = $tokenInfo->createFromRefreshToken(array('refresh_token' => $refreshToken), $apiContext);
 
     $params = array('access_token' => $tokenInfo->getAccessToken());
     $userInfo = OpenIdUserinfo::getUserinfo($params, $apiContext);
-
 } catch (Exception $ex) {
     // NOTE: PLEASE DO NOT USE RESULTPRINTER CLASS IN YOUR ORIGINAL CODE. FOR SAMPLE ONLY
     ResultPrinter::printError("User Information", "User Info", null, $params, $ex);

sample/lipp/UserConsentRedirect.php

@@ -11,7 +11,6 @@ session_start();
 // PayPal would redirect the user to the redirect_uri mentioned when creating the consent URL.
 // The user would then able to retrieve the access token by getting the code, which is returned as a GET parameter.
 if (isset($_GET['success']) && $_GET['success'] == 'true') {
-
     $code = $_GET['code'];
 
     try {
@@ -25,5 +24,4 @@ if (isset($_GET['success']) && $_GET['success'] == 'true') {
 
     // NOTE: PLEASE DO NOT USE RESULTPRINTER CLASS IN YOUR ORIGINAL CODE. FOR SAMPLE ONLY
  ResultPrinter::printResult("Obtained Access Token", "Access Token", $accessToken->getAccessToken(), $_GET['code'], $accessToken);
-
 }

sample/notifications/CreateWebhook.php

@@ -58,7 +58,7 @@ try {
         $data = $ex->getData();
         // NOTE: PLEASE DO NOT USE RESULTPRINTER CLASS IN YOUR ORIGINAL CODE. FOR SAMPLE ONLY
         ResultPrinter::printError("Created Webhook Failed. Checking if it is Webhook Number Limit Exceeded. Trying to delete all existing webhooks", "Webhook", "Please Use <a style='color: red;' href='DeleteAllWebhooks.php' >Delete All Webhooks</a> Sample to delete all existing webhooks in sample", $request, $ex);
-        if (strpos($data,'WEBHOOK_NUMBER_LIMIT_EXCEEDED') !== false) {
+        if (strpos($data, 'WEBHOOK_NUMBER_LIMIT_EXCEEDED') !== false) {
             require 'DeleteAllWebhooks.php';
             try {
                 $output = $webhook->create($apiContext);

sample/notifications/ListSubscribedWebhookEventTypes.php

@@ -23,6 +23,6 @@ try {
 }
 
 // NOTE: PLEASE DO NOT USE RESULTPRINTER CLASS IN YOUR ORIGINAL CODE. FOR SAMPLE ONLY
- ResultPrinter::printResult("List subscribed webhook event types", "WebhookEventTypeList",null, null, $output);
+ ResultPrinter::printResult("List subscribed webhook event types", "WebhookEventTypeList", null, null, $output);
 
 return $output;

sample/notifications/ListWebhooks.php

@@ -24,6 +24,6 @@ try {
 }
 
 // NOTE: PLEASE DO NOT USE RESULTPRINTER CLASS IN YOUR ORIGINAL CODE. FOR SAMPLE ONLY
- ResultPrinter::printResult("List all webhooks", "WebhookList",null, null, $output);
+ ResultPrinter::printResult("List all webhooks", "WebhookList", null, null, $output);
 
 return $output;

sample/notifications/ValidateWebhookEvent.php

@@ -32,5 +32,3 @@ try {
 
 // NOTE: PLEASE DO NOT USE RESULTPRINTER CLASS IN YOUR ORIGINAL CODE. FOR SAMPLE ONLY
 ResultPrinter::printResult("Validate Received Webhook Event", "WebhookEvent", $output->getId(), $bodyReceived, $output);
-
-

sample/payments/AuthorizationCapture.php

@@ -11,7 +11,6 @@ use PayPal\Api\Amount;
 use PayPal\Api\Authorization;
 use PayPal\Api\Capture;
 
-
 // ### Capture Payment
 // You can capture and process a previously created authorization
 // by invoking the $authorization->capture method

sample/payments/CreateFuturePayment.php

@@ -84,7 +84,6 @@ try {
     // for payment approval
     // Please note that currently future payments works only with PayPal as a funding instrument.
     $payment->create($apiContext, $clientMetadataId);
-
 } catch (Exception $ex) {
     // NOTE: PLEASE DO NOT USE RESULTPRINTER CLASS IN YOUR ORIGINAL CODE. FOR SAMPLE ONLY
     ResultPrinter::printError("Future Payment", "Payment", null, $payment, $ex);

sample/payments/ExecutePayment.php

@@ -82,8 +82,6 @@ if (isset($_GET['success']) && $_GET['success'] == 'true') {
     ResultPrinter::printResult("Get Payment", "Payment", $payment->getId(), null, $payment);
 
     return $payment;
-
-
 } else {
     // NOTE: PLEASE DO NOT USE RESULTPRINTER CLASS IN YOUR ORIGINAL CODE. FOR SAMPLE ONLY
     ResultPrinter::printResult("User Cancelled the Approval", null);

sample/payments/ListPayments.php

@@ -12,7 +12,6 @@
 require 'CreatePayment.php';
 use PayPal\Api\Payment;
 
-
 // ### Retrieve payment
 // Retrieve the PaymentHistory object by calling the
 // static `get` method on the Payment class, 
@@ -21,7 +20,6 @@ use PayPal\Api\Payment;
 // Refer the method doc for valid values for keys
 // (See bootstrap.php for more on `ApiContext`)
 try {
-
     $params = array('count' => 10, 'start_index' => 5);
 
     $payments = Payment::all($params, $apiContext);

sample/payments/OrderAuthorize.php

@@ -45,7 +45,6 @@ if (isset($_GET['success']) && $_GET['success'] == 'true') {
     }
 
     return $result;
-
 } else {
     // NOTE: PLEASE DO NOT USE RESULTPRINTER CLASS IN YOUR ORIGINAL CODE. FOR SAMPLE ONLY
     ResultPrinter::printResult("User Cancelled the Approval", null);

sample/payments/OrderCapture.php

@@ -46,7 +46,6 @@ if (isset($_GET['success']) && $_GET['success'] == 'true') {
     }
 
     return $result;
-
 } else {
     // NOTE: PLEASE DO NOT USE RESULTPRINTER CLASS IN YOUR ORIGINAL CODE. FOR SAMPLE ONLY
     ResultPrinter::printResult("User Cancelled the Approval", null);

sample/payments/OrderDoVoid.php

@@ -32,7 +32,6 @@ if (isset($_GET['success']) && $_GET['success'] == 'true') {
     }
 
     return $result;
-
 } else {
     // NOTE: PLEASE DO NOT USE RESULTPRINTER CLASS IN YOUR ORIGINAL CODE. FOR SAMPLE ONLY
  ResultPrinter::printResult("User Cancelled the Approval", null);

sample/payments/OrderGet.php

@@ -9,7 +9,6 @@ $payment = require __DIR__ . '/ExecutePayment.php';
 // ### Approval Status
 // Determine if the user approved the payment or not
 if (isset($_GET['success']) && $_GET['success'] == 'true') {
-
     $transactions = $payment->getTransactions();
     $transaction = $transactions[0];
     $relatedResources = $transaction->getRelatedResources();
@@ -27,7 +26,6 @@ if (isset($_GET['success']) && $_GET['success'] == 'true') {
     }
 
     return $result;
-
 } else {
     // NOTE: PLEASE DO NOT USE RESULTPRINTER CLASS IN YOUR ORIGINAL CODE. FOR SAMPLE ONLY
     ResultPrinter::printResult("User Cancelled the Approval", null);

sample/payments/Reauthorization.php

@@ -17,7 +17,6 @@ use PayPal\Api\Authorization;
 // has expired.
 
 try {
-
     $amount = new Amount();
     $amount->setCurrency("USD");
     $amount->setTotal(1);

sample/payments/UpdatePayment.php

@@ -81,7 +81,6 @@ $patchRequest->setPatches(array($patchReplace, $patchAdd));
 // (See bootstrap.php for more on `ApiContext`)
 try {
     $result = $createdPayment->update($patchRequest, $apiContext);
-
 } catch (Exception $ex) {
     // NOTE: PLEASE DO NOT USE RESULTPRINTER CLASS IN YOUR ORIGINAL CODE. FOR SAMPLE ONLY
     ResultPrinter::printError("Update Payment", "PatchRequest", null, $patchRequest, $ex);

sample/payments/VoidAuthorization.php

@@ -10,7 +10,6 @@ $authorization = require 'AuthorizePayment.php';
 $authorizationId = '1BF65516U6866543H'; // $authorization->getId();
 use PayPal\Api\Authorization;
 
-
 // ### VoidAuthorization
 // You can void a previously authorized payment
 // by invoking the $authorization->void method

tests/PayPal/Test/Api/AddressTest.php

@@ -70,6 +70,4 @@ class AddressTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals($obj->getNormalizationStatus(), "TestSample");
         $this->assertEquals($obj->getStatus(), "TestSample");
     }
-
-
 }

tests/PayPal/Test/Api/AgreementStateDescriptorTest.php

@@ -53,5 +53,4 @@ class AgreementStateDescriptorTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals($obj->getNote(), "TestSample");
         $this->assertEquals($obj->getAmount(), CurrencyTest::getObject());
     }
-
 }

tests/PayPal/Test/Api/AgreementTransactionTest.php

@@ -69,5 +69,4 @@ class AgreementTransactionTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals($obj->getTimeStamp(), "TestSample");
         $this->assertEquals($obj->getTimeZone(), "TestSample");
     }
-
 }

tests/PayPal/Test/Api/AgreementTransactionsTest.php

@@ -51,5 +51,4 @@ class AgreementTransactionsTest extends \PHPUnit_Framework_TestCase
     {
         $this->assertEquals($obj->getAgreementTransactionList(), AgreementTransactionTest::getObject());
     }
-
 }

tests/PayPal/Test/Api/AlternatePaymentTest.php

@@ -55,6 +55,4 @@ class AlternatePaymentTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals($obj->getExternalCustomerId(), "TestSample");
         $this->assertEquals($obj->getAlternatePaymentProviderId(), "TestSample");
     }
-
-
 }

tests/PayPal/Test/Api/AmountTest.php

@@ -58,6 +58,4 @@ class AmountTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals($obj->getTotal(), "12.34");
         $this->assertEquals($obj->getDetails(), DetailsTest::getObject());
     }
-
-
 }

tests/PayPal/Test/Api/BankAccountTest.php

@@ -100,6 +100,4 @@ class BankAccountTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals($obj->getValidUntil(), "TestSample");
         $this->assertEquals($obj->getLinks(), LinksTest::getObject());
     }
-
-
 }

tests/PayPal/Test/Api/BankAccountsListTest.php

@@ -55,5 +55,4 @@ class BankAccountsListTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals($obj->getCount(), 123);
         $this->assertEquals($obj->getNextId(), "TestSample");
     }
-
 }

tests/PayPal/Test/Api/BankTokenTest.php

@@ -58,6 +58,4 @@ class BankTokenTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals($obj->getExternalCustomerId(), "TestSample");
         $this->assertEquals($obj->getMandateReferenceNumber(), "TestSample");
     }
-
-
 }

tests/PayPal/Test/Api/BillingInfoTest.php

@@ -67,5 +67,4 @@ class BillingInfoTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals($obj->getNotificationChannel(), "TestSample");
         $this->assertEquals($obj->getPhone(), PhoneTest::getObject());
     }
-
 }

tests/PayPal/Test/Api/BillingTest.php

@@ -51,6 +51,4 @@ class BillingTest extends \PHPUnit_Framework_TestCase
     {
         $this->assertEquals($obj->getBillingAgreementId(), "TestSample");
     }
-
-
 }

tests/PayPal/Test/Api/CancelNotificationTest.php

@@ -57,5 +57,4 @@ class CancelNotificationTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals($obj->getSendToMerchant(), true);
         $this->assertEquals($obj->getSendToPayer(), true);
     }
-
 }

tests/PayPal/Test/Api/CarrierAccountTest.php

@@ -59,6 +59,4 @@ class CarrierAccountTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals($obj->getPhoneSource(), "TestSample");
         $this->assertEquals($obj->getCountryCode(), CountryCodeTest::getObject());
     }
-
-
 }

tests/PayPal/Test/Api/CarrierAccountTokenTest.php

@@ -56,6 +56,4 @@ class CarrierAccountTokenTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals($obj->getCarrierAccountId(), "TestSample");
         $this->assertEquals($obj->getExternalCustomerId(), "TestSample");
     }
-
-
 }

tests/PayPal/Test/Api/CartBaseTest.php

@@ -100,5 +100,4 @@ class CartBaseTest extends \PHPUnit_Framework_TestCase
         $obj = new CartBase();
         $obj->setOrderUrl(null);
     }
-
 }

tests/PayPal/Test/Api/ChargeModelTest.php

@@ -55,5 +55,4 @@ class ChargeModelTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals($obj->getType(), "TestSample");
         $this->assertEquals($obj->getAmount(), CurrencyTest::getObject());
     }
-
 }

tests/PayPal/Test/Api/CostTest.php

@@ -53,5 +53,4 @@ class CostTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals($obj->getPercent(), "12.34");
         $this->assertEquals($obj->getAmount(), CurrencyTest::getObject());
     }
-    
 }

tests/PayPal/Test/Api/CountryCodeTest.php

@@ -51,6 +51,4 @@ class CountryCodeTest extends \PHPUnit_Framework_TestCase
     {
         $this->assertEquals($obj->getCountryCode(), "TestSample");
     }
-
-
 }

tests/PayPal/Test/Api/CreateProfileResponseTest.php

@@ -51,5 +51,4 @@ class CreateProfileResponseTest extends \PHPUnit_Framework_TestCase
     {
         $this->assertEquals($obj->getId(), "TestSample");
     }
-
 }

tests/PayPal/Test/Api/CreditCardHistoryTest.php

@@ -39,7 +39,6 @@ class CreditCardHistoryTest extends \PHPUnit_Framework_TestCase
 
     public function setup()
     {
-
         $card = self::createCreditCard();
         $card->setBillingAddress(AddressTest::getObject());
         $card->setLinks(array(LinksTest::getObject()));

tests/PayPal/Test/Api/CreditCardListTest.php

@@ -57,5 +57,4 @@ class CreditCardListTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals($obj->getTotalItems(), 123);
         $this->assertEquals($obj->getTotalPages(), 123);
     }
-
 }

tests/PayPal/Test/Api/CreditCardTest.php

@@ -78,6 +78,4 @@ class CreditCardTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals($obj->getValidUntil(), "TestSample");
         $this->assertEquals($obj->getLinks(), LinksTest::getObject());
     }
-
-
 }

tests/PayPal/Test/Api/CreditCardTokenTest.php

@@ -64,6 +64,4 @@ class CreditCardTokenTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals($obj->getExpireMonth(), 123);
         $this->assertEquals($obj->getExpireYear(), 123);
     }
-
-
 }

tests/PayPal/Test/Api/CreditFinancingOfferedTest.php

@@ -61,6 +61,4 @@ class CreditFinancingOfferedTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals($obj->getPayerAcceptance(), true);
         $this->assertEquals($obj->getCartAmountImmutable(), true);
     }
-
-
 }

tests/PayPal/Test/Api/CreditTest.php

@@ -56,6 +56,4 @@ class CreditTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals($obj->getId(), "TestSample");
         $this->assertEquals($obj->getType(), "TestSample");
     }
-
-
 }

tests/PayPal/Test/Api/CurrencyConversionTest.php

@@ -87,5 +87,4 @@ class CurrencyConversionTest extends \PHPUnit_Framework_TestCase
         $obj->setWebUrl(null);
         $this->assertNull($obj->getWebUrl());
     }
-
 }

tests/PayPal/Test/Api/CurrencyTest.php

@@ -56,6 +56,4 @@ class CurrencyTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals($obj->getCurrency(), "TestSample");
         $this->assertEquals($obj->getValue(), "12.34");
     }
-
-
 }

tests/PayPal/Test/Api/CustomAmountTest.php

@@ -53,5 +53,4 @@ class CustomAmountTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals($obj->getLabel(), "TestSample");
         $this->assertEquals($obj->getAmount(), CurrencyTest::getObject());
     }
-
 }

tests/PayPal/Test/Api/DetailsTest.php

@@ -68,6 +68,4 @@ class DetailsTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals($obj->getGiftWrap(), "12.34");
         $this->assertEquals($obj->getFee(), "12.34");
     }
-
-
 }

tests/PayPal/Test/Api/ErrorDetailsTest.php

@@ -60,6 +60,4 @@ class ErrorDetailsTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals($obj->getPurchaseUnitReferenceId(), "TestSample");
         $this->assertEquals($obj->getCode(), "TestSample");
     }
-
-
 }

tests/PayPal/Test/Api/ErrorTest.php

@@ -72,6 +72,4 @@ class ErrorTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals($obj->getDebugId(), "TestSample");
         $this->assertEquals($obj->getLinks(), LinksTest::getObject());
     }
-
-
 }

tests/PayPal/Test/Api/ExtendedBankAccountTest.php

@@ -54,6 +54,4 @@ class ExtendedBankAccountTest extends \PHPUnit_Framework_TestCase
     {
         $this->assertEquals($obj->getMandateReferenceNumber(), "TestSample");
     }
-
-
 }

tests/PayPal/Test/Api/ExternalFundingTest.php

@@ -59,6 +59,4 @@ class ExternalFundingTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals($obj->getDisplayText(), "TestSample");
         $this->assertEquals($obj->getAmount(), AmountTest::getObject());
     }
-
-
 }

tests/PayPal/Test/Api/FileAttachmentTest.php

@@ -64,5 +64,4 @@ class FileAttachmentTest extends \PHPUnit_Framework_TestCase
         $obj = new FileAttachment();
         $obj->setUrl(null);
     }
-
 }

tests/PayPal/Test/Api/FlowConfigTest.php

@@ -63,5 +63,4 @@ class FlowConfigTest extends \PHPUnit_Framework_TestCase
         $obj = new FlowConfig();
         $obj->setBankTxnPendingUrl(null);
     }
-
 }

tests/PayPal/Test/Api/FmfDetailsTest.php

@@ -60,6 +60,4 @@ class FmfDetailsTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals($obj->getName(), "TestSample");
         $this->assertEquals($obj->getDescription(), "TestSample");
     }
-
-
 }

tests/PayPal/Test/Api/FundingDetailTest.php

@@ -60,6 +60,4 @@ class FundingDetailTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals($obj->getPaymentDebitDate(), "TestSample");
         $this->assertEquals($obj->getProcessingType(), "TestSample");
     }
-
-
 }

tests/PayPal/Test/Api/FundingInstrumentTest.php

@@ -78,6 +78,4 @@ class FundingInstrumentTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals($obj->getBilling(), BillingTest::getObject());
         $this->assertEquals($obj->getAlternatePayment(), AlternatePaymentTest::getObject());
     }
-
-
 }

tests/PayPal/Test/Api/FundingOptionTest.php

@@ -64,6 +64,4 @@ class FundingOptionTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals($obj->getInstallmentInfo(), InstallmentInfoTest::getObject());
         $this->assertEquals($obj->getLinks(), LinksTest::getObject());
     }
-
-
 }

tests/PayPal/Test/Api/FundingSourceTest.php

@@ -70,6 +70,4 @@ class FundingSourceTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals($obj->getExtends(), FundingInstrumentTest::getObject());
         $this->assertEquals($obj->getLinks(), LinksTest::getObject());
     }
-
-
 }

tests/PayPal/Test/Api/HyperSchemaTest.php

@@ -61,5 +61,4 @@ class HyperSchemaTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals($obj->getPathStart(), "TestSample");
         $this->assertEquals($obj->getMediaType(), "TestSample");
     }
-
 }

tests/PayPal/Test/Api/ImageTest.php

@@ -51,5 +51,4 @@ class ImageTest extends \PHPUnit_Framework_TestCase
     {
         $this->assertEquals($obj->getImage(), "TestSample");
     }
-
 }

tests/PayPal/Test/Api/IncentiveTest.php

@@ -80,5 +80,4 @@ class IncentiveTest extends \PHPUnit_Framework_TestCase
         $obj = new Incentive();
         $obj->setLogoImageUrl(null);
     }
-
 }

tests/PayPal/Test/Api/InputFieldsTest.php

@@ -55,5 +55,4 @@ class InputFieldsTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals($obj->getNoShipping(), 123);
         $this->assertEquals($obj->getAddressOverride(), 123);
     }
-
 }

tests/PayPal/Test/Api/InstallmentInfoTest.php

@@ -60,6 +60,4 @@ class InstallmentInfoTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals($obj->getIssuer(), "TestSample");
         $this->assertEquals($obj->getInstallmentOptions(), InstallmentOptionTest::getObject());
     }
-
-
 }

tests/PayPal/Test/Api/InstallmentOptionTest.php

@@ -60,6 +60,4 @@ class InstallmentOptionTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals($obj->getDiscountAmount(), CurrencyTest::getObject());
         $this->assertEquals($obj->getDiscountPercentage(), "TestSample");
     }
-
-
 }

tests/PayPal/Test/Api/InvoiceAddressTest.php

@@ -63,5 +63,4 @@ class InvoiceAddressTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals($obj->getState(), "TestSample");
         $this->assertEquals($obj->getPhone(), PhoneTest::getObject());
     }
-
 }

tests/PayPal/Test/Api/InvoiceItemTest.php

@@ -77,5 +77,4 @@ class InvoiceItemTest extends \PHPUnit_Framework_TestCase
         $obj = new InvoiceItem();
         $obj->setImageUrl(null);
     }
-
 }

tests/PayPal/Test/Api/InvoiceNumberTest.php

@@ -1,8 +1,8 @@
 <?php
 
 namespace PayPal\Test\Api;
-use PayPal\Api\InvoiceNumber;
 
+use PayPal\Api\InvoiceNumber;
 
 /**
  * Class Cost
@@ -51,5 +51,4 @@ class InvoiceNumberTest extends \PHPUnit_Framework_TestCase
     {
         $this->assertEquals($obj->getNumber(), "1234");
     }
-    
 }

tests/PayPal/Test/Api/InvoiceSearchResponseTest.php

@@ -53,5 +53,4 @@ class InvoiceSearchResponseTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals($obj->getTotalCount(), 123);
         $this->assertEquals($obj->getInvoices(), InvoiceTest::getObject());
     }
-
 }

tests/PayPal/Test/Api/ItemListTest.php

@@ -60,6 +60,4 @@ class ItemListTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals($obj->getShippingMethod(), "TestSample");
         $this->assertEquals($obj->getShippingPhoneNumber(), "TestSample");
     }
-
-
 }

tests/PayPal/Test/Api/ItemTest.php

@@ -92,5 +92,4 @@ class ItemTest extends \PHPUnit_Framework_TestCase
         $obj = new Item();
         $obj->setUrl(null);
     }
-
 }