Skip to content

Commit 886bce7

Browse files
naydavnaydav
committed
Merge remote-tracking branch 'origin/2.3-develop' into issue/305
2 parents 25dcef6 + d3a6707 commit 886bce7

File tree

2,014 files changed

+56393
-8113
lines changed

Some content is hidden

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

2,014 files changed

+56393
-8113
lines changed

‎.github/CONTRIBUTING.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ The Magento 2 development team will review all issues and contributions submitte
1616
4. PRs which include bug fixes must be accompanied with a step-by-step description of how to reproduce the bug.
1717
3. PRs which include new logic or new features must be submitted along with:
1818
* Unit/integration test coverage
19-
* Proposed [documentation](http://devdocs.magento.com) updates. Documentation contributions can be submitted via the [devdocs GitHub](https://github.com/magento/devdocs).
19+
* Proposed [documentation](https://devdocs.magento.com) updates. Documentation contributions can be submitted via the [devdocs GitHub](https://github.com/magento/devdocs).
2020
4. For larger features or changes, please [open an issue](https://github.com/magento/magento2/issues) to discuss the proposed changes prior to development. This may prevent duplicate or unnecessary effort and allow other contributors to provide input.
2121
5. All automated tests must pass (all builds on [Travis CI](https://travis-ci.org/magento/magento2) must be green).
2222

@@ -27,7 +27,7 @@ If you are a new GitHub user, we recommend that you create your own [free github
2727
1. Search current [listed issues](https://github.com/magento/magento2/issues) (open or closed) for similar proposals of intended contribution before starting work on a new contribution.
2828
2. Review the [Contributor License Agreement](https://magento.com/legaldocuments/mca) if this is your first time contributing.
2929
3. Create and test your work.
30-
4. Fork the Magento 2 repository according to the [Fork A Repository instructions](http://devdocs.magento.com/guides/v2.2/contributor-guide/contributing.html#fork) and when you are ready to send us a pull request – follow the [Create A Pull Request instructions](http://devdocs.magento.com/guides/v2.2/contributor-guide/contributing.html#pull_request).
30+
4. Fork the Magento 2 repository according to the [Fork A Repository instructions](https://devdocs.magento.com/guides/v2.2/contributor-guide/contributing.html#fork) and when you are ready to send us a pull request – follow the [Create A Pull Request instructions](https://devdocs.magento.com/guides/v2.2/contributor-guide/contributing.html#pull_request).
3131
5. Once your contribution is received the Magento 2 development team will review the contribution and collaborate with you as needed.
3232

3333
## Code of Conduct

‎CHANGELOG.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ To get detailed information about changes in Magento 2.3.0, see the [Release Not
44

55
2.1.0
66
=============
7-
To get detailed information about changes in Magento 2.1.0, please visit [Magento Community Edition (CE) Release Notes](http://devdocs.magento.com/guides/v2.1/release-notes/ReleaseNotes2.1.0CE.html "Magento Community Edition (CE) Release Notes")
7+
To get detailed information about changes in Magento 2.1.0, please visit [Magento Community Edition (CE) Release Notes](https://devdocs.magento.com/guides/v2.1/release-notes/ReleaseNotes2.1.0CE.html "Magento Community Edition (CE) Release Notes")
88

99
2.0.0
1010
=============
@@ -1025,7 +1025,7 @@ Tests:
10251025
* Improved backend menu keyboard accessibility
10261026
* Accessibility improvements: WAI-ARIA in a product item on a category page and related products
10271027
* Checkout flow code can work with a separate DB storage
1028-
* <a href="http://devdocs.magento.com/guides/v1.0/release-notes/changes.html#change-devrc-unit">Unit tests moved to module directories</a>
1028+
* <a href="https://devdocs.magento.com/guides/v1.0/release-notes/changes.html#change-devrc-unit">Unit tests moved to module directories</a>
10291029
* Addressed naming inconsistencies in REST routes
10301030
* Added Advanced Developer workflow for frontend developers
10311031
* Setup

‎app/code/Magento/AdminNotification/view/adminhtml/layout/default.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
99
<body>
1010
<referenceContainer name="notifications">
11-
<uiComponent name="notification_area"/>
11+
<uiComponent name="notification_area" aclResource="Magento_AdminNotification::show_list"/>
1212
<block class="Magento\AdminNotification\Block\System\Messages\UnreadMessagePopup"
1313
name="unread_system_messages"
1414
as="unread_system_messages"

‎app/code/Magento/Analytics/README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Magento_Analytics Module
22

3-
The Magento_Analytics module integrates your Magento instance with the [Magento Business Intelligence (MBI)](https://magento.com/products/business-intelligence) to use [Advanced Reporting](http://devdocs.magento.com/guides/v2.2/advanced-reporting/modules.html) functionality.
3+
The Magento_Analytics module integrates your Magento instance with the [Magento Business Intelligence (MBI)](https://magento.com/products/business-intelligence) to use [Advanced Reporting](https://devdocs.magento.com/guides/v2.2/advanced-reporting/modules.html) functionality.
44

55
The module implements the following functionality:
66

@@ -16,8 +16,8 @@ The module implements the following functionality:
1616

1717
## Structure
1818

19-
Beyond the [usual module file structure](http://devdocs.magento.com/guides/v2.2/architecture/archi_perspectives/components/modules/mod_intro.html) the module contains a directory `ReportXml`.
20-
[Report XML](http://devdocs.magento.com/guides/v2.2/advanced-reporting/report-xml.html) is a markup language used to build reports for Advanced Reporting.
19+
Beyond the [usual module file structure](https://devdocs.magento.com/guides/v2.2/architecture/archi_perspectives/components/modules/mod_intro.html) the module contains a directory `ReportXml`.
20+
[Report XML](https://devdocs.magento.com/guides/v2.2/advanced-reporting/report-xml.html) is a markup language used to build reports for Advanced Reporting.
2121
The language declares SQL queries using XML declaration.
2222

2323
## Subscription Process

‎app/code/Magento/Authorizenet/Block/Adminhtml/Order/View/Info/FraudDetails.php

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,18 @@
33
* Copyright © Magento, Inc. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
6+
declare(strict_types=1);
7+
68
namespace Magento\Authorizenet\Block\Adminhtml\Order\View\Info;
79

810
use Magento\Authorizenet\Model\Directpost;
911

1012
/**
13+
* Fraud information block for Authorize.net payment method
14+
*
1115
* @api
1216
* @since 100.0.2
17+
* @deprecated 2.3.1 Authorize.net is removing all support for this payment method
1318
*/
1419
class FraudDetails extends \Magento\Backend\Block\Template
1520
{
@@ -33,6 +38,8 @@ public function __construct(
3338
}
3439

3540
/**
41+
* Return payment method model
42+
*
3643
* @return \Magento\Sales\Model\Order\Payment
3744
*/
3845
public function getPayment()
@@ -42,6 +49,8 @@ public function getPayment()
4249
}
4350

4451
/**
52+
* Produce and return the block's HTML output
53+
*
4554
* @return string
4655
*/
4756
protected function _toHtml()

‎app/code/Magento/Authorizenet/Block/Adminhtml/Order/View/Info/PaymentDetails.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212

1313
/**
1414
* Payment information block for Authorize.net payment method
15+
* @deprecated 2.3.1 Authorize.net is removing all support for this payment method
1516
*/
1617
class PaymentDetails extends ConfigurableInfo
1718
{

‎app/code/Magento/Authorizenet/Block/Transparent/Iframe.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,17 @@
33
* Copyright © Magento, Inc. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
6+
declare(strict_types=1);
7+
68
namespace Magento\Authorizenet\Block\Transparent;
79

810
use Magento\Payment\Block\Transparent\Iframe as TransparentIframe;
911

1012
/**
13+
* Transparent Iframe block for Authorize.net payments
1114
* @api
1215
* @since 100.0.2
16+
* @deprecated 2.3.1 Authorize.net is removing all support for this payment method
1317
*/
1418
class Iframe extends TransparentIframe
1519
{

‎app/code/Magento/Authorizenet/Controller/Adminhtml/Authorizenet/Directpost/Payment/AddConfigured.php

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,17 @@
44
* Copyright © Magento, Inc. All rights reserved.
55
* See COPYING.txt for license details.
66
*/
7+
declare(strict_types=1);
8+
79
namespace Magento\Authorizenet\Controller\Adminhtml\Authorizenet\Directpost\Payment;
810

9-
class AddConfigured extends \Magento\Sales\Controller\Adminhtml\Order\Create\AddConfigured
11+
use Magento\Framework\App\Action\HttpPutActionInterface;
12+
use Magento\Sales\Controller\Adminhtml\Order\Create\AddConfigured as BaseAddConfigured;
13+
14+
/**
15+
* Class AddConfigured
16+
* @deprecated 2.3.1 Authorize.net is removing all support for this payment method
17+
*/
18+
class AddConfigured extends BaseAddConfigured implements HttpPutActionInterface
1019
{
1120
}

‎app/code/Magento/Authorizenet/Controller/Adminhtml/Authorizenet/Directpost/Payment/Cancel.php

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,17 @@
44
* Copyright © Magento, Inc. All rights reserved.
55
* See COPYING.txt for license details.
66
*/
7+
declare(strict_types=1);
8+
79
namespace Magento\Authorizenet\Controller\Adminhtml\Authorizenet\Directpost\Payment;
810

9-
class Cancel extends \Magento\Sales\Controller\Adminhtml\Order\Create\Cancel
11+
use Magento\Framework\App\Action\HttpPostActionInterface;
12+
use Magento\Sales\Controller\Adminhtml\Order\Create\Cancel as BaseCancel;
13+
14+
/**
15+
* Class Cancel
16+
* @deprecated 2.3.1 Authorize.net is removing all support for this payment method
17+
*/
18+
class Cancel extends BaseCancel implements HttpPostActionInterface
1019
{
1120
}

‎app/code/Magento/Authorizenet/Controller/Adminhtml/Authorizenet/Directpost/Payment/ConfigureProductToAdd.php

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,17 @@
44
* Copyright © Magento, Inc. All rights reserved.
55
* See COPYING.txt for license details.
66
*/
7+
declare(strict_types=1);
8+
79
namespace Magento\Authorizenet\Controller\Adminhtml\Authorizenet\Directpost\Payment;
810

9-
class ConfigureProductToAdd extends \Magento\Sales\Controller\Adminhtml\Order\Create\ConfigureProductToAdd
11+
use Magento\Framework\App\Action\HttpPutActionInterface;
12+
use Magento\Sales\Controller\Adminhtml\Order\Create\ConfigureProductToAdd as BaseConfigureProductToAdd;
13+
14+
/**
15+
* Class ConfigureProductToAdd
16+
* @deprecated 2.3.1 Authorize.net is removing all support for this payment method
17+
*/
18+
class ConfigureProductToAdd extends BaseConfigureProductToAdd implements HttpPutActionInterface
1019
{
1120
}

0 commit comments

Comments
 (0)