Skip to content

Commit f141a0d

Browse files
committed
Merge branch '2.3-develop' into product-url-rewrites
# Conflicts: # app/code/Magento/UrlRewriteGraphQl/Model/Resolver/UrlRewrite.php # app/code/Magento/UrlRewriteGraphQl/etc/schema.graphqls
2 parents 1700740 + 76e18b9 commit f141a0d

File tree

552 files changed

+5121
-1567
lines changed

Some content is hidden

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

552 files changed

+5121
-1567
lines changed

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
2.3.0
2+
=============
3+
To get detailed information about changes in Magento 2.3.0, see the [Release Notes](https://devdocs.magento.com/guides/v2.3/release-notes/bk-release-notes.html)
4+
15
2.1.0
26
=============
37
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")

README.md

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -41,20 +41,8 @@ Magento is thankful for any contribution that can improve our code base, documen
4141
</a>
4242

4343
<h3>Labels applied by the Magento team</h3>
44-
45-
| Label | Description |
46-
| ------------- |-------------|
47-
| ![DOC](http://devdocs.magento.com/common/images/github_DOC.png) | Affects Documentation domain. |
48-
| ![PROD](http://devdocs.magento.com/common/images/github_PROD.png) | Affects the Product team (mostly feature requests or business logic change). |
49-
| ![TECH](http://devdocs.magento.com/common/images/github_TECH.png) | Affects Architect Group (mostly to make decisions around technology changes). |
50-
| ![accept](http://devdocs.magento.com/common/images/github_accept.png) | The pull request has been accepted and will be merged into mainline code. |
51-
| ![reject](http://devdocs.magento.com/common/images/github_reject.png) | The pull request has been rejected and will not be merged into mainline code. Possible reasons can include but are not limited to: issue has already been fixed in another code contribution, or there is an issue with the code contribution. |
52-
| ![bug report](http://devdocs.magento.com/common/images/github_bug.png) | The Magento Team has confirmed that this issue contains the minimum required information to reproduce. |
53-
| ![acknowledged](http://devdocs.magento.com/common/images/gitHub_acknowledged.png) | The Magento Team has validated the issue and an internal ticket has been created. |
54-
| ![in progress](http://devdocs.magento.com/common/images/github_inProgress.png) | The internal ticket is currently in progress, fix is scheduled to be delivered. |
55-
| ![needs update](http://devdocs.magento.com/common/images/github_needsUpdate.png) | The Magento Team needs additional information from the reporter to properly prioritize and process the issue or pull request. |
56-
57-
To learn more about issue gate labels click [here](https://github.com/magento/magento2/wiki/Magento-Issue-Gates)
44+
We apply labels to public Pull Requests and Issues to help other participants retrieve additional information about current progress, component assignments, Magento release lines, and much more.
45+
Please review the <a href="https://devdocs.magento.com/guides/v2.3/contributor-guide/contributing.html#labels">Code Contributions guide</a> for detailed information on labels used in Magento 2 repositories.
5846

5947
<h2>Reporting security issues</h2>
6048

app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/Index.php

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

9-
class Index extends \Magento\AdminNotification\Controller\Adminhtml\Notification
9+
use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
10+
11+
class Index extends \Magento\AdminNotification\Controller\Adminhtml\Notification implements HttpGetActionInterface
1012
{
1113
/**
1214
* @return void

app/code/Magento/AdvancedPricingImportExport/Controller/Adminhtml/Export/GetFilter.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,14 @@
55
*/
66
namespace Magento\AdvancedPricingImportExport\Controller\Adminhtml\Export;
77

8+
use Magento\Framework\App\Action\HttpGetActionInterface;
9+
use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
810
use Magento\ImportExport\Controller\Adminhtml\Export as ExportController;
911
use Magento\Framework\Controller\ResultFactory;
1012
use Magento\AdvancedPricingImportExport\Model\Export\AdvancedPricing as ExportAdvancedPricing;
1113
use Magento\Catalog\Model\Product as CatalogProduct;
1214

13-
class GetFilter extends ExportController
15+
class GetFilter extends ExportController implements HttpGetActionInterface, HttpPostActionInterface
1416
{
1517
/**
1618
* Get grid-filter of entity attributes action.

app/code/Magento/Analytics/Controller/Adminhtml/BIEssentials/SignUp.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,15 @@
55
*/
66
namespace Magento\Analytics\Controller\Adminhtml\BIEssentials;
77

8+
use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
89
use Magento\Backend\App\Action;
910
use Magento\Backend\App\Action\Context;
1011
use Magento\Framework\App\Config\ScopeConfigInterface;
1112

1213
/**
1314
* Provides link to BI Essentials signup
1415
*/
15-
class SignUp extends Action
16+
class SignUp extends Action implements HttpGetActionInterface
1617
{
1718
/**
1819
* Path to config value with URL to BI Essentials sign-up page.

app/code/Magento/Analytics/Controller/Adminhtml/Reports/Show.php

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

8+
use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
89
use Magento\Analytics\Model\Exception\State\SubscriptionUpdateException;
910
use Magento\Analytics\Model\ReportUrlProvider;
1011
use Magento\Backend\App\Action;
@@ -16,7 +17,7 @@
1617
/**
1718
* Provide redirect to resource with reports.
1819
*/
19-
class Show extends Action
20+
class Show extends Action implements HttpGetActionInterface
2021
{
2122
/**
2223
* @var ReportUrlProvider

app/code/Magento/Authorizenet/Controller/Directpost/Payment/Place.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66

77
namespace Magento\Authorizenet\Controller\Directpost\Payment;
88

9+
use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
910
use Magento\Authorizenet\Controller\Directpost\Payment;
1011
use Magento\Authorizenet\Helper\DataFactory;
1112
use Magento\Checkout\Model\Type\Onepage;
@@ -25,7 +26,7 @@
2526
*
2627
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
2728
*/
28-
class Place extends Payment
29+
class Place extends Payment implements HttpPostActionInterface
2930
{
3031
/**
3132
* @var \Magento\Quote\Api\CartManagementInterface

app/code/Magento/Backend/Block/Widget/Button/ButtonList.php

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77
namespace Magento\Backend\Block\Widget\Button;
88

99
/**
10+
* Button list widget
11+
*
1012
* @api
1113
* @since 100.0.2
1214
*/
@@ -127,12 +129,6 @@ public function getItems()
127129
*/
128130
public function sortButtons(Item $itemA, Item $itemB)
129131
{
130-
$sortOrderA = (int) $itemA->getSortOrder();
131-
$sortOrderB = (int) $itemB->getSortOrder();
132-
133-
if ($sortOrderA == $sortOrderB) {
134-
return 0;
135-
}
136-
return ($sortOrderA < $sortOrderB) ? -1 : 1;
132+
return (int)$itemA->getSortOrder() <=> (int)$itemB->getSortOrder();
137133
}
138134
}

app/code/Magento/Backend/Block/Widget/Form/Container.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ protected function _construct()
9393
'class' => 'delete',
9494
'onclick' => 'deleteConfirm(\'' . __(
9595
'Are you sure you want to do this?'
96-
) . '\', \'' . $this->getDeleteUrl() . '\')'
96+
) . '\', \'' . $this->getDeleteUrl() . '\', {data: {}})'
9797
]
9898
);
9999
}

app/code/Magento/Backend/Controller/Adminhtml/Auth/DeniedJson.php

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

9-
class DeniedJson extends \Magento\Backend\Controller\Adminhtml\Auth
9+
use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
10+
11+
class DeniedJson extends \Magento\Backend\Controller\Adminhtml\Auth implements HttpGetActionInterface
1012
{
1113
/**
1214
* @var \Magento\Framework\Controller\Result\JsonFactory

0 commit comments

Comments
 (0)