Skip to content

Commit ab86799

Browse files
author
solwininfotech
committed
Merge branch '2.3-develop' into 22251-admin-order-email-is-now-required-1
2 parents 6fe2ab2 + dfe0392 commit ab86799

File tree

748 files changed

+22609
-3968
lines changed

Some content is hidden

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

748 files changed

+22609
-3968
lines changed

‎README.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
[![Open Source Helpers](https://www.codetriage.com/magento/magento2/badges/users.svg)](https://www.codetriage.com/magento/magento2)
22
[![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/magento/magento2?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
33
[![Crowdin](https://d322cqt584bo4o.cloudfront.net/magento-2/localized.svg)](https://crowdin.com/project/magento-2)
4-
<h2>Welcome</h2>
4+
5+
## Welcome
56
Welcome to Magento 2 installation! We're glad you chose to install Magento 2, a cutting-edge, feature-rich eCommerce solution that gets results.
67

78
## Magento System Requirements
@@ -30,7 +31,7 @@ To suggest documentation improvements, click [here][4].
3031
[4]: https://devdocs.magento.com
3132

3233
<h3>Community Maintainers</h3>
33-
The members of this team have been recognized for their outstanding commitment to maintaining and improving Magento. Magento has granted them permission to accept, merge, and reject pull requests, as well as review issues, and thanks these Community Maintainers for their valuable contributions.
34+
The members of this team have been recognized for their outstanding commitment to maintaining and improving Magento. Magento has granted them permission to accept, merge, and reject pull requests, as well as review issues, and thanks to these Community Maintainers for their valuable contributions.
3435

3536
<a href="https://magento.com/magento-contributors#maintainers">
3637
<img src="https://raw.githubusercontent.com/wiki/magento/magento2/images/maintainers.png"/>

‎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/Authorization/Model/Role.php

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,6 @@ public function __construct( //phpcs:ignore Generic.CodeAnalysis.UselessOverridi
5252

5353
/**
5454
* @inheritDoc
55-
*
56-
* @SuppressWarnings(PHPMD.SerializationAware)
57-
* @deprecated Do not use PHP serialization.
5855
*/
5956
public function __sleep()
6057
{
@@ -64,9 +61,6 @@ public function __sleep()
6461

6562
/**
6663
* @inheritDoc
67-
*
68-
* @SuppressWarnings(PHPMD.SerializationAware)
69-
* @deprecated Do not use PHP serialization.
7064
*/
7165
public function __wakeup()
7266
{

‎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
{

0 commit comments

Comments
 (0)