Merge pull request #5005 from magento-tsg/2.2-develop-pr122

[TSG] Fixes for 2.2 (pr122) (2.2-develop)
magento · Nov 8, 2019 · 1778c8f · 1778c8f
2 parents 38de4ec + d90c731
commit 1778c8f
Show file tree

Hide file tree

Showing 103 changed files with 188 additions and 1,521 deletions.
diff --git a/...Magento/Authorizenet/Test/Mftf/Test/StorefrontVerifySecureURLRedirectAuthorizenetTest.xml b/...Magento/Authorizenet/Test/Mftf/Test/StorefrontVerifySecureURLRedirectAuthorizenetTest.xml
diff --git a/app/code/Magento/Authorizenet/etc/adminhtml/system.xml b/app/code/Magento/Authorizenet/etc/adminhtml/system.xml
@@ -9,7 +9,7 @@
     <system>
         <section id="payment">
             <group id="authorizenet_directpost" translate="label" type="text" sortOrder="34" showInDefault="1" showInWebsite="1" showInStore="1">
-                <label>Authorize.net Direct Post</label>
+                <label>Authorize.Net Direct Post (Deprecated)</label>
                 <field id="active" translate="label" type="select" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="0" canRestore="1">
                     <label>Enabled</label>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>

diff --git a/app/code/Magento/Authorizenet/i18n/en_US.csv b/app/code/Magento/Authorizenet/i18n/en_US.csv
@@ -45,7 +45,7 @@ void,void
 "Fraud Filters","Fraud Filters"
 "Place Order","Place Order"
 "Sorry, but something went wrong. Please contact the seller.","Sorry, but something went wrong. Please contact the seller."
-"Authorize.net Direct Post","Authorize.net Direct Post"
+"Authorize.Net Direct Post (Deprecated)","Authorize.Net Direct Post (Deprecated)"
 Enabled,Enabled
 "Payment Action","Payment Action"
 Title,Title

diff --git a/app/code/Magento/AuthorizenetAcceptjs/Block/Form.php b/app/code/Magento/AuthorizenetAcceptjs/Block/Form.php
@@ -18,6 +18,8 @@
  * Block for representing the payment form
  *
  * @api
+ * @deprecated Starting from Magento 2.2.11 Authorize.net payment method core integration is deprecated in favor of
+ * official payment integration available on the marketplace
  */
 class Form extends Cc
 {

diff --git a/app/code/Magento/AuthorizenetAcceptjs/Block/Info.php b/app/code/Magento/AuthorizenetAcceptjs/Block/Info.php
@@ -15,6 +15,8 @@
  * Translates the labels for the info block
  *
  * @api
+ * @deprecated Starting from Magento 2.2.11 Authorize.net payment method core integration is deprecated in favor of
+ * official payment integration available on the marketplace
  */
 class Info extends ConfigurableInfo
 {

diff --git a/app/code/Magento/AuthorizenetAcceptjs/Block/Payment.php b/app/code/Magento/AuthorizenetAcceptjs/Block/Payment.php
@@ -18,6 +18,8 @@
  * Represents the payment block for the admin checkout form
  *
  * @api
+ * @deprecated Starting from Magento 2.2.11 Authorize.net payment method core integration is deprecated in favor of
+ * official payment integration available on the marketplace
  */
 class Payment extends Template
 {

diff --git a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Command/AcceptPaymentStrategyCommand.php b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Command/AcceptPaymentStrategyCommand.php
@@ -14,6 +14,9 @@
 
 /**
  * Chooses the best method of accepting the payment based on the status of the transaction
+ *
+ * @deprecated Starting from Magento 2.2.11 Authorize.net payment method core integration is deprecated in favor of
+ * official payment integration available on the marketplace
  */
 class AcceptPaymentStrategyCommand implements CommandInterface
 {

diff --git a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Command/CaptureStrategyCommand.php b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Command/CaptureStrategyCommand.php
@@ -20,6 +20,9 @@
 
 /**
  * Chooses the best method of capture based on the context of the payment
+ *
+ * @deprecated Starting from Magento 2.2.11 Authorize.net payment method core integration is deprecated in favor of
+ * official payment integration available on the marketplace
  */
 class CaptureStrategyCommand implements CommandInterface
 {

diff --git a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Command/FetchTransactionInfoCommand.php b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Command/FetchTransactionInfoCommand.php
@@ -17,6 +17,9 @@
 
 /**
  * Syncs the transaction status with authorize.net
+ *
+ * @deprecated Starting from Magento 2.2.11 Authorize.net payment method core integration is deprecated in favor of
+ * official payment integration available on the marketplace
  */
 class FetchTransactionInfoCommand implements CommandInterface
 {

diff --git a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Command/GatewayQueryCommand.php b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Command/GatewayQueryCommand.php
@@ -18,6 +18,9 @@
 
 /**
  * Makes a request to the gateway and returns results
+ *
+ * @deprecated Starting from Magento 2.2.11 Authorize.net payment method core integration is deprecated in favor of
+ * official payment integration available on the marketplace
  */
 class GatewayQueryCommand implements CommandInterface
 {

diff --git a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Command/RefundTransactionStrategyCommand.php b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Command/RefundTransactionStrategyCommand.php
@@ -14,6 +14,9 @@
 
 /**
  * Chooses the best method of returning the payment based on the status of the transaction
+ *
+ * @deprecated Starting from Magento 2.2.11 Authorize.net payment method core integration is deprecated in favor of
+ * official payment integration available on the marketplace
  */
 class RefundTransactionStrategyCommand implements CommandInterface
 {

diff --git a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Config.php b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Config.php
@@ -10,6 +10,9 @@
 
 /**
  * Houses configuration for this gateway
+ *
+ * @deprecated Starting from Magento 2.2.11 Authorize.net payment method core integration is deprecated in favor of
+ * official payment integration available on the marketplace
  */
 class Config extends \Magento\Payment\Gateway\Config\Config
 {

diff --git a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Http/Client.php b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Http/Client.php
@@ -20,6 +20,9 @@
 
 /**
  * A client that can communicate with the Authorize.net API
+ *
+ * @deprecated Starting from Magento 2.2.11 Authorize.net payment method core integration is deprecated in favor of
+ * official payment integration available on the marketplace
  */
 class Client implements ClientInterface
 {
@@ -104,11 +107,13 @@ public function placeRequest(TransferInterface $transferObject)
             try {
                 $data = $this->json->unserialize($responseBody);
             } catch (\InvalidArgumentException $e) {
+                // phpcs:ignore Magento2.Exceptions.DirectThrow
                 throw new \Exception('Invalid JSON was returned by the gateway');
             }
 
             return $data;
-        } catch (\Throwable $e) {
+            // phpcs:ignore Magento2.Exceptions.ThrowCatch
+        } catch (\Exception $e) {
             $this->logger->critical($e);
 
             throw new ClientException(

diff --git a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Http/Payload/Filter/RemoveFieldsFilter.php b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Http/Payload/Filter/RemoveFieldsFilter.php
@@ -12,6 +12,9 @@
 
 /**
  * Removes a set of fields from the payload
+ *
+ * @deprecated Starting from Magento 2.2.11 Authorize.net payment method core integration is deprecated in favor of
+ * official payment integration available on the marketplace
  */
 class RemoveFieldsFilter implements FilterInterface
 {

diff --git a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Http/Payload/FilterInterface.php b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Http/Payload/FilterInterface.php
@@ -10,6 +10,9 @@
 
 /**
  * Describes a filter for filtering content after all the builders have finished
+ *
+ * @deprecated Starting from Magento 2.2.11 Authorize.net payment method core integration is deprecated in favor of
+ * official payment integration available on the marketplace
  */
 interface FilterInterface
 {

diff --git a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Http/TransferFactory.php b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Http/TransferFactory.php
@@ -14,6 +14,9 @@
 
 /**
  * Can create a transfer object
+ *
+ * @deprecated Starting from Magento 2.2.11 Authorize.net payment method core integration is deprecated in favor of
+ * official payment integration available on the marketplace
  */
 class TransferFactory implements TransferFactoryInterface
 {

diff --git a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/AcceptFdsDataBuilder.php b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/AcceptFdsDataBuilder.php
@@ -14,6 +14,9 @@
 
 /**
  * Adds the meta transaction information to the request
+ *
+ * @deprecated Starting from Magento 2.2.11 Authorize.net payment method core integration is deprecated in favor of
+ * official payment integration available on the marketplace
  */
 class AcceptFdsDataBuilder implements BuilderInterface
 {

diff --git a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/AddressDataBuilder.php b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/AddressDataBuilder.php
@@ -13,6 +13,9 @@
 
 /**
  * Adds the basic payment information to the request
+ *
+ * @deprecated Starting from Magento 2.2.11 Authorize.net payment method core integration is deprecated in favor of
+ * official payment integration available on the marketplace
  */
 class AddressDataBuilder implements BuilderInterface
 {

diff --git a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/AmountDataBuilder.php b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/AmountDataBuilder.php
@@ -14,6 +14,9 @@
 
 /**
  * Adds the amount of the transaction to the Request
+ *
+ * @deprecated Starting from Magento 2.2.11 Authorize.net payment method core integration is deprecated in favor of
+ * official payment integration available on the marketplace
  */
 class AmountDataBuilder implements BuilderInterface
 {

diff --git a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/AuthenticationDataBuilder.php b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/AuthenticationDataBuilder.php
@@ -14,6 +14,9 @@
 
 /**
  * Adds the stored credentials to the request
+ *
+ * @deprecated Starting from Magento 2.2.11 Authorize.net payment method core integration is deprecated in favor of
+ * official payment integration available on the marketplace
  */
 class AuthenticationDataBuilder implements BuilderInterface
 {

diff --git a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/AuthorizeDataBuilder.php b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/AuthorizeDataBuilder.php
@@ -15,6 +15,9 @@
 
 /**
  * Adds the meta transaction information to the request
+ *
+ * @deprecated Starting from Magento 2.2.11 Authorize.net payment method core integration is deprecated in favor of
+ * official payment integration available on the marketplace
  */
 class AuthorizeDataBuilder implements BuilderInterface
 {

diff --git a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/CaptureDataBuilder.php b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/CaptureDataBuilder.php
@@ -15,6 +15,9 @@
 
 /**
  * Adds the meta transaction information to the request
+ *
+ * @deprecated Starting from Magento 2.2.11 Authorize.net payment method core integration is deprecated in favor of
+ * official payment integration available on the marketplace
  */
 class CaptureDataBuilder implements BuilderInterface
 {

diff --git a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/CustomSettingsBuilder.php b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/CustomSettingsBuilder.php
@@ -14,6 +14,9 @@
 
 /**
  * Adds the custom settings to the request
+ *
+ * @deprecated Starting from Magento 2.2.11 Authorize.net payment method core integration is deprecated in favor of
+ * official payment integration available on the marketplace
  */
 class CustomSettingsBuilder implements BuilderInterface
 {

diff --git a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/CustomerDataBuilder.php b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/CustomerDataBuilder.php
@@ -14,6 +14,9 @@
 
 /**
  * Adds the basic payment information to the request
+ *
+ * @deprecated Starting from Magento 2.2.11 Authorize.net payment method core integration is deprecated in favor of
+ * official payment integration available on the marketplace
  */
 class CustomerDataBuilder implements BuilderInterface
 {

diff --git a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/OrderDataBuilder.php b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/OrderDataBuilder.php
@@ -13,6 +13,9 @@
 
 /**
  * Adds the basic payment information to the request
+ *
+ * @deprecated Starting from Magento 2.2.11 Authorize.net payment method core integration is deprecated in favor of
+ * official payment integration available on the marketplace
  */
 class OrderDataBuilder implements BuilderInterface
 {

diff --git a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/PassthroughDataBuilder.php b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/PassthroughDataBuilder.php
@@ -13,6 +13,9 @@
 
 /**
  * Adds data to the request that can be used in the response
+ *
+ * @deprecated Starting from Magento 2.2.11 Authorize.net payment method core integration is deprecated in favor of
+ * official payment integration available on the marketplace
  */
 class PassthroughDataBuilder implements BuilderInterface
 {

diff --git a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/PaymentDataBuilder.php b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/PaymentDataBuilder.php
@@ -14,6 +14,9 @@
 
 /**
  * Adds the basic payment information to the request
+ *
+ * @deprecated Starting from Magento 2.2.11 Authorize.net payment method core integration is deprecated in favor of
+ * official payment integration available on the marketplace
  */
 class PaymentDataBuilder implements BuilderInterface
 {

diff --git a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/PoDataBuilder.php b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/PoDataBuilder.php
@@ -14,6 +14,9 @@
 
 /**
  * Adds the basic payment information to the request
+ *
+ * @deprecated Starting from Magento 2.2.11 Authorize.net payment method core integration is deprecated in favor of
+ * official payment integration available on the marketplace
  */
 class PoDataBuilder implements BuilderInterface
 {

diff --git a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/RefundPaymentDataBuilder.php b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/RefundPaymentDataBuilder.php
@@ -14,6 +14,9 @@
 
 /**
  * Adds the basic refund information to the request
+ *
+ * @deprecated Starting from Magento 2.2.11 Authorize.net payment method core integration is deprecated in favor of
+ * official payment integration available on the marketplace
  */
 class RefundPaymentDataBuilder implements BuilderInterface
 {

diff --git a/...de/Magento/AuthorizenetAcceptjs/Gateway/Request/RefundReferenceTransactionDataBuilder.php b/...de/Magento/AuthorizenetAcceptjs/Gateway/Request/RefundReferenceTransactionDataBuilder.php
@@ -14,6 +14,9 @@
 
 /**
  * Adds the reference transaction to the request
+ *
+ * @deprecated Starting from Magento 2.2.11 Authorize.net payment method core integration is deprecated in favor of
+ * official payment integration available on the marketplace
  */
 class RefundReferenceTransactionDataBuilder implements BuilderInterface
 {

diff --git a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/RefundTransactionTypeDataBuilder.php b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/RefundTransactionTypeDataBuilder.php
@@ -12,6 +12,9 @@
 
 /**
  * Adds the meta transaction information to the request
+ *
+ * @deprecated Starting from Magento 2.2.11 Authorize.net payment method core integration is deprecated in favor of
+ * official payment integration available on the marketplace
  */
 class RefundTransactionTypeDataBuilder implements BuilderInterface
 {

diff --git a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/RequestTypeBuilder.php b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/RequestTypeBuilder.php
@@ -12,6 +12,9 @@
 
 /**
  * Adds the type of the request to the build subject
+ *
+ * @deprecated Starting from Magento 2.2.11 Authorize.net payment method core integration is deprecated in favor of
+ * official payment integration available on the marketplace
  */
 class RequestTypeBuilder implements BuilderInterface
 {

diff --git a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/SaleDataBuilder.php b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/SaleDataBuilder.php
@@ -15,6 +15,9 @@
 
 /**
  * Adds the meta transaction information to the request
+ *
+ * @deprecated Starting from Magento 2.2.11 Authorize.net payment method core integration is deprecated in favor of
+ * official payment integration available on the marketplace
  */
 class SaleDataBuilder implements BuilderInterface
 {

diff --git a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/ShippingDataBuilder.php b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/ShippingDataBuilder.php
@@ -15,6 +15,9 @@
 
 /**
  * Adds the shipping information to the request
+ *
+ * @deprecated Starting from Magento 2.2.11 Authorize.net payment method core integration is deprecated in favor of
+ * official payment integration available on the marketplace
  */
 class ShippingDataBuilder implements BuilderInterface
 {

diff --git a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/SolutionDataBuilder.php b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/SolutionDataBuilder.php
@@ -14,6 +14,9 @@
 
 /**
  * Adds the appropriate solution ID to the request
+ *
+ * @deprecated Starting from Magento 2.2.11 Authorize.net payment method core integration is deprecated in favor of
+ * official payment integration available on the marketplace
  */
 class SolutionDataBuilder implements BuilderInterface
 {