Skip to content

Commit 3182b06

Browse files
oleg-onuferoleg-onufer
committed
Merge remote-tracking branch 'origin/2.3-develop' into MAGETWO-96719
2 parents eb1d10c + b3d9a05 commit 3182b06

File tree

186 files changed

+1028
-547
lines changed

Some content is hidden

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

186 files changed

+1028
-547
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/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/etc/config.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
<cgi_url_td_test_mode>https://apitest.authorize.net/xml/v1/request.api</cgi_url_td_test_mode>
3434
<cgi_url_td>https://api2.authorize.net/xml/v1/request.api</cgi_url_td>
3535
<paymentInfoKeys>x_card_type,x_account_number,x_avs_code,x_auth_code,x_response_reason_text,x_cvv2_resp_code</paymentInfoKeys>
36+
<group>authorizenet</group>
3637
</authorizenet_directpost>
3738
</payment>
3839
</default>

‎app/code/Magento/Authorizenet/etc/payment.xml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
<?xml version="1.0"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
<payment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9+
xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Payment:etc/payment.xsd">
10+
<groups>
11+
<group id="authorizenet">
12+
<label>Authorize.net</label>
13+
</group>
14+
</groups>
15+
</payment>

‎app/code/Magento/Backend/Model/Search/Customer.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ public function load()
8989

9090
$this->searchCriteriaBuilder->setCurrentPage($this->getStart());
9191
$this->searchCriteriaBuilder->setPageSize($this->getLimit());
92-
$searchFields = ['firstname', 'lastname', 'company'];
92+
$searchFields = ['firstname', 'lastname', 'billing_company'];
9393
$filters = [];
9494
foreach ($searchFields as $field) {
9595
$filters[] = $this->filterBuilder

‎app/code/Magento/Braintree/etc/config.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@
4242
<paymentInfoKeys>cc_type,cc_number,avsPostalCodeResponseCode,avsStreetAddressResponseCode,cvvResponseCode,processorAuthorizationCode,processorResponseCode,processorResponseText,liabilityShifted,liabilityShiftPossible,riskDataId,riskDataDecision</paymentInfoKeys>
4343
<avs_ems_adapter>Magento\Braintree\Model\AvsEmsCodeMapper</avs_ems_adapter>
4444
<cvv_ems_adapter>Magento\Braintree\Model\CvvEmsCodeMapper</cvv_ems_adapter>
45+
<group>braintree</group>
4546
</braintree>
4647
<braintree_paypal>
4748
<model>BraintreePayPalFacade</model>
@@ -67,6 +68,7 @@
6768
<privateInfoKeys>processorResponseCode,processorResponseText,paymentId</privateInfoKeys>
6869
<paymentInfoKeys>processorResponseCode,processorResponseText,paymentId,payerEmail</paymentInfoKeys>
6970
<supported_locales>en_US,en_GB,en_AU,da_DK,fr_FR,fr_CA,de_DE,zh_HK,it_IT,nl_NL,no_NO,pl_PL,es_ES,sv_SE,tr_TR,pt_BR,ja_JP,id_ID,ko_KR,pt_PT,ru_RU,th_TH,zh_CN,zh_TW</supported_locales>
71+
<group>braintree</group>
7072
</braintree_paypal>
7173
<braintree_cc_vault>
7274
<model>BraintreeCreditCardVaultFacade</model>
@@ -76,6 +78,7 @@
7678
<tokenFormat>Magento\Braintree\Model\InstantPurchase\CreditCard\TokenFormatter</tokenFormat>
7779
<additionalInformation>Magento\Braintree\Model\InstantPurchase\PaymentAdditionalInformationProvider</additionalInformation>
7880
</instant_purchase>
81+
<group>braintree</group>
7982
</braintree_cc_vault>
8083
<braintree_paypal_vault>
8184
<model>BraintreePayPalVaultFacade</model>
@@ -85,6 +88,7 @@
8588
<tokenFormat>Magento\Braintree\Model\InstantPurchase\PayPal\TokenFormatter</tokenFormat>
8689
<additionalInformation>Magento\Braintree\Model\InstantPurchase\PaymentAdditionalInformationProvider</additionalInformation>
8790
</instant_purchase>
91+
<group>braintree</group>
8892
</braintree_paypal_vault>
8993
</payment>
9094
</default>

‎app/code/Magento/Braintree/etc/payment.xml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
<?xml version="1.0"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
<payment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9+
xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Payment:etc/payment.xsd">
10+
<groups>
11+
<group id="braintree">
12+
<label>Braintree</label>
13+
</group>
14+
</groups>
15+
</payment>

‎app/code/Magento/Catalog/Api/CategoryLinkRepositoryInterface.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,18 +32,20 @@ public function save(\Magento\Catalog\Api\Data\CategoryProductLinkInterface $pro
3232
*
3333
* @throws \Magento\Framework\Exception\CouldNotSaveException
3434
* @throws \Magento\Framework\Exception\StateException
35+
* @throws \Magento\Framework\Exception\InputException
3536
*/
3637
public function delete(\Magento\Catalog\Api\Data\CategoryProductLinkInterface $productLink);
3738

3839
/**
3940
* Remove the product assignment from the category by category id and sku
4041
*
41-
* @param string $sku
42+
* @param string $categoryId
4243
* @param string $sku
4344
* @return bool will returned True if products successfully deleted
4445
*
4546
* @throws \Magento\Framework\Exception\CouldNotSaveException
4647
* @throws \Magento\Framework\Exception\StateException
48+
* @throws \Magento\Framework\Exception\InputException
4749
*/
4850
public function deleteByIds($categoryId, $sku);
4951
}

‎app/code/Magento/Catalog/Model/Layer/Filter/AbstractFilter.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ public function apply(\Magento\Framework\App\RequestInterface $request)
139139
}
140140

