Skip to content
This repository was archived by the owner on Apr 29, 2019. It is now read-only.

Commit 6059152

Browse files
committed
Merge remote-tracking branches 'helix/MAGETWO-94671', 'performance/MAGETWO-91388' and 'helix/MAGETWO-95412' into pr-2.3-develop
3 parents defec8b + 171c653 + a092204 commit 6059152

File tree

854 files changed

+13034
-3607
lines changed

Some content is hidden

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

854 files changed

+13034
-3607
lines changed

.github/ISSUE_TEMPLATE.md

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,20 @@
55
- Information on your environment,
66
- Steps to reproduce,
77
- Expected and actual results,
8+
Fields marked with (*) are required. Please don't remove the template.
89
910
Please also have a look at our guidelines article before adding a new issue https://github.com/magento/magento2/wiki/Issue-reporting-guidelines
1011
-->
1112

12-
### Preconditions
13+
### Preconditions (*)
1314
<!---
1415
Please provide as detailed information about your environment as possible.
1516
For example Magento version, tag, HEAD, PHP & MySQL version, etc..
1617
-->
1718
1.
1819
2.
1920

20-
### Steps to reproduce
21+
### Steps to reproduce (*)
2122
<!---
2223
It is important to provide a set of clear steps to reproduce this bug.
2324
If relevant please include code samples
@@ -26,10 +27,10 @@
2627
2.
2728
3.
2829

29-
### Expected result
30+
### Expected result (*)
3031
<!--- Tell us what should happen -->
3132
1. [Screenshots, logs or description]
3233

33-
### Actual result
34+
### Actual result (*)
3435
<!--- Tell us what happens instead -->
3536
1. [Screenshots, logs or description]

.github/ISSUE_TEMPLATE/bug_report.md

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,28 +6,29 @@ about: Technical issue with the Magento 2 core components
66

77
<!---
88
Please review our guidelines before adding a new issue: https://github.com/magento/magento2/wiki/Issue-reporting-guidelines
9+
Fields marked with (*) are required. Please don't remove the template.
910
-->
1011

11-
### Preconditions
12+
### Preconditions (*)
1213
<!---
1314
Provide the exact Magento version (example: 2.2.5) and any important information on the environment where bug is reproducible.
1415
-->
1516
1.
1617
2.
1718

18-
### Steps to reproduce
19+
### Steps to reproduce (*)
1920
<!---
2021
Important: Provide a set of clear steps to reproduce this bug. We can not provide support without clear instructions on how to reproduce.
2122
-->
2223
1.
2324
2.
2425

25-
### Expected result
26+
### Expected result (*)
2627
<!--- Tell us what do you expect to happen. -->
2728
1. [Screenshots, logs or description]
2829
2.
2930

30-
### Actual result
31+
### Actual result (*)
3132
<!--- Tell us what happened instead. Include error messages and issues. -->
3233
1. [Screenshots, logs or description]
3334
2.

.github/ISSUE_TEMPLATE/developer-experience-issue.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,13 @@ about: Issues related to customization, extensibility, modularity
66

77
<!---
88
Please review our guidelines before adding a new issue: https://github.com/magento/magento2/wiki/Issue-reporting-guidelines
9+
Fields marked with (*) are required. Please don't remove the template.
910
-->
1011

11-
### Summary
12+
### Summary (*)
1213
<!--- Describe the issue you are experiencing. Include general information, error messages, environments, and so on. -->
1314

14-
### Examples
15+
### Examples (*)
1516
<!--- Provide code examples or a patch with a test (recommended) to clearly indicate the problem. -->
1617

1718
### Proposed solution

.github/ISSUE_TEMPLATE/feature_request.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@ about: Please consider reporting directly to https://github.com/magento/communit
55
---
66

77
<!---
8-
Important: This repository is intended only for Magento 2 Technical Issues. Enter Feature Requests at https://github.com/magento/community-features. Project stakeholders monitor and manage requests. Feature requests entered using this form may be moved to the forum.
8+
Important: This repository is intended only for Magento 2 Technical Issues. Enter Feature Requests at https://github.com/magento/community-features. Project stakeholders monitor and manage requests. Feature requests entered using this form may be moved to the forum. Fields marked with (*) are required. Please don't remove the template.
99
-->
1010

11-
### Description
11+
### Description (*)
1212
<!--- Describe the feature you would like to add. -->
1313

14-
### Expected behavior
14+
### Expected behavior (*)
1515
<!--- What is the expected behavior of this feature? How is it going to work? -->
1616

1717
### Benefits

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,13 @@
33
To help us process this pull request we recommend that you add the following information:
44
- Summary of the pull request,
55
- Issue(s) related to the changes made,
6-
- Manual testing scenarios,
6+
- Manual testing scenarios
7+
Fields marked with (*) are required. Please don't remove the template.
78
-->
89

910
<!--- Please provide a general summary of the Pull Request in the Title above -->
1011

11-
### Description
12+
### Description (*)
1213
<!---
1314
Please provide a description of the changes proposed in the pull request.
1415
Letting us know what has changed and why it needed changing will help us validate this pull request.
@@ -22,15 +23,15 @@
2223
1. magento/magento2#<issue_number>: Issue title
2324
2. ...
2425

25-
### Manual testing scenarios
26+
### Manual testing scenarios (*)
2627
<!---
2728
Please provide a set of unambiguous steps to test the proposed code change.
2829
Giving us manual testing scenarios will help with the processing and validation process.
2930
-->
3031
1. ...
3132
2. ...
3233

