Merge branch 'MAGETWO-99035' of https://github.com/magento-mpi/magento2ce into PR-05-29-2019

Spandana Chittimala · Spandana Chittimala · commit 3592ff31ecd8 · 2019-06-03T13:00:16.000-05:00
diff --git a/app/code/Magento/Paypal/Model/Payflow/Transparent.php b/app/code/Magento/Paypal/Model/Payflow/Transparent.php
@@ -195,7 +195,7 @@ public function authorize(InfoInterface $payment, $amount)
         } catch (LocalizedException $exception) {
             $payment->setParentTransactionId($response->getData(self::PNREF));
             $this->void($payment);
-            // phpcs:ignore Magento2.Exceptions.DirectThrow
+            // phpcs:ignore Magento2.Exceptions.ThrowCatch
             throw new LocalizedException(__("The payment couldn't be processed at this time. Please try again later."));
         }
 

Original file line number	Diff line number	Diff line change
`@@ -195,7 +195,7 @@ public function authorize(InfoInterface $payment, $amount)`
`195`	`195`	`} catch (LocalizedException $exception) {`
`196`	`196`	`$payment->setParentTransactionId($response->getData(self::PNREF));`
`197`	`197`	`$this->void($payment);`
`198`		`- // phpcs:ignore Magento2.Exceptions.DirectThrow`
	`198`	`+ // phpcs:ignore Magento2.Exceptions.ThrowCatch`
`199`	`199`	`throw new LocalizedException(__("The payment couldn't be processed at this time. Please try again later."));`
`200`	`200`	`}`
`201`	`201`