Skip to content

Commit a2a68d1

Browse files
committed
Merge branch '2.3-develop' of github.com:magento/magento2ce into scalar-pr-2
2 parents 3088d8f + 4e3da15 commit a2a68d1

File tree

206 files changed

+4839
-634
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

206 files changed

+4839
-634
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ public function __construct(
8989
public function prepareExportData()
9090
{
9191
try {
92-
$tmpDirectory = $this->filesystem->getDirectoryWrite(DirectoryList::VAR_DIR);
92+
$tmpDirectory = $this->filesystem->getDirectoryWrite(DirectoryList::SYS_TMP);
9393

9494
$this->prepareDirectory($tmpDirectory, $this->getTmpFilesDirRelativePath());
9595
$this->reportWriter->write($tmpDirectory, $this->getTmpFilesDirRelativePath());

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
use Magento\Framework\Archive;
1414
use Magento\Framework\Filesystem;
1515
use Magento\Framework\Filesystem\Directory\WriteInterface;
16-
use Magento\Framework\App\Filesystem\DirectoryList;
16+
use Magento\Framework\Filesystem\DirectoryList;
1717
use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
1818

1919
class ExportDataHandlerTest extends \PHPUnit\Framework\TestCase
@@ -137,7 +137,7 @@ public function testPrepareExportData($isArchiveSourceDirectory)
137137
$this->filesystemMock
138138
->expects($this->once())
139139
->method('getDirectoryWrite')
140-
->with(DirectoryList::VAR_DIR)
140+
->with(DirectoryList::SYS_TMP)
141141
->willReturn($this->directoryMock);
142142
$this->directoryMock
143143
->expects($this->exactly(4))
@@ -238,7 +238,7 @@ public function testPrepareExportDataWithLocalizedException()
238238
$this->filesystemMock
239239
->expects($this->once())
240240
->method('getDirectoryWrite')
241-
->with(DirectoryList::VAR_DIR)
241+
->with(DirectoryList::SYS_TMP)
242242
->willReturn($this->directoryMock);
243243
$this->reportWriterMock
244244
->expects($this->once())

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@
1818
* Block for representing the payment form
1919
*
2020
* @api
21+
* @deprecated Starting from Magento 2.3.4 Authorize.net payment method core integration is deprecated in favor of
22+
* official payment integration available on the marketplace
2123
*/
2224
class Form extends Cc
2325
{

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
* Translates the labels for the info block
1616
*
1717
* @api
18+
* @deprecated Starting from Magento 2.3.4 Authorize.net payment method core integration is deprecated in favor of
19+
* official payment integration available on the marketplace
1820
*/
1921
class Info extends ConfigurableInfo
2022
{

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@
1818
* Represents the payment block for the admin checkout form
1919
*
2020
* @api
21+
* @deprecated Starting from Magento 2.3.4 Authorize.net payment method core integration is deprecated in favor of
22+
* official payment integration available on the marketplace
2123
*/
2224
class Payment extends Template
2325
{

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,9 @@
1414

1515
/**
1616
* Chooses the best method of accepting the payment based on the status of the transaction
17+
*
18+
* @deprecated Starting from Magento 2.3.4 Authorize.net payment method core integration is deprecated in favor of
19+
* official payment integration available on the marketplace
1720
*/
1821
class AcceptPaymentStrategyCommand implements CommandInterface
1922
{

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,9 @@
2020

2121
/**
2222
* Chooses the best method of capture based on the context of the payment
23+
*
24+
* @deprecated Starting from Magento 2.3.4 Authorize.net payment method core integration is deprecated in favor of
25+
* official payment integration available on the marketplace
2326
*/
2427
class CaptureStrategyCommand implements CommandInterface
2528
{

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@
1717

1818
/**
1919
* Syncs the transaction status with authorize.net
20+
*
21+
* @deprecated Starting from Magento 2.3.4 Authorize.net payment method core integration is deprecated in favor of
22+
* official payment integration available on the marketplace
2023
*/
2124
class FetchTransactionInfoCommand implements CommandInterface
2225
{

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,9 @@
2020

2121
/**
2222
* Makes a request to the gateway and returns results
23+
*
24+
* @deprecated Starting from Magento 2.3.4 Authorize.net payment method core integration is deprecated in favor of
25+
* official payment integration available on the marketplace
2326
*/
2427
class GatewayQueryCommand implements CommandInterface
2528
{

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,9 @@
1414

1515
/**
1616
* Chooses the best method of returning the payment based on the status of the transaction
17+
*
18+
* @deprecated Starting from Magento 2.3.4 Authorize.net payment method core integration is deprecated in favor of
19+
* official payment integration available on the marketplace
1720
*/
1821
class RefundTransactionStrategyCommand implements CommandInterface
1922
{

0 commit comments

Comments
 (0)