Skip to content

Commit

Permalink
Merge remote-tracking branches 'helix/MAGETWO-94671', 'performance/MA…
Browse files Browse the repository at this point in the history
…GETWO-91388' and 'helix/MAGETWO-95412' into pr-2.3-develop
  • Loading branch information
duhon committed Oct 12, 2018
3 parents defec8b + 171c653 + a092204 commit 6059152
Show file tree
Hide file tree
Showing 854 changed files with 13,034 additions and 3,607 deletions.
9 changes: 5 additions & 4 deletions .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,20 @@
- Information on your environment,
- Steps to reproduce,
- Expected and actual results,
Fields marked with (*) are required. Please don't remove the template.
Please also have a look at our guidelines article before adding a new issue https://github.com/magento/magento2/wiki/Issue-reporting-guidelines
-->

### Preconditions
### Preconditions (*)
<!---
Please provide as detailed information about your environment as possible.
For example Magento version, tag, HEAD, PHP & MySQL version, etc..
-->
1.
2.

### Steps to reproduce
### Steps to reproduce (*)
<!---
It is important to provide a set of clear steps to reproduce this bug.
If relevant please include code samples
Expand All @@ -26,10 +27,10 @@
2.
3.

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

### Actual result
### Actual result (*)
<!--- Tell us what happens instead -->
1. [Screenshots, logs or description]
9 changes: 5 additions & 4 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,28 +6,29 @@ about: Technical issue with the Magento 2 core components

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

### Preconditions
### Preconditions (*)
<!---
Provide the exact Magento version (example: 2.2.5) and any important information on the environment where bug is reproducible.
-->
1.
2.

### Steps to reproduce
### Steps to reproduce (*)
<!---
Important: Provide a set of clear steps to reproduce this bug. We can not provide support without clear instructions on how to reproduce.
-->
1.
2.

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

### Actual result
### Actual result (*)
<!--- Tell us what happened instead. Include error messages and issues. -->
1. [Screenshots, logs or description]
2.
5 changes: 3 additions & 2 deletions .github/ISSUE_TEMPLATE/developer-experience-issue.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,13 @@ about: Issues related to customization, extensibility, modularity

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

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

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

### Proposed solution
Expand Down
6 changes: 3 additions & 3 deletions .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ about: Please consider reporting directly to https://github.com/magento/communit
---

<!---
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.
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.
-->

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

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

### Benefits
Expand Down
9 changes: 5 additions & 4 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,13 @@
To help us process this pull request we recommend that you add the following information:
- Summary of the pull request,
- Issue(s) related to the changes made,
- Manual testing scenarios,
- Manual testing scenarios
Fields marked with (*) are required. Please don't remove the template.
-->

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

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

### Manual testing scenarios
### Manual testing scenarios (*)
<!---
Please provide a set of unambiguous steps to test the proposed code change.
Giving us manual testing scenarios will help with the processing and validation process.
-->
1. ...
2. ...

### Contribution checklist
### Contribution checklist (*)
- [ ] Pull request has a meaningful description of its purpose
- [ ] All commits are accompanied by meaningful commit messages
- [ ] All new or changed code is covered with unit/integration tests (if applicable)
Expand Down
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
2.3.0
=============
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)

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

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

## Install Magento
To install Magento, see either:

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

<h2>Contributing to the Magento 2 code base</h2>
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.
Expand Down Expand Up @@ -41,20 +40,8 @@ Magento is thankful for any contribution that can improve our code base, documen
</a>

<h3>Labels applied by the Magento team</h3>