33-
### Contribution checklist
34+
### Contribution checklist (*)
3435
- [ ] Pull request has a meaningful description of its purpose
3536
- [ ] All commits are accompanied by meaningful commit messages
3637
- [ ] All new or changed code is covered with unit/integration tests (if applicable)

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: 6 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,16 @@
11
[![Build Status](https://travis-ci.org/magento/magento2.svg?branch=2.3-develop)](https://travis-ci.org/magento/magento2)
22
[![Open Source Helpers](https://www.codetriage.com/magento/magento2/badges/users.svg)](https://www.codetriage.com/magento/magento2)
33
[![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/magento/magento2?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
4-
[![Crowdin](https://d322cqt584bo4o.cloudfront.net/magento-2/localized.png)](https://crowdin.com/project/magento-2)
4+
[![Crowdin](https://d322cqt584bo4o.cloudfront.net/magento-2/localized.svg)](https://crowdin.com/project/magento-2)
55
<h2>Welcome</h2>
66
Welcome to Magento 2 installation! We're glad you chose to install Magento 2, a cutting-edge, feature-rich eCommerce solution that gets results.
77

88
## Magento system requirements
9-
[Magento system requirements](http://devdocs.magento.com/guides/v2.3/install-gde/system-requirements2.html)
9+
[Magento system requirements](http://devdocs.magento.com/guides/v2.3/install-gde/system-requirements2.html).
1010

1111
## Install Magento
12-
To install Magento, see either:
1312

14-
* [Installation guide](http://devdocs.magento.com/guides/v2.3/install-gde/bk-install-guide.html)
13+
* [Installation guide](http://devdocs.magento.com/guides/v2.3/install-gde/bk-install-guide.html).
1514

1615
<h2>Contributing to the Magento 2 code base</h2>
1716
Contributions can take the form of new components or features, changes to existing features, tests, documentation (such as developer guides, user guides, examples, or specifications), bug fixes, optimizations, or just good suggestions.
@@ -41,20 +40,8 @@ Magento is thankful for any contribution that can improve our code base, documen
4140
</a>
4241

4342
<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)
43+
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.
44+
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.
5845

5946
<h2>Reporting security issues</h2>
6047

@@ -64,7 +51,7 @@ Stay up-to-date on the latest security news and patches for Magento by signing u
6451

6552
<h2>License</h2>
6653

67-
Each Magento source file included in this distribution is licensed under OSL 3.0 or the Magento Enterprise Edition (MEE) license
54+
Each Magento source file included in this distribution is licensed under OSL 3.0 or the Magento Enterprise Edition (MEE) license.
6855

6956
http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
7057
Please see LICENSE.txt for the full text of the OSL 3.0 license or contact [email protected] for a copy.

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/Analytics/ReportXml/DB/SelectBuilder.php

Lines changed: 25 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111

1212
/**
1313
* Responsible for Select object creation, works as a builder. Returns Select as result;
14+
*
1415
* Used in SQL assemblers.
1516
*/
1617
class SelectBuilder
@@ -85,11 +86,13 @@ public function getJoins()
8586
* Set joins conditions
8687
*
8788
* @param array $joins
88-
* @return void
89+
* @return $this
8990
*/
9091
public function setJoins($joins)
9192
{
9293
$this->joins = $joins;
94+
95+
return $this;
9396
}
9497

9598
/**
@@ -106,11 +109,13 @@ public function getConnectionName()
106109
* Set connection name
107110
*
108111
* @param string $connectionName
109-
* @return void
112+
* @return $this
110113
*/
111114
public function setConnectionName($connectionName)
112115
{
113116
$this->connectionName = $connectionName;
117+
118+
return $this;
114119
}
115120

116121
/**
@@ -127,11 +132,13 @@ public function getColumns()
127132
* Set columns
128133
*
129134
* @param array $columns
130-
* @return void
135+
* @return $this
131136
*/
132137
public function setColumns($columns)
133138
{
134139
$this->columns = $columns;
140+
141+
return $this;
135142
}
136143

137144
/**
@@ -148,11 +155,13 @@ public function getFilters()
148155
* Set filters
149156
*
150157
* @param array $filters
151-
* @return void
158+
* @return $this
152159
*/
153160
public function setFilters($filters)
154161
{
155162
$this->filters = $filters;
163+
164+
return $this;
156165
}
157166

158167
/**
@@ -169,11 +178,13 @@ public function getFrom()
169178
* Set from condition
170179
*
171180
* @param array $from
172-
* @return void
181+
* @return $this
173182
*/
174183
public function setFrom($from)
175184
{
176185
$this->from = $from;
186+
187+
return $this;
177188
}
178189

179190
/**
@@ -236,11 +247,13 @@ public function getGroup()
236247
* Set group
237248
*
238249
* @param array $group
239-
* @return void
250+
* @return $this
240251
*/
241252
public function setGroup($group)
242253
{
243254
$this->group = $group;
255+
256+
return $this;
244257
}
245258

246259
/**
@@ -257,11 +270,13 @@ public function getParams()
257270
* Set parameters
258271
*
259272
* @param array $params
260-
* @return void
273+
* @return $this
261274
*/
262275
public function setParams($params)
263276
{
264277
$this->params = $params;
278+
279+
return $this;
265280
}
266281

267282
/**
@@ -278,10 +293,12 @@ public function getHaving()
278293
* Set having condition
279294
*
280295
* @param array $having
281-
* @return void
296+
* @return $this
282297
*/
283298
public function setHaving($having)
284299
{
285300
$this->having = $having;
301+
302+
return $this;
286303
}
287304
}

0 commit comments

Comments
 (0)