Merge pull request #4997 from magento-tsg/2.3-develop-pr86

[TSG] Fixes for 2.3 (pr86) (2.3-develop)

Author: zakdma

app/code/Magento/Analytics/Model/ExportDataHandler.php

@@ -89,7 +89,7 @@ public function __construct(
     public function prepareExportData()
     {
         try {
-            $tmpDirectory = $this->filesystem->getDirectoryWrite(DirectoryList::VAR_DIR);
+            $tmpDirectory = $this->filesystem->getDirectoryWrite(DirectoryList::SYS_TMP);
 
             $this->prepareDirectory($tmpDirectory, $this->getTmpFilesDirRelativePath());
             $this->reportWriter->write($tmpDirectory, $this->getTmpFilesDirRelativePath());

app/code/Magento/Analytics/Test/Unit/Model/ExportDataHandlerTest.php

@@ -13,7 +13,7 @@
 use Magento\Framework\Archive;
 use Magento\Framework\Filesystem;
 use Magento\Framework\Filesystem\Directory\WriteInterface;
-use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\Filesystem\DirectoryList;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 
 class ExportDataHandlerTest extends \PHPUnit\Framework\TestCase
@@ -137,7 +137,7 @@ public function testPrepareExportData($isArchiveSourceDirectory)
         $this->filesystemMock
             ->expects($this->once())
             ->method('getDirectoryWrite')
-            ->with(DirectoryList::VAR_DIR)
+            ->with(DirectoryList::SYS_TMP)
             ->willReturn($this->directoryMock);
         $this->directoryMock
             ->expects($this->exactly(4))
@@ -238,7 +238,7 @@ public function testPrepareExportDataWithLocalizedException()
         $this->filesystemMock
             ->expects($this->once())
             ->method('getDirectoryWrite')
-            ->with(DirectoryList::VAR_DIR)
+            ->with(DirectoryList::SYS_TMP)
             ->willReturn($this->directoryMock);
         $this->reportWriterMock
             ->expects($this->once())

app/code/Magento/AuthorizenetAcceptjs/Block/Form.php

@@ -18,6 +18,8 @@
  * Block for representing the payment form
  *
  * @api
+ * @deprecated Starting from Magento 2.3.4 Authorize.net payment method core integration is deprecated in favor of
+ * official payment integration available on the marketplace
  */
 class Form extends Cc
 {

app/code/Magento/AuthorizenetAcceptjs/Block/Info.php

@@ -15,6 +15,8 @@
  * Translates the labels for the info block
  *
  * @api
+ * @deprecated Starting from Magento 2.3.4 Authorize.net payment method core integration is deprecated in favor of
+ * official payment integration available on the marketplace
  */
 class Info extends ConfigurableInfo
 {

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.3.4 Authorize.net payment method core integration is deprecated in favor of
+ * official payment integration available on the marketplace
  */
 class Payment extends Template
 {

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.3.4 Authorize.net payment method core integration is deprecated in favor of
+ * official payment integration available on the marketplace
  */
 class AcceptPaymentStrategyCommand implements CommandInterface
 {

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.3.4 Authorize.net payment method core integration is deprecated in favor of
+ * official payment integration available on the marketplace
  */
 class CaptureStrategyCommand implements CommandInterface
 {

app/code/Magento/AuthorizenetAcceptjs/Gateway/Command/FetchTransactionInfoCommand.php

@@ -17,6 +17,9 @@
 
 /**
  * Syncs the transaction status with authorize.net
+ *
+ * @deprecated Starting from Magento 2.3.4 Authorize.net payment method core integration is deprecated in favor of
+ * official payment integration available on the marketplace
  */
 class FetchTransactionInfoCommand implements CommandInterface
 {

app/code/Magento/AuthorizenetAcceptjs/Gateway/Command/GatewayQueryCommand.php

@@ -20,6 +20,9 @@
 
 /**
  * Makes a request to the gateway and returns results
+ *
+ * @deprecated Starting from Magento 2.3.4 Authorize.net payment method core integration is deprecated in favor of
+ * official payment integration available on the marketplace
  */
 class GatewayQueryCommand implements CommandInterface
 {

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.3.4 Authorize.net payment method core integration is deprecated in favor of
+ * official payment integration available on the marketplace
  */
 class RefundTransactionStrategyCommand implements CommandInterface
 {

app/code/Magento/AuthorizenetAcceptjs/Gateway/Config.php

@@ -13,6 +13,9 @@
 
 /**
  * Houses configuration for this gateway
+ *
+ * @deprecated Starting from Magento 2.3.4 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
 {
@@ -33,19 +36,6 @@ class Config extends \Magento\Payment\Gateway\Config\Config
     private const SOLUTION_ID_SANDBOX = 'AAA102993';
     private const SOLUTION_ID_PRODUCTION = 'AAA175350';
 
-    /**
-     * @param ScopeConfigInterface $scopeConfig
-     * @param null|string $methodCode
-     * @param string $pathPattern
-     */
-    public function __construct(
-        ScopeConfigInterface $scopeConfig,
-        $methodCode = null,
-        $pathPattern = self::DEFAULT_PATH_PATTERN
-    ) {
-        parent::__construct($scopeConfig, $methodCode, $pathPattern);
-    }
-
     /**
      * Gets the login id
      *

app/code/Magento/AuthorizenetAcceptjs/Gateway/Http/Client.php

@@ -21,6 +21,9 @@
 
 /**
  * A client that can communicate with the Authorize.net API
+ *
+ * @deprecated Starting from Magento 2.3.4 Authorize.net payment method core integration is deprecated in favor of
+ * official payment integration available on the marketplace
  */
 class Client implements ClientInterface
 {
@@ -109,10 +112,12 @@ 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;
+            // phpcs:ignore Magento2.Exceptions.ThrowCatch
         } catch (\Exception $e) {
             $this->logger->critical($e);
 

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.3.4 Authorize.net payment method core integration is deprecated in favor of
+ * official payment integration available on the marketplace
  */
 class RemoveFieldsFilter implements FilterInterface
 {

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.3.4 Authorize.net payment method core integration is deprecated in favor of
+ * official payment integration available on the marketplace
  */
 interface FilterInterface
 {

app/code/Magento/AuthorizenetAcceptjs/Gateway/Http/TransferFactory.php

@@ -14,6 +14,9 @@
 
 /**
  * Can create a transfer object
+ *
+ * @deprecated Starting from Magento 2.3.4 Authorize.net payment method core integration is deprecated in favor of
+ * official payment integration available on the marketplace
  */
 class TransferFactory implements TransferFactoryInterface
 {

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.3.4 Authorize.net payment method core integration is deprecated in favor of
+ * official payment integration available on the marketplace
  */
 class AcceptFdsDataBuilder implements BuilderInterface
 {

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.3.4 Authorize.net payment method core integration is deprecated in favor of
+ * official payment integration available on the marketplace
  */
 class AddressDataBuilder implements BuilderInterface
 {

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.3.4 Authorize.net payment method core integration is deprecated in favor of
+ * official payment integration available on the marketplace
  */
 class AmountDataBuilder implements BuilderInterface
 {

app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/AuthenticationDataBuilder.php

@@ -14,6 +14,9 @@
 
 /**
  * Adds the stored credentials to the request
+ *
+ * @deprecated Starting from Magento 2.3.4 Authorize.net payment method core integration is deprecated in favor of
+ * official payment integration available on the marketplace
  */
 class AuthenticationDataBuilder implements BuilderInterface
 {

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.3.4 Authorize.net payment method core integration is deprecated in favor of
+ * official payment integration available on the marketplace
  */
 class AuthorizeDataBuilder implements BuilderInterface
 {

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.3.4 Authorize.net payment method core integration is deprecated in favor of
+ * official payment integration available on the marketplace
  */
 class CaptureDataBuilder implements BuilderInterface
 {

app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/CustomSettingsBuilder.php

@@ -14,6 +14,9 @@
 
 /**
  * Adds the custom settings to the request
+ *
+ * @deprecated Starting from Magento 2.3.4 Authorize.net payment method core integration is deprecated in favor of
+ * official payment integration available on the marketplace
  */
 class CustomSettingsBuilder implements BuilderInterface
 {

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.3.4 Authorize.net payment method core integration is deprecated in favor of
+ * official payment integration available on the marketplace
  */
 class CustomerDataBuilder implements BuilderInterface
 {

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.3.4 Authorize.net payment method core integration is deprecated in favor of
+ * official payment integration available on the marketplace
  */
 class OrderDataBuilder implements BuilderInterface
 {

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.3.4 Authorize.net payment method core integration is deprecated in favor of
+ * official payment integration available on the marketplace
  */
 class PassthroughDataBuilder implements BuilderInterface
 {

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.3.4 Authorize.net payment method core integration is deprecated in favor of
+ * official payment integration available on the marketplace
  */
 class PaymentDataBuilder implements BuilderInterface
 {

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.3.4 Authorize.net payment method core integration is deprecated in favor of
+ * official payment integration available on the marketplace
  */
 class PoDataBuilder implements BuilderInterface
 {

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.3.4 Authorize.net payment method core integration is deprecated in favor of
+ * official payment integration available on the marketplace
  */
 class RefundPaymentDataBuilder implements BuilderInterface
 {

app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/RefundReferenceTransactionDataBuilder.php

@@ -14,6 +14,9 @@
 
 /**
  * Adds the reference transaction to the request
+ *
+ * @deprecated Starting from Magento 2.3.4 Authorize.net payment method core integration is deprecated in favor of
+ * official payment integration available on the marketplace
  */
 class RefundReferenceTransactionDataBuilder implements BuilderInterface
 {

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.3.4 Authorize.net payment method core integration is deprecated in favor of
+ * official payment integration available on the marketplace
  */
 class RefundTransactionTypeDataBuilder implements BuilderInterface
 {

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.3.4 Authorize.net payment method core integration is deprecated in favor of
+ * official payment integration available on the marketplace
  */
 class RequestTypeBuilder implements BuilderInterface
 {

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.3.4 Authorize.net payment method core integration is deprecated in favor of
+ * official payment integration available on the marketplace
  */
 class SaleDataBuilder implements BuilderInterface
 {

app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/ShippingDataBuilder.php

@@ -15,6 +15,9 @@
 
 /**
  * Adds the shipping information to the request
+ *
+ * @deprecated Starting from Magento 2.3.4 Authorize.net payment method core integration is deprecated in favor of
+ * official payment integration available on the marketplace
  */
 class ShippingDataBuilder implements BuilderInterface
 {

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.3.4 Authorize.net payment method core integration is deprecated in favor of
+ * official payment integration available on the marketplace
  */
 class SolutionDataBuilder implements BuilderInterface
 {

app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/StoreConfigBuilder.php

@@ -12,6 +12,9 @@
 
 /**
  * This builder is used for correct store resolving and used only to retrieve correct store ID.
+ *
+ * @deprecated Starting from Magento 2.3.4 Authorize.net payment method core integration is deprecated in favor of
+ * official payment integration available on the marketplace
  */
 class StoreConfigBuilder implements BuilderInterface
 {