Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/2.3-develop' into 2.3-develop
Browse files Browse the repository at this point in the history
  • Loading branch information
behnamshayani committed Nov 3, 2019
2 parents 1a0cae2 + dac1ea5 commit d1c848f
Show file tree
Hide file tree
Showing 19,789 changed files with 984,034 additions and 235,818 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
12 changes: 12 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
root = true

[*]
charset = utf-8
end_of_line = lf
indent_size = 4
indent_style = space
insert_final_newline = true
trim_trailing_whitespace = true

[*.md]
trim_trailing_whitespace = false
9 changes: 7 additions & 2 deletions .github/.htaccess
Original file line number Diff line number Diff line change
@@ -1,2 +1,7 @@
Order deny,allow
Deny from all
<IfVersion < 2.4>
Order deny,allow
Deny from all
</IfVersion>
<IfVersion >= 2.4>
Require all denied
</IfVersion>
206 changes: 206 additions & 0 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -0,0 +1,206 @@
/app/code/Magento/AdminNotification/ @paliarush
/app/code/Magento/Backend/ @paliarush
/app/code/Magento/User/ @paliarush
/lib/internal/Magento/Framework/App/ @buskamuza
/lib/internal/Magento/Framework/Controller/ @buskamuza
/lib/internal/Magento/Framework/Flag/ @buskamuza
/lib/internal/Magento/Framework/HTTP/ @buskamuza
/lib/internal/Magento/Framework/Logger/ @buskamuza
/lib/internal/Magento/Framework/Message/ @buskamuza
/lib/internal/Magento/Framework/Notification/ @buskamuza
/lib/internal/Magento/Framework/Session/ @buskamuza
/lib/internal/Magento/Framework/Url/ @buskamuza
/app/code/Magento/Cms/ @melnikovi
/app/code/Magento/CmsUrlRewrite/ @melnikovi
/app/code/Magento/Contact/ @melnikovi
/app/code/Magento/Email/ @melnikovi
/app/code/Magento/Variable/ @melnikovi
/app/code/Magento/Widget/ @melnikovi
/lib/internal/Magento/Framework/Cache/ @kokoc
/app/code/Magento/CacheInvalidate/ @kokoc
/app/code/Magento/CatalogInventory/ @tariqjawed83 @maghamed
/app/code/Magento/Bundle/ @akaplya
/app/code/Magento/BundleImportExport/ @akaplya
/app/code/Magento/Catalog/ @akaplya
/app/code/Magento/CatalogAnalytics/ @akaplya
/app/code/Magento/CatalogImportExport/ @akaplya
/app/code/Magento/CatalogSearch/ @kokoc
/app/code/Magento/CatalogUrlRewrite/ @akaplya
/app/code/Magento/ConfigurableImportExport/ @akaplya
/app/code/Magento/ConfigurableProduct/ @akaplya
/app/code/Magento/Downloadable/ @akaplya
/app/code/Magento/DownloadableImportExport/ @akaplya
/app/code/Magento/GroupedImportExport/ @akaplya
/app/code/Magento/GroupedProduct/ @akaplya
/app/code/Magento/LayeredNavigation/ @kokoc
/app/code/Magento/ProductVideo/ @akaplya
/app/code/Magento/Review/ @akaplya
/app/code/Magento/Swatches/ @akaplya
/app/code/Magento/SwatchesLayeredNavigation/ @kokoc
/app/code/Magento/Checkout/ @paliarush
/app/code/Magento/CheckoutAgreements/ @paliarush
/app/code/Magento/GiftMessage/ @paliarush
/app/code/Magento/InstantPurchase/ @paliarush
/app/code/Magento/Multishipping/ @joni-jones
/app/code/Magento/Quote/ @paliarush
/app/code/Magento/QuoteAnalytics/ @paliarush
/lib/internal/Magento/Framework/Code/ @joni-jones
/lib/internal/Magento/Framework/Reflection/ @joni-jones
/lib/internal/Magento/Framework/Component/ @buskamuza
/app/code/Magento/Version/ @buskamuza
/lib/internal/Magento/Framework/Config/ @paliarush
/app/code/Magento/Config/ @paliarush
/lib/internal/Magento/Framework/Console/ @joni-jones
/lib/internal/Magento/Framework/Process/ @joni-jones
/lib/internal/Magento/Framework/Shell/ @joni-jones
/app/code/Magento/Cookie/ @kokoc
/lib/internal/Magento/Framework/Crontab/ @tariqjawed83 @buskamuza
/app/code/Magento/Cron/ @tariqjawed83 @buskamuza
/app/code/Magento/Customer/ @paliarush
/app/code/Magento/CustomerAnalytics/ @paliarush
/app/code/Magento/CustomerImportExport/ @paliarush
/app/code/Magento/Persistent/ @paliarush
/app/code/Magento/Wishlist/ @paliarush
/lib/internal/Magento/Framework/DB/ @akaplya
/lib/internal/Magento/Framework/EntityManager/ @akaplya
/lib/internal/Magento/Framework/Indexer/ @akaplya
/lib/internal/Magento/Framework/Model/ @akaplya
/lib/internal/Magento/Framework/Mview/ @akaplya
/app/code/Magento/Eav/ @akaplya
/app/code/Magento/Indexer/ @akaplya
/lib/internal/Magento/Framework/Archive/ @joni-jones
/lib/internal/Magento/Framework/Convert/ @joni-jones
/lib/internal/Magento/Framework/Data/ @joni-jones
/lib/internal/Magento/Framework/DomDocument/ @joni-jones
/lib/internal/Magento/Framework/Json/ @joni-jones
/lib/internal/Magento/Framework/Math/ @joni-jones
/lib/internal/Magento/Framework/Parse/ @joni-jones
/lib/internal/Magento/Framework/Serialize/ @joni-jones
/lib/internal/Magento/Framework/Simplexml/ @joni-jones
/lib/internal/Magento/Framework/Stdlib/ @joni-jones
/lib/internal/Magento/Framework/Unserialize/ @joni-jones
/lib/internal/Magento/Framework/Xml/ @joni-jones
/lib/internal/Magento/Framework/XsltProcessor/ @joni-jones
/app/code/Magento/Deploy/ @kandy @buskamuza
/lib/internal/Magento/Framework/Profiler/ @kandy
/app/code/Magento/Developer/ @buskamuza
/app/code/Magento/Directory/ @buskamuza
/lib/internal/Magento/Framework/Exception/ @paliarush
/lib/internal/Magento/Framework/File/ @buskamuza
/lib/internal/Magento/Framework/Filesystem/ @buskamuza
/lib/internal/Magento/Framework/System/ @buskamuza
/lib/internal/Magento/Framework/Css/ @DrewML
/lib/internal/Magento/Framework/Option/ @DrewML
/lib/internal/Magento/Framework/RequireJs/ @DrewML
/lib/internal/Magento/Framework/View/ @melnikovi
/dev/tests/js/ @DrewML
/app/code/Magento/RequireJs/ @DrewML
/app/code/Magento/Theme/ @melnikovi
/app/code/Magento/Ui/ @melnikovi
/lib/internal/Magento/Framework/Intl/ @melnikovi
/lib/internal/Magento/Framework/Locale/ @melnikovi
/lib/internal/Magento/Framework/Phrase/ @melnikovi
/lib/internal/Magento/Framework/Translate/ @melnikovi
/app/code/Magento/Translation/ @melnikovi
/app/code/Magento/ImportExport/ @akaplya
/app/code/Magento/GoogleAdwords/ @buskamuza @melnikovi
/app/code/Magento/Newsletter/ @buskamuza @melnikovi
/app/code/Magento/ProductAlert/ @buskamuza @melnikovi
/app/code/Magento/Rss/ @buskamuza @melnikovi
/app/code/Magento/SendFriend/ @buskamuza @melnikovi
/app/code/Magento/Marketplace/ @buskamuza
/app/code/Magento/MediaStorage/ @buskamuza
/lib/internal/Magento/Framework/Amqp/ @tariqjawed83 @paliarush
/lib/internal/Magento/Framework/Bulk/ @tariqjawed83 @paliarush
/lib/internal/Magento/Framework/Communication/ @tariqjawed83 @paliarush
/app/code/Magento/Amqp/ @tariqjawed83 @paliarush
/app/code/Magento/AsynchronousOperations/ @tariqjawed83 @paliarush
/app/code/Magento/MessageQueue/ @tariqjawed83 @paliarush
/app/code/Magento/MysqlMq/ @tariqjawed83 @paliarush
/app/code/Magento/Sales/ @joni-jones
/app/code/Magento/SalesInventory/ @joni-jones
/app/code/Magento/SalesSequence/ @joni-jones
/lib/internal/Magento/Framework/Event/ @buskamuza @kandy
/lib/internal/Magento/Framework/Interception/ @buskamuza @kandy
/lib/internal/Magento/Framework/ObjectManager/ @buskamuza @kandy
/app/code/Magento/PageCache/ @Andrey @kokoc @paliarush
/app/code/Magento/Authorizenet/ @joni-jones
/app/code/Magento/Braintree/ @joni-jones
/app/code/Magento/OfflinePayments/ @joni-jones
/app/code/Magento/Payment/ @joni-jones
/app/code/Magento/Paypal/ @joni-jones
/app/code/Magento/Signifyd/ @joni-jones
/app/code/Magento/Vault/ @joni-jones
/lib/internal/Magento/Framework/Pricing/ @akaplya
/app/code/Magento/AdvancedPricingImportExport/ @akaplya
/app/code/Magento/CurrencySymbol/ @akaplya
/app/code/Magento/Msrp/ @akaplya
/app/code/Magento/Tax/ @akaplya
/app/code/Magento/TaxImportExport/ @akaplya
/app/code/Magento/Weee/ @akaplya
/app/code/Magento/CatalogRule/ @kokoc
/app/code/Magento/CatalogRuleConfigurable/ @kokoc
/app/code/Magento/CatalogWidget/ @kokoc
/app/code/Magento/Rule/ @kokoc
/app/code/Magento/SalesRule/ @akaplya
/app/code/Magento/ReleaseNotification/ @paliarush
/app/code/Magento/Analytics/ @tariqjawed83 @buskamuza
/app/code/Magento/GoogleAnalytics/ @tariqjawed83 @buskamuza
/app/code/Magento/NewRelicReporting/ @tariqjawed83 @buskamuza
/app/code/Magento/Reports/ @tariqjawed83 @buskamuza
/app/code/Magento/ReviewAnalytics/ @tariqjawed83 @buskamuza
/app/code/Magento/SalesAnalytics/ @tariqjawed83 @buskamuza
/app/code/Magento/WishlistAnalytics/ @tariqjawed83 @buskamuza
/app/code/Magento/GoogleOptimizer/ @paliarush
/app/code/Magento/Robots/ @paliarush
/app/code/Magento/Sitemap/ @paliarush
/lib/internal/Magento/Framework/Search/ @kokoc
/app/code/Magento/AdvancedSearch/ @kokoc
/app/code/Magento/Elasticsearch/ @kokoc
/app/code/Magento/Search/ @kokoc
/lib/internal/Magento/Framework/Acl/ @kokoc
/lib/internal/Magento/Framework/Authorization/ @kokoc
/lib/internal/Magento/Framework/Encryption/ @kokoc
/app/code/Magento/Authorization/ @kokoc
/app/code/Magento/Captcha/ @kokoc
/app/code/Magento/EncryptionKey/ @kokoc
/app/code/Magento/Security/ @kokoc
/lib/internal/Magento/Framework/Autoload/ @buskamuza
/lib/internal/Magento/Framework/Backup/ @buskamuza
/lib/internal/Magento/Framework/Composer/ @buskamuza
/lib/internal/Magento/Framework/Setup/ @buskamuza
/app/code/Magento/Backup/ @buskamuza
/setup/ @buskamuza
/app/code/Magento/Dhl/ @joni-jones
/app/code/Magento/Fedex/ @joni-jones
/app/code/Magento/OfflineShipping/ @joni-jones
/app/code/Magento/Shipping/ @joni-jones
/app/code/Magento/Ups/ @joni-jones
/app/code/Magento/Usps/ @joni-jones
/app/code/Magento/Store/ @akaplya
/lib/internal/Magento/Framework/TestFramework/ @paliarush
/dev/tests/integration/framework/ @buskamuza
/dev/tests/setup-integration/framework/ @paliarush
/dev/tests/static/framework/ @paliarush
/dev/tests/unit/ @paliarush
/dev/tests/api-functional/ @paliarush
/app/code/Magento/UrlRewrite/ @kokoc
/lib/internal/Magento/Framework/Image/ @buskamuza
/lib/internal/Magento/Framework/Mail/ @melnikovi
/lib/internal/Magento/Framework/Filter/ @melnikovi
/lib/internal/Magento/Framework/Validation/ @melnikovi
/lib/internal/Magento/Framework/Validator/ @melnikovi
/lib/internal/Magento/Framework/Api/ @paliarush
/lib/internal/Magento/Framework/GraphQL/ @paliarush
/lib/internal/Magento/Framework/Oauth/ @paliarush
/lib/internal/Magento/Framework/Webapi/ @paliarush
/app/code/Magento/GraphQL/ @paliarush
/app/code/Magento/Integration/ @paliarush
/app/code/Magento/Swagger/ @paliarush
/app/code/Magento/Webapi/ @paliarush
/app/code/Magento/WebapiSecurity/ @paliarush

composer.json @buskamuza
*.js @DrewML
.htaccess* @akaplya
nginx.conf* @akaplya
40 changes: 26 additions & 14 deletions .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,36 +1,48 @@
# Contributing to Magento 2 code

Contributions to the Magento 2 codebase are done using the fork & pull model.
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”).
This contribution model has contributors maintaining their own fork of the Magento 2 repository.
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/).

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

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.
The Magento 2 development team or community maintainers 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.

For more detailed information on contribution please read our [beginners guide](https://github.com/magento/magento2/wiki/Getting-Started).

## Contribution requirements

1. Contributions must adhere to [Magento coding standards](http://devdocs.magento.com/guides/v2.0/coding-standards/bk-coding-standards.html).
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.
3. Commits must be accompanied by meaningful commit messages.
4. PRs which include bug fixing, must be accompanied with step-by-step description of how to reproduce the bug.
1. Contributions must adhere to the [Magento coding standards](https://devdocs.magento.com/guides/v2.3/coding-standards/bk-coding-standards.html).
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.
3. Commits must be accompanied by meaningful commit messages. Please see the [Magento Pull Request Template](https://github.com/magento/magento2/blob/2.3-develop/.github/PULL_REQUEST_TEMPLATE.md) for more information.
4. PRs which include bug fixes must be accompanied with a step-by-step description of how to reproduce the bug.
3. PRs which include new logic or new features must be submitted along with:
* Unit/integration test coverage (we will be releasing more information on writing test coverage in the near future).
* Proposed [documentation](http://devdocs.magento.com) update. Documentation contributions can be submitted [here](https://github.com/magento/devdocs).
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.
5. All automated tests are passed successfully (all builds on [Travis CI](https://travis-ci.org/magento/magento2) must be green).
* Unit/integration test coverage
* Proposed [documentation](https://devdocs.magento.com) updates. Documentation contributions can be submitted via the [devdocs GitHub](https://github.com/magento/devdocs).
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.
5. All automated tests must pass (all builds on [Travis CI](https://travis-ci.org/magento/magento2) must be green).

## Contribution process

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

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.
2. Review the [Contributor License Agreement](https://magento.com/legaldocuments/mca) if this is your first time contributing.
3. Create and test your work.
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).
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.
4. Fork the Magento 2 repository according to the [Fork A Repository instructions](https://devdocs.magento.com/guides/v2.3/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.3/contributor-guide/contributing.html#pull_request).
5. Once your contribution is received the Magento 2 development team will review the contribution and collaborate with you as needed.

## Code of Conduct

Please note that this project is released with a Contributor Code of Conduct. We expect you to agree to its terms when participating in this project.
The full text is available in the repository [Wiki](https://github.com/magento/magento2/wiki/Magento-Code-of-Conduct).

## Connecting with Community!

If you have any questions, join us in [#beginners](https://magentocommeng.slack.com/messages/CH8BGFX9D) Slack chat. If you are not on our slack, [click here](http://tinyurl.com/engcom-slack) to join.

Need to find a project? Check out the [Slack Channels](https://github.com/magento/magento2/wiki/Slack-Channels) (with listed project info) and the [Magento Community Portal](https://opensource.magento.com/).
38 changes: 25 additions & 13 deletions .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,24 +1,36 @@
<!--- Provide a general summary of the issue in the Title above -->
<!--- Before adding new issues, please, check this article https://github.com/magento/magento2/wiki/Issue-reporting-guidelines-->
<!---
Thank you for contributing to Magento.
To help us process this issue we recommend that you add the following information:
- Summary of the issue,
- Information on your environment,
- Steps to reproduce,
- Expected and actual results,
Fields marked with (*) are required. Please don't remove the template.
### Preconditions
<!--- Provide a more detailed information of environment you use -->
<!--- Magento version, tag, HEAD, etc., PHP & MySQL version, etc.. -->
Please also have a look at our guidelines article before adding a new issue https://github.com/magento/magento2/wiki/Issue-reporting-guidelines
-->

### 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
<!--- Provide a set of unambiguous steps to reproduce this bug include code, if relevant -->
### Steps to reproduce (*)
<!---
It is important to provide a set of clear steps to reproduce this bug.
If relevant please include code samples
-->
1.
2.
3.

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

### Actual result
### Actual result (*)
<!--- Tell us what happens instead -->
1. [Screenshot, logs]

<!--- (This may be platform independent comment) -->
1. [Screenshots, logs or description]
34 changes: 34 additions & 0 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
---
name: Bug report
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 (*)
<!---
Provide the exact Magento version (example: 2.3.2) and any important information on the environment where bug is reproducible.
-->
1.
2.

### 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 (*)
<!--- Tell us what do you expect to happen. -->
1. [Screenshots, logs or description]
2.

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

0 comments on commit d1c848f

Please sign in to comment.