| Label | Description |
| ------------- |-------------|
| ![DOC](http://devdocs.magento.com/common/images/github_DOC.png) | Affects Documentation domain. |
| ![PROD](http://devdocs.magento.com/common/images/github_PROD.png) | Affects the Product team (mostly feature requests or business logic change). |
| ![TECH](http://devdocs.magento.com/common/images/github_TECH.png) | Affects Architect Group (mostly to make decisions around technology changes). |
| ![accept](http://devdocs.magento.com/common/images/github_accept.png) | The pull request has been accepted and will be merged into mainline code. |
| ![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. |
| ![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. |
| ![acknowledged](http://devdocs.magento.com/common/images/gitHub_acknowledged.png) | The Magento Team has validated the issue and an internal ticket has been created. |
| ![in progress](http://devdocs.magento.com/common/images/github_inProgress.png) | The internal ticket is currently in progress, fix is scheduled to be delivered. |
| ![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. |

To learn more about issue gate labels click [here](https://github.com/magento/magento2/wiki/Magento-Issue-Gates)
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.
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.

<h2>Reporting security issues</h2>

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

<h2>License</h2>

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

http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
Please see LICENSE.txt for the full text of the OSL 3.0 license or contact license@magentocommerce.com for a copy.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,9 @@
*/
namespace Magento\AdminNotification\Controller\Adminhtml\Notification;

class Index extends \Magento\AdminNotification\Controller\Adminhtml\Notification
use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;

class Index extends \Magento\AdminNotification\Controller\Adminhtml\Notification implements HttpGetActionInterface
{
/**
* @return void
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,14 @@
*/
namespace Magento\AdvancedPricingImportExport\Controller\Adminhtml\Export;

use Magento\Framework\App\Action\HttpGetActionInterface;
use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
use Magento\ImportExport\Controller\Adminhtml\Export as ExportController;
use Magento\Framework\Controller\ResultFactory;
use Magento\AdvancedPricingImportExport\Model\Export\AdvancedPricing as ExportAdvancedPricing;
use Magento\Catalog\Model\Product as CatalogProduct;

class GetFilter extends ExportController
class GetFilter extends ExportController implements HttpGetActionInterface, HttpPostActionInterface
{
/**
* Get grid-filter of entity attributes action.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,15 @@
*/
namespace Magento\Analytics\Controller\Adminhtml\BIEssentials;

use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
use Magento\Backend\App\Action;
use Magento\Backend\App\Action\Context;
use Magento\Framework\App\Config\ScopeConfigInterface;

/**
* Provides link to BI Essentials signup
*/
class SignUp extends Action
class SignUp extends Action implements HttpGetActionInterface
{
/**
* Path to config value with URL to BI Essentials sign-up page.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
*/
namespace Magento\Analytics\Controller\Adminhtml\Reports;

use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
use Magento\Analytics\Model\Exception\State\SubscriptionUpdateException;
use Magento\Analytics\Model\ReportUrlProvider;
use Magento\Backend\App\Action;
Expand All @@ -16,7 +17,7 @@
/**
* Provide redirect to resource with reports.
*/
class Show extends Action
class Show extends Action implements HttpGetActionInterface
{
/**
* @var ReportUrlProvider
Expand Down
33 changes: 25 additions & 8 deletions app/code/Magento/Analytics/ReportXml/DB/SelectBuilder.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@

/**
* Responsible for Select object creation, works as a builder. Returns Select as result;
*
* Used in SQL assemblers.
*/
class SelectBuilder
Expand Down Expand Up @@ -85,11 +86,13 @@ public function getJoins()
* Set joins conditions
*
* @param array $joins
* @return void
* @return $this
*/
public function setJoins($joins)
{
$this->joins = $joins;

return $this;
}

/**
Expand All @@ -106,11 +109,13 @@ public function getConnectionName()
* Set connection name
*
* @param string $connectionName
* @return void
* @return $this
*/
public function setConnectionName($connectionName)
{
$this->connectionName = $connectionName;

return $this;
}

/**
Expand All @@ -127,11 +132,13 @@ public function getColumns()
* Set columns
*
* @param array $columns
* @return void
* @return $this
*/
public function setColumns($columns)
{
$this->columns = $columns;

return $this;
}

/**
Expand All @@ -148,11 +155,13 @@ public function getFilters()
* Set filters
*
* @param array $filters
* @return void
* @return $this
*/
public function setFilters($filters)
{
$this->filters = $filters;

return $this;
}

/**
Expand All @@ -169,11 +178,13 @@ public function getFrom()
* Set from condition
*
* @param array $from
* @return void
* @return $this
*/
public function setFrom($from)
{
$this->from = $from;

return $this;
}

/**
Expand Down Expand Up @@ -236,11 +247,13 @@ public function getGroup()
* Set group
*
* @param array $group
* @return void
* @return $this
*/
public function setGroup($group)
{
$this->group = $group;

return $this;
}

/**
Expand All @@ -257,11 +270,13 @@ public function getParams()
* Set parameters
*
* @param array $params
* @return void
* @return $this
*/
public function setParams($params)
{
$this->params = $params;

return $this;
}

/**
Expand All @@ -278,10 +293,12 @@ public function getHaving()
* Set having condition
*
* @param array $having
* @return void
* @return $this
*/
public function setHaving($having)
{
$this->having = $having;

return $this;
}
}
Loading

0 comments on commit 6059152

Please sign in to comment.