Skip to content

Commit 2fb8f2a

Browse files
fswfsw
authored
Merge pull request #2 from magento/2.3-develop
upstream
2 parents 911f460 + 908a6bb commit 2fb8f2a

File tree

13,047 files changed

+522514
-183260
lines changed

Some content is hidden

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

13,047 files changed

+522514
-183260
lines changed

‎.github/CONTRIBUTING.md

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,34 @@
11
# Contributing to Magento 2 code
22

33
Contributions to the Magento 2 codebase are done using the fork & pull model.
4-
This contribution model has contributors maintaining their own copy of the forked codebase (which can easily be synced with the main copy). The forked repository is then used to submit a request to the base repository to “pull” a set of changes (hence the phrase “pull request”).
4+
This contribution model has contributors maintaining their own copy of the forked codebase (which can easily be synced with the main copy). The forked repository is then used to submit a request to the base repository to “pull” a set of changes. For more information on pull requests please refer to [GitHub Help](https://help.github.com/articles/about-pull-requests/).
55

6-
Contributions can take the form of new components/features, changes to existing features, tests, documentation (such as developer guides, user guides, examples, or specifications), bug fixes, optimizations or just good suggestions.
6+
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 or optimizations.
77

8-
The Magento 2 development team will review all issues and contributions submitted by the community of developers in the first in, first out order. During the review we might require clarifications from the contributor. If there is no response from the contributor for two weeks, the issue is closed.
8+
The Magento 2 development team will review all issues and contributions submitted by the community of developers in the first in, first out order. During the review we might require clarifications from the contributor. If there is no response from the contributor within two weeks, the pull request will be closed.
99

1010

1111
## Contribution requirements
1212

13-
1. Contributions must adhere to [Magento coding standards](http://devdocs.magento.com/guides/v2.0/coding-standards/bk-coding-standards.html).
14-
2. Pull requests (PRs) must be accompanied by a meaningful description of their purpose. Comprehensive descriptions increase the chances of a pull request to be merged quickly and without additional clarification requests.
15-
3. Commits must be accompanied by meaningful commit messages.
16-
4. PRs which include bug fixing, must be accompanied with step-by-step description of how to reproduce the bug.
13+
1. Contributions must adhere to the [Magento coding standards](https://devdocs.magento.com/guides/v2.2/coding-standards/bk-coding-standards.html).
14+
2. Pull requests (PRs) must be accompanied by a meaningful description of their purpose. Comprehensive descriptions increase the chances of a pull request being merged quickly and without additional clarification requests.
15+
3. Commits must be accompanied by meaningful commit messages. Please see the [Magento Pull Request Template](https://github.com/magento/magento2/blob/2.2-develop/.github/PULL_REQUEST_TEMPLATE.md) for more information.
16+
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:
18-
* Unit/integration test coverage (we will be releasing more information on writing test coverage in the near future).
19-
* Proposed [documentation](http://devdocs.magento.com) update. Documentation contributions can be submitted [here](https://github.com/magento/devdocs).
20-
4. For large features or changes, please [open an issue](https://github.com/magento/magento2/issues) and discuss first. This may prevent duplicate or unnecessary effort, and it may gain you some additional contributors.
21-
5. All automated tests are passed successfully (all builds on [Travis CI](https://travis-ci.org/magento/magento2) must be green).
18+
* 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).
20+
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.
21+
5. All automated tests must pass (all builds on [Travis CI](https://travis-ci.org/magento/magento2) must be green).
2222

2323
## Contribution process
2424

25-
If you are a new GitHub user, we recommend that you create your own [free github account](https://github.com/signup/free). By doing that, you will be able to collaborate with the Magento 2 development team, “fork” the Magento 2 project and be able to easily send “pull requests”.
25+
If you are a new GitHub user, we recommend that you create your own [free github account](https://github.com/signup/free). This will allow you to collaborate with the Magento 2 development team, fork the Magento 2 project and send pull requests.
2626

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 [Fork a repository instructions](http://devdocs.magento.com/guides/v2.0/contributor-guide/contributing.html#fork) and when you are ready to send us a pull request – follow [Create a pull request instructions](http://devdocs.magento.com/guides/v2.0/contributor-guide/contributing.html#pull_request).
31-
5. Once your contribution is received, Magento 2 development team will review the contribution and collaborate with you as needed to improve the quality of the contribution.
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).
31+
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
3434

‎.github/ISSUE_TEMPLATE.md

Lines changed: 25 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,36 @@
1-
<!--- Provide a general summary of the issue in the Title above -->
2-
<!--- Before adding new issues, please, check this article https://github.com/magento/magento2/wiki/Issue-reporting-guidelines-->
1+
<!---
2+
Thank you for contributing to Magento.
3+
To help us process this issue we recommend that you add the following information:
4+
- Summary of the issue,
5+
- Information on your environment,
6+
- Steps to reproduce,
7+
- Expected and actual results,
8+
Fields marked with (*) are required. Please don't remove the template.
39
4-
### Preconditions
5-
<!--- Provide a more detailed information of environment you use -->
6-
<!--- Magento version, tag, HEAD, etc., PHP & MySQL version, etc.. -->
10+
Please also have a look at our guidelines article before adding a new issue https://github.com/magento/magento2/wiki/Issue-reporting-guidelines
11+
-->
12+
13+
### Preconditions (*)
14+
<!---
15+
Please provide as detailed information about your environment as possible.
16+
For example Magento version, tag, HEAD, PHP & MySQL version, etc..
17+
-->
718
1.
819
2.
920

10-
### Steps to reproduce
11-
<!--- Provide a set of unambiguous steps to reproduce this bug include code, if relevant -->
21+
### Steps to reproduce (*)
22+
<!---
23+
It is important to provide a set of clear steps to reproduce this bug.
24+
If relevant please include code samples
25+
-->
1226
1.
1327
2.
1428
3.
1529

16-
### Expected result
30+
### Expected result (*)
1731
<!--- Tell us what should happen -->
18-
1.
32+
1. [Screenshots, logs or description]
1933

20-
### Actual result
34+
### Actual result (*)
2135
<!--- Tell us what happens instead -->
22-
1. [Screenshot, logs]
23-
24-
<!--- (This may be platform independent comment) -->
36+
1. [Screenshots, logs or description]

‎.github/ISSUE_TEMPLATE/bug_report.md

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
---
2+
name: Bug report
3+
about: Technical issue with the Magento 2 core components
4+
5+
---
6+
7+
<!---
8+
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.
10+
-->
11+
12+
### Preconditions (*)
13+
<!---
14+
Provide the exact Magento version (example: 2.2.5) and any important information on the environment where bug is reproducible.
15+
-->
16+
1.
17+
2.
18+
19+
### Steps to reproduce (*)
20+
<!---
21+
Important: Provide a set of clear steps to reproduce this bug. We can not provide support without clear instructions on how to reproduce.
22+
-->
23+
1.
24+
2.
25+
26+
### Expected result (*)
27+
<!--- Tell us what do you expect to happen. -->
28+
1. [Screenshots, logs or description]
29+
2.
30+
31+
### Actual result (*)
32+
<!--- Tell us what happened instead. Include error messages and issues. -->
33+
1. [Screenshots, logs or description]
34+
2.

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

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
---
2+
name: Developer experience issue
3+
about: Issues related to customization, extensibility, modularity
4+
5+
---
6+
7+
<!---
8+
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.
10+
-->
11+
12+
### Summary (*)
13+
<!--- Describe the issue you are experiencing. Include general information, error messages, environments, and so on. -->
14+
15+
### Examples (*)
16+
<!--- Provide code examples or a patch with a test (recommended) to clearly indicate the problem. -->
17+
18+
### Proposed solution
19+
<!--- Suggest your potential solutions for this issue. -->

‎.github/ISSUE_TEMPLATE/feature_request.md

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
---
2+
name: Feature request
3+
about: Please consider reporting directly to https://github.com/magento/community-features
4+
5+
---
6+
7+
<!---
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.
9+
-->
10+
11+
### Description (*)
12+
<!--- Describe the feature you would like to add. -->
13+
14+
### Expected behavior (*)
15+
<!--- What is the expected behavior of this feature? How is it going to work? -->
16+
17+
### Benefits
18+
<!--- How do you think this feature would improve Magento? -->
19+
20+
### Additional information
21+
<!--- What other information can you provide about the desired feature? -->

‎.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 25 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,37 @@
1-
<!--- Provide a general summary of the Pull Request in the Title above -->
1+
<!---
2+
Thank you for contributing to Magento.
3+
To help us process this pull request we recommend that you add the following information:
4+
- Summary of the pull request,
5+
- Issue(s) related to the changes made,
6+
- Manual testing scenarios
7+
Fields marked with (*) are required. Please don't remove the template.
8+
-->
29

3-
### Description
4-
<!--- Provide a description of the changes proposed in the pull request -->
10+
<!--- Please provide a general summary of the Pull Request in the Title above -->
11+
12+
### Description (*)
13+
<!---
14+
Please provide a description of the changes proposed in the pull request.
15+
Letting us know what has changed and why it needed changing will help us validate this pull request.
16+
-->
517

618
### Fixed Issues (if relevant)
7-
<!--- Provide a list of fixed issues in the format magento/magento2#<issue_number>, if relevant -->
19+
<!---
20+
If relevant, please provide a list of fixed issues in the format magento/magento2#<issue_number>.
21+
There could be 1 or more issues linked here and it will help us find some more information about the reasoning behind this change.
22+
-->
823
1. magento/magento2#<issue_number>: Issue title
924
2. ...
1025

11-
### Manual testing scenarios
12-
<!--- Provide a set of unambiguous steps to test the proposed code change -->
26+
### Manual testing scenarios (*)
27+
<!---
28+
Please provide a set of unambiguous steps to test the proposed code change.
29+
Giving us manual testing scenarios will help with the processing and validation process.
30+
-->
1331
1. ...
1432
2. ...
1533

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

‎.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ atlassian*
3333
/.php_cs
3434
/.php_cs.cache
3535
/grunt-config.json
36-
/dev/tools/grunt/configs/local-themes.js
3736
/pub/media/*.*
3837
!/pub/media/.htaccess
3938
/pub/media/attribute/*

‎.htaccess

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -355,6 +355,15 @@
355355
Require all denied
356356
</IfVersion>
357357
</Files>
358+
<Files auth.json>
359+
<IfVersion < 2.4>
360+
order allow,deny
361+
deny from all
362+
</IfVersion>
363+
<IfVersion >= 2.4>
364+
Require all denied
365+
</IfVersion>
366+
</Files>
358367

359368
# For 404s and 403s that aren't handled by the application, show plain 404 response
360369
ErrorDocument 404 /pub/errors/404.php

‎.htaccess.sample

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,8 @@
111111
############################################
112112
## enable rewrites
113113

114-
Options +FollowSymLinks
114+
# The following line has better security but add some performance overhead - see https://httpd.apache.org/docs/2.4/en/misc/perf-tuning.html
115+
Options -FollowSymLinks +SymLinksIfOwnerMatch
115116
RewriteEngine on
116117

117118
############################################
@@ -331,6 +332,15 @@
331332
Require all denied
332333
</IfVersion>
333334
</Files>
335+
<Files auth.json>
336+
<IfVersion < 2.4>
337+
order allow,deny
338+
deny from all
339+
</IfVersion>
340+
<IfVersion >= 2.4>
341+
Require all denied
342+
</IfVersion>
343+
</Files>
334344

335345
# For 404s and 403s that aren't handled by the application, show plain 404 response
336346
ErrorDocument 404 /pub/errors/404.php

‎.php_cs.dist

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
*/
66

77
/**
8-
* Pre-commit hook installation:
9-
* vendor/bin/static-review.php hook:install dev/tools/Magento/Tools/StaticReview/pre-commit .git/hooks/pre-commit
8+
* PHP Coding Standards fixer configuration
109
*/
10+
1111
$finder = PhpCsFixer\Finder::create()
1212
->name('*.phtml')
1313
->exclude('dev/tests/functional/generated')

‎.travis.yml

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,18 @@ addons:
1111
firefox: "46.0"
1212
hosts:
1313
- magento2.travis
14+
services:
15+
- rabbitmq
16+
- elasticsearch
1417
language: php
1518
php:
16-
- 7.0
1719
- 7.1
20+
- 7.2
1821
env:
1922
global:
2023
- COMPOSER_BIN_DIR=~/bin
2124
- INTEGRATION_SETS=3
22-
- NODE_JS_VERSION=6
25+
- NODE_JS_VERSION=8
2326
- MAGENTO_HOST_NAME="magento2.travis"
2427
matrix:
2528
- TEST_SUITE=unit
@@ -30,24 +33,29 @@ env:
3033
- TEST_SUITE=integration INTEGRATION_INDEX=2
3134
- TEST_SUITE=integration INTEGRATION_INDEX=3
3235
- TEST_SUITE=functional
36+
- TEST_SUITE=graphql-api-functional
3337
matrix:
3438
exclude:
35-
- php: 7.0
39+
- php: 7.1
3640
env: TEST_SUITE=static
37-
- php: 7.0
41+
- php: 7.1
3842
env: TEST_SUITE=js GRUNT_COMMAND=spec
39-
- php: 7.0
43+
- php: 7.1
4044
env: TEST_SUITE=js GRUNT_COMMAND=static
41-
- php: 7.0
45+
- php: 7.1
4246
env: TEST_SUITE=functional
47+
- php: 7.1
48+
env: TEST_SUITE=graphql-api-functional
4349
cache:
4450
apt: true
4551
directories:
4652
- $HOME/.composer/cache
4753
- $HOME/.nvm
4854
- $HOME/node_modules
4955
- $HOME/yarn.lock
50-
before_install: ./dev/travis/before_install.sh
56+
before_install:
57+
- curl -O https://download.elastic.co/elasticsearch/release/org/elasticsearch/distribution/deb/elasticsearch/2.3.0/elasticsearch-2.3.0.deb && sudo dpkg -i --force-confnew elasticsearch-2.3.0.deb && sudo service elasticsearch restart
58+
- ./dev/travis/before_install.sh
5159
install: composer install --no-interaction
5260
before_script: ./dev/travis/before_script.sh
5361
script:
@@ -56,5 +64,6 @@ script:
5664

5765
# The scripts for grunt/phpunit type tests
5866
- if [ $TEST_SUITE == "functional" ]; then dev/tests/functional/vendor/phpunit/phpunit/phpunit -c dev/tests/$TEST_SUITE $TEST_FILTER; fi
59-
- if [ $TEST_SUITE != "functional" ] && [ $TEST_SUITE != "js" ]; then phpunit -c dev/tests/$TEST_SUITE $TEST_FILTER; fi
67+
- if [ $TEST_SUITE != "functional" ] && [ $TEST_SUITE != "js" ] && [ $TEST_SUITE != "graphql-api-functional" ]; then phpunit -c dev/tests/$TEST_SUITE $TEST_FILTER; fi
6068
- if [ $TEST_SUITE == "js" ]; then grunt $GRUNT_COMMAND; fi
69+
- if [ $TEST_SUITE == "graphql-api-functional" ]; then phpunit -c dev/tests/api-functional; fi

‎CHANGELOG.md

Lines changed: 9 additions & 5 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")
@@ -153,7 +157,7 @@ To get detailed information about changes in Magento 2.1.0, please visit [Magent
153157
* Updated styles
154158
* Sample Data:
155159
* Improved sample data installation UX
156-
* Updated sample data with Product Heros, color swatches, MAP and rule based product relations
160+
* Updated sample data with Product Heroes, color swatches, MAP and rule based product relations
157161
* Improved sample data upgrade flow
158162
* Added the ability to log errors and set the error flag during sample data installation
159163
* Various improvements:
@@ -1977,7 +1981,7 @@ Tests:
19771981
* [#686](https://github.com/magento/magento2/issues/686) -- Product save validation errors in the admin don't hide the overlay
19781982
* [#702](https://github.com/magento/magento2/issues/702) -- Base table or view not found
19791983
* [#652](https://github.com/magento/magento2/issues/652) -- Multishipping checkout not to change the Billing address js issue
1980-
* [#648](https://github.com/magento/magento2/issues/648) -- An equal (=) sign in the hash of the product page to to break the tabs functionality
1984+
* [#648](https://github.com/magento/magento2/issues/648) -- An equal (=) sign in the hash of the product page to break the tabs functionality
19811985
* Service Contracts:
19821986
* Refactored usage of new API of the Customer module
19831987
* Implemented Service Contracts for the Sales module
@@ -2280,7 +2284,7 @@ Tests:
22802284
* Fixed an issue where no results were found for Coupons reports
22812285
* Fixed an issue with incremental Qty setting
22822286
* Fixed an issue with allowing importing of negative weight values
2283-
* Fixed an issue with Inventory - Only X left Treshold being not dependent on Qty for Item's Status to Become Out of Stock
2287+
* Fixed an issue with Inventory - Only X left Threshold being not dependent on Qty for Item's Status to Become Out of Stock
22842288
* Fixed an issue where the "Catalog Search Index index was rebuilt." message was displayed when reindexing the Catalog Search index
22852289
* Search module:
22862290
* Integrated the Search library to the advanced search functionality
@@ -2702,7 +2706,7 @@ Tests:
27022706
* Ability to support extensible service data objects
27032707
* No Code Duplication in Root Templates
27042708
* Fixed bugs:
2705-
* Persistance session application. Loggin out the customer
2709+
* Persistence session application. Logging out the customer
27062710
* Placing the order with two terms and conditions
27072711
* Saving of custom option by service catalogProductCustomOptionsWriteServiceV1
27082712
* Placing the order on frontend if enter in the street address line 1 and 2 255 symbols
@@ -2961,7 +2965,7 @@ Tests:
29612965
* Fixed an issue with incorrect items label for the cases when there are more than one item in the category
29622966
* Fixed an issue when configurable product was out of stock in Google Shopping while being in stock in the Magento backend
29632967
* Fixed an issue when swipe gesture in menu widget was not supported on mobile
2964-
* Fixed an issue when it was impossible to enter alpha-numeric zip code on the stage of estimating shipping and tax rates
2968+
* Fixed an issue when it was impossible to enter alphanumeric zip code on the stage of estimating shipping and tax rates
29652969
* Fixed an issue when custom price was not applied when editing an order
29662970
* Fixed an issue when items were not returned to stock after unsuccessful order was placed
29672971
* Fixed an issue when error message appeared "Cannot save the credit memo” while creating credit memo

0 commit comments

Comments
 (0)