141141
/**
142-
* Get fiter items count
142+
* Get filter items count
143143
*
144144
* @return int
145145
*/

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
# Magento_CatalogAnalytics module
22

3-
The Magento_CatalogAnalytics module configures data definitions for a data collection related to the Catalog module entities to be used in [Advanced Reporting](http://devdocs.magento.com/guides/v2.2/advanced-reporting/modules.html).
3+
The Magento_CatalogAnalytics module configures data definitions for a data collection related to the Catalog module entities to be used in [Advanced Reporting](https://devdocs.magento.com/guides/v2.2/advanced-reporting/modules.html).

‎app/code/Magento/Cms/Controller/Adminhtml/Block/Edit.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,11 @@
55
*/
66
namespace Magento\Cms\Controller\Adminhtml\Block;
77

8-
use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
8+
use Magento\Framework\App\Action\HttpGetActionInterface;
99

10+
/**
11+
* Edit CMS block action.
12+
*/
1013
class Edit extends \Magento\Cms\Controller\Adminhtml\Block implements HttpGetActionInterface
1114
{
1215
/**

‎app/code/Magento/Cms/Controller/Adminhtml/Block/Index.php

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
11
<?php
22
/**
3-
*
43
* Copyright © Magento, Inc. All rights reserved.
54
* See COPYING.txt for license details.
65
*/
76
namespace Magento\Cms\Controller\Adminhtml\Block;
87

9-
use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
8+
use Magento\Framework\App\Action\HttpGetActionInterface;
109

10+
/**
11+
* Index action.
12+
*/
1113
class Index extends \Magento\Cms\Controller\Adminhtml\Block implements HttpGetActionInterface
1214
{
1315
/**

‎app/code/Magento/Cms/Controller/Adminhtml/Block/MassDelete.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
*/
77
namespace Magento\Cms\Controller\Adminhtml\Block;
88

9+
use Magento\Framework\App\Action\HttpPostActionInterface;
910
use Magento\Framework\Controller\ResultFactory;
1011
use Magento\Backend\App\Action\Context;
1112
use Magento\Ui\Component\MassAction\Filter;
@@ -14,7 +15,7 @@
1415
/**
1516
* Class MassDelete
1617
*/
17-
class MassDelete extends \Magento\Backend\App\Action
18+
class MassDelete extends \Magento\Backend\App\Action implements HttpPostActionInterface
1819
{
1920
/**
2021
* Authorization level of a basic admin session

‎app/code/Magento/Cms/Controller/Adminhtml/Block/NewAction.php

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
11
<?php
22
/**
3-
*
43
* Copyright © Magento, Inc. All rights reserved.
54
* See COPYING.txt for license details.
65
*/
76
namespace Magento\Cms\Controller\Adminhtml\Block;
87

9-
use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
8+
use Magento\Framework\App\Action\HttpGetActionInterface;
109

10+
/**
11+
* Create CMS block action.
12+
*/
1113
class NewAction extends \Magento\Cms\Controller\Adminhtml\Block implements HttpGetActionInterface
1214
{
1315
/**

‎app/code/Magento/Cms/Controller/Adminhtml/Block/Save.php

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
<?php
22
/**
3-
*
43
* Copyright © Magento, Inc. All rights reserved.
54
* See COPYING.txt for license details.
65
*/
76
namespace Magento\Cms\Controller\Adminhtml\Block;
87

9-
use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
8+
use Magento\Framework\App\Action\HttpPostActionInterface;
109
use Magento\Backend\App\Action\Context;
1110
use Magento\Cms\Api\BlockRepositoryInterface;
1211
use Magento\Cms\Model\Block;
@@ -15,6 +14,9 @@
1514
use Magento\Framework\Exception\LocalizedException;
1615
use Magento\Framework\Registry;
1716

17+
/**
18+
* Save CMS block action.
19+
*/
1820
class Save extends \Magento\Cms\Controller\Adminhtml\Block implements HttpPostActionInterface
1921
{
2022
/**

‎app/code/Magento/Cms/Controller/Adminhtml/Page/Delete.php

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,16 @@
11
<?php
22
/**
3-
*
43
* Copyright © Magento, Inc. All rights reserved.
54
* See COPYING.txt for license details.
65
*/
76
namespace Magento\Cms\Controller\Adminhtml\Page;
87

9-
class Delete extends \Magento\Backend\App\Action
8+
use Magento\Framework\App\Action\HttpPostActionInterface;
9+
10+
/**
11+
* Delete CMS page action.
12+
*/
13+
class Delete extends \Magento\Backend\App\Action implements HttpPostActionInterface
1014
{
1115
/**
1216
* Authorization level of a basic admin session

‎app/code/Magento/Cms/Controller/Adminhtml/Page/Edit.php

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
11
<?php
22
/**
3-
*
43
* Copyright © Magento, Inc. All rights reserved.
54
* See COPYING.txt for license details.
65
*/
76
namespace Magento\Cms\Controller\Adminhtml\Page;
87

9-
use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
8+
use Magento\Framework\App\Action\HttpGetActionInterface;
109
use Magento\Backend\App\Action;
1110

11+
/**
12+
* Edit CMS page action.
13+
*/
1214
class Edit extends \Magento\Backend\App\Action implements HttpGetActionInterface
1315
{
1416
/**

‎app/code/Magento/Cms/Controller/Adminhtml/Page/Index.php

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,17 @@
11
<?php
22
/**
3-
*
43
* Copyright © Magento, Inc. All rights reserved.
54
* See COPYING.txt for license details.
65
*/
76
namespace Magento\Cms\Controller\Adminhtml\Page;
87

9-
use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
8+
use Magento\Framework\App\Action\HttpGetActionInterface;
109
use Magento\Backend\App\Action\Context;
1110
use Magento\Framework\View\Result\PageFactory;
1211

12+
/**
13+
* Index action.
14+
*/
1315
class Index extends \Magento\Backend\App\Action implements HttpGetActionInterface
1416
{
1517
/**

‎app/code/Magento/Cms/Controller/Adminhtml/Page/MassDelete.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
*/
66
namespace Magento\Cms\Controller\Adminhtml\Page;
77

8+
use Magento\Framework\App\Action\HttpPostActionInterface;
89
use Magento\Framework\Controller\ResultFactory;
910
use Magento\Backend\App\Action\Context;
1011
use Magento\Ui\Component\MassAction\Filter;
@@ -13,7 +14,7 @@
1314
/**
1415
* Class MassDelete
1516
*/
16-
class MassDelete extends \Magento\Backend\App\Action
17+
class MassDelete extends \Magento\Backend\App\Action implements HttpPostActionInterface
1718
{
1819
/**
1920
* Authorization level of a basic admin session

‎app/code/Magento/Cms/Controller/Adminhtml/Page/MassDisable.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
*/
66
namespace Magento\Cms\Controller\Adminhtml\Page;
77

8-
use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
8+
use Magento\Framework\App\Action\HttpPostActionInterface;
99
use Magento\Framework\Controller\ResultFactory;
1010
use Magento\Backend\App\Action\Context;
1111
use Magento\Ui\Component\MassAction\Filter;

‎app/code/Magento/Cms/Controller/Adminhtml/Page/MassEnable.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
*/
66
namespace Magento\Cms\Controller\Adminhtml\Page;
77

8+
use Magento\Framework\App\Action\HttpPostActionInterface;
89
use Magento\Framework\Controller\ResultFactory;
910
use Magento\Backend\App\Action\Context;
1011
use Magento\Ui\Component\MassAction\Filter;
@@ -13,7 +14,7 @@
1314
/**
1415
* Class MassEnable
1516
*/
16-
class MassEnable extends \Magento\Backend\App\Action
17+
class MassEnable extends \Magento\Backend\App\Action implements HttpPostActionInterface
1718
{
1819
/**
1920
* Authorization level of a basic admin session

‎app/code/Magento/Cms/Controller/Adminhtml/Page/NewAction.php

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,12 @@
66
*/
77
namespace Magento\Cms\Controller\Adminhtml\Page;
88

9-
class NewAction extends \Magento\Backend\App\Action
9+
use Magento\Framework\App\Action\HttpGetActionInterface;
10+
11+
/**
12+
* Create CMS page action.
13+
*/
14+
class NewAction extends \Magento\Backend\App\Action implements HttpGetActionInterface
1015
{
1116
/**
1217
* Authorization level of a basic admin session

‎app/code/Magento/Cms/Controller/Adminhtml/Page/Save.php

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,19 @@
11
<?php
22
/**
3-
*
43
* Copyright © Magento, Inc. All rights reserved.
54
* See COPYING.txt for license details.
65
*/
76
namespace Magento\Cms\Controller\Adminhtml\Page;
87

9-
use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
8+
use Magento\Framework\App\Action\HttpPostActionInterface;
109
use Magento\Backend\App\Action;
1110
use Magento\Cms\Model\Page;
1211
use Magento\Framework\App\Request\DataPersistorInterface;
1312
use Magento\Framework\Exception\LocalizedException;
1413

14+
/**
15+
* Save CMS page action.
16+
*/
1517
class Save extends \Magento\Backend\App\Action implements HttpPostActionInterface
1618
{
1719
/**

0 commit comments

Comments
 (0)