Code Contributions
v2.1 End of Contribution: As of September 17, 2018, we no longer accept contributions to the v2.1 release line. Continue submitting contributions for the v2.2 and v2.3 release lines. We made this change to increase our focus on issue investigations and pull request approvals for v2.2 and v2.3 release lines.
The following topics are included in this guide:
- Contribute to Magento 2 code
- Questions or enhancement requests?
- Accepted pull requests and ported code
- Contribution requirements
- Fork a repository
- Create a pull request
- Magento Contributor Assistant
- Porting code contributions across Magento versions
- Report an issue
- Help triage issues
- Labels applied by the Community Engineering Team
- Contribution awards and points
Contribute to Magento 2 code
Use the fork and pull model to contribute to the Magento 2 codebase.
This contribution model allows contributors to maintain their own copy of the forked codebase (which can be easily 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).
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. We recommend also creating back-ports and up-ports as needed with your pull requests if the issue occurs in higher or lower line releases.
The Community Engineering Team reviews all issues and contributions submitted by the community developers. During the review we might require clarifications from the contributor. If there is no response from the contributor in two weeks (14 days) time, the issue is closed.
Often when the Community Engineering Team works on reviewing the suggested changes, we will add a label to the issue to indicate certain information, like the status or who is working the issue. If you’re ever curious what the different labels mean, see the table below for an explanation of each one.
Please refer to Magento Contributor Agreement for detailed information about the License Agreement. All contributors are required to submit a click-through form to agree to the terms.
GitHub and Two-Factor Authentication
When setting up access and tokens for Magento GitHub repositories, we recommend adding Two-Factor Authentication (2FA) to enhance security. Magento requires all Partners who contribute code to enable Two-Factor Authentication (2FA) on their accounts. You can use a mobile device or 2FA application for added protection.
2FA adds an additional layer of security beyond just a username/password when you access GitHub. With 2FA enabled, you log into a service with your credentials then complete an additional step providing a 2FA code. This second form of authentication helps us ensure that a malicious user will not be able to gain access to your GitHub account or any private Magento GitHub repositories.
For details, see Configuring Two-Factor Authentication via a mobile app guide to add 2FA protection to your GitHub account.
Questions or enhancement requests?
We use this repository (the Magento 2 GitHub repository) to capture code and documentation issues. We recommend that you post all questions to a question-and-answer site, such as Stack Exchange and the Magento Forums, where Magento community members can quickly provide recommendations and advice.
Submit feature requests or enhancement suggestions to the new Magento 2 Feature Requests and Improvements forum (see details here).
Accepted pull requests and ported code
v2.1 End of Contribution: As of September 17, 2018, we no longer accept contributions to the v2.1 release line. Continue submitting contributions for the v2.2 and v2.3 release lines. We made this change to increase our focus on issue investigations and pull request approvals for v2.2 and v2.3 release lines.
Please review the following supported and accepted pull request rules. We defined these rules to simplify and accelerate your submissions, follow code consistency, manage current and backlog tasks, and so on.
Fix for Existing Issue | Test Coverage | Refactoring | New Feature | Code Cleanup | |
---|---|---|---|---|---|
2.1 | |||||
2.2 | |||||
2.3 |
Contribution requirements
- Contributions must adhere to Magento coding standards.
- Refer to the Magento development team’s Definition of Done. We use these guidelines internally to ensure that we deliver well-tested, well-documented, and solid code. We encourage you to use this as well!
- Pull requests (PRs) must be accompanied by a meaningful description of their purpose. Comprehensive descriptions increase the chances that a pull request is merged quickly and without additional clarification requests.
- Commits must be accompanied by meaningful commit messages.
- PRs that include bug fixes must be accompanied by a step-by-step description of how to reproduce the bug.
- PRs that include new logic or new features must be submitted along with:
- Unit/integration test coverage (we will be releasing more information about writing test coverage in the near future).
- Proposed documentation updates. Documentation contributions can be submitted here.
- For large features or changes, please open an issue and discuss it with us first. This may prevent duplicate or unnecessary effort, and it may gain you some additional contributors.
- To report a bug, please open an issue, and follow these guidelines about bugfix issues.
- All automated tests must pass successfully (all builds on Travis CI must be green).
Fork a repository
To fork a repository on GitHub:
- Create or log in to your account on GitHub.
- Navigate to the Magento 2 repository.
-
Click Fork at the top right:
- Clone the repo into your development environment and start playing.
Update the fork with the latest changes
As community and Magento writers’ changes are merged to the repository, your fork becomes outdated and pull requests might result in conflicts. To see if your fork is outdated, open the fork page in GitHub and if a This branch is NUMBER commits behind magento:2.2-develop.
message is displayed at the top of the page. If so, your fork must be updated.
There are two ways to update your fork. The typical way is discussed in GitHub documentation. Make sure to update from the correct branch!
You can also use the GitHub interface to update forks, referred to as a reverse pull request. Though this method does have a downside: it inserts unnecessary information into your fork commit history.
-
On your fork GitHub page, click New pull request. You should see the following message:
1 2
There isn’t anything to compare. magento:2.2-develop is up to date with all commits from <your fork>:2.2-develop. Try switching the base for your comparison.
- Click the base link and then click Create pull request.
- Provide a descriptive name for your pull request in the provided field.
- Scroll to the bottom of the page and click Merge pull request, then click Confirm Merge.
Check out this video to see the process in action:
Create a pull request
v2.1 End of Contribution: As of September 17, 2018, we no longer accept contributions to the v2.1 release line. Continue submitting contributions for the v2.2 and v2.3 release lines. We made this change to increase our focus on issue investigations and pull request approvals for v2.2 and v2.3 release lines.
First, check the existing PRs and make sure you are not duplicating others’ work.
To create a pull request:
- Create a feature branch for your changes and push those changes to the copy of your repository on GitHub. This is the best way to organize and even update your PR.
-
In your repository, click Pull requests on the right, and then click New pull request.
- Ensure that you are creating a PR to the one of following branches:
magento:2.3-develop
ormagento:2.2-develop
. We accept PRs to these branches only. - Review the changes, then click Create pull request.
- Fill out the PR form, and click Create pull request again to submit the PR—that’s it!
After submitting your PR, you can head over to the Magento 2 repository’s Pull Requests panel to see your PR. Your PR undergoes automated testing, and if it passes, the Community Engineering Team considers it for inclusion in the Magento 2 core. If some tests fail, please make the corresponding corrections in your code.
Magento Contributor Assistant
The Magento Contributor Assistant is a bot that currently runs on the GitHub magento/magento2
repository. It helps automate different issue and pull request workflows using commands entered as comments.
Currently, the Magento Contributor Assistant automatically deploys test instances on Magento’s hosting based on a contributor’s pull request or provide a vanilla Magento instance. This gives a GitHub user an instance to test pull requests or reported issues. We plan on adding features in the future.
Deploy vanilla Magento instance
When you need to verify an issue or pull request, enter a command to generate an issue verification instance, or vanilla Magento. This instance is a clean Magento installation of a specified version tag or the develop branch of a specified release line.
Command: To deploy a vanilla Magento instance, add the following command as a comment to the GitHub Pull Request or Issue:
1
@magento-engcom-team give me {$version} instance
For version
, the currently supported values are version tags and develop branches starting with 2.2.0 and 2.2-develop.
Actions: The following actions complete for the command:
- If the instance does not exist, it will be deployed. Deployment takes ~2 minutes.
- If the instance exists, a fresh instance will be redeployed.
- By default, instances have a lifetime of 3 hours. All deployments are terminated after that.
Admin access:
- https://pr-{$id_pr}.instances.magento-community.engineering/admin
- Admin Credentials:
- Username: admin
- Password: 123123q
Permissions:
- All permissions granted for all users
Deploy instance based on PR changes
To verify and test changes completed in a pull request, enter a command to generate a Magento instance using the code based in the PR.
Command: To deploy, Community Maintainers, a Magento EngCom Team member, or contributor under the existing Pull Request enters the following command as a comment to the pull request:
1
@magento-engcom-team give me test instance
Actions:
- It deploys a new Magento instance based on Pull Request changes.
- Deployment takes ~2 minutes.
Admin access:
- http://pr-xxx.engcom.dev.magento.com/admin
- Admin Credentials:
- Username: admin
- Password: 123123q
Permissions:
- Community Maintainers
- Magento EngCom Team
- Contributor
Combine multiple pull requests
To optimize the pull request queue, enter a command with a series of related pull requests to verify and combine the code. If all tests pass, the entered PRs are merged into the current PR.
Command: To combine pull requests, a member of the Community Maintainers or Magento EngCom Team under the existing Pull Request enters the following command:
1
@magento-engcom-team combine {xxx} {yyy} {zzz}
The command merges the listed related pull requests (xxx
, yyy
, zzz
) into the current pull request. For example: @magento-engcom-team combine 1234 1238 1239
actions: When all conditions are passed, all related pull requests will be closed and merged to the current PR:
- Current pull request allows changes from maintainers
- All mentioned pull requests are open
- All mentioned pull requests have been created by the same contributor (author)
- All mentioned pull requests have same target (base) branch
- All mentioned pull requests can be merged with each other
Permissions:
Porting code contributions across Magento versions
In order to keep consistency between Magento release lines (2.1, 2.2, 2.3, etc), there are two techniques of code delivery: back-port and/or up-port. Every Magento Contributor, who wants to deliver their solution across all Magento versions, faces the same problem. How do you port fixes easily?
We provide two options to create back-ports and up-ports for your code contributions:
- Magento Porting Tool - Quick and easy method with a few clicks in a Magento tool
- Manual porting - Manual process requiring a strong understanding of Git
Creating back-ports and up-ports are recommended and a best practice, but not required to contribute code. Anyone can create a back-port and up-port for a merged pull request, however, original pull request authors receive higher priority if there are duplicate ports.
What are up-ports and back-ports?
As a best practice, we recommend creating back-ports and up-ports for your code contributions.
Back-ports (or Backports) contribute your code and fixes to a lower release line. You want to create a back-port if the issue exists in a lower release line. If you fixed an issue in a release line and there is a supported lower version, create a pull request to that lower release line to address the issue. For example, you may have contributed a fix to 2.3 and back-port to 2.2 and 2.1.
Up-ports (or Forwardports) contribute your code and fixes to a higher release line. You want to create an up-port if the issue exists in a higher release line. If you have an issue fixed in a non-latest release line, create a pull request to the latest branch in order to address that issue in an upcoming minor release. For example, you may have contributed a fix to 2.1 and up-port to 2.2 and 2.3. We recommend contributors create an up-port for every pull request delivered to a lower release line.
Magento Porting Tool
This tool ports fixes automatically across versions with a few simple steps. It allows you to create ports only for merged pull requests.
Access the tool at porting.engcom.dev.magento.com. The first time you visit, you need to login and authorize with GitHub credentials. The tool performs all actions using your token.
- Visit porting.engcom.dev.magento.com and Login with GitHub.
- Copy and paste the pull request URL in Select Pull Request for porting and click Next.
- Select the target version for your port: Up Port or Back Port.
- Verify the summary of changes in Port information.
- Click Create Job. A job is created and started shortly after.
The results of porting include the following:
- Done - Your port has been successfully created.
- Fail - The patch failed to apply automatically, usually due to merge conflict.
In case of failure, porting artifacts will be available for download and review:
- Log - Includes information on actions and results. Find the reason why the porting job failed.
- Patch - Use to manually apply the patch and resolve all merge conflicts.
The Activity Log provides a tracked list of all ported pull requests and details. You can track the port job status and view results. Refresh and review the list automatically per a selected interval (10 sec, 30 sec, 1 min, 5 min) or manually.
The tool includes configuration settings through the gear icon located top right.
- Use my fork as target - When checked, your fork is used to push the result. This is selected by default.
- Target options - If you do not use your fork as a target (not checked), manually specify an organization and repository for ported commits.
- Porting strategy - Sets the Git commands and method for committing the code port:
git am
– Recommended. When selected, authorship and original commit message will be saved. This command is used to port.git apply
– A new commit will be created with a default message. GitHub provided patch is applied withgit apply
. Important: This is an experimental strategy and results may vary.
Manual porting
When manually porting, you use Git commands to create branches and pull requests. This option may require a strong understanding of Git.
The following is an example “Forwardport” (up-port) pull request for https://github.com/magento/magento2/pull/13528 from the 2.2-develop
branch to the 2.3-develop
branch:
- Checkout the
2.3-develop
branch. Make sure that you have the latest changes from the magento/magento2 repository. - Create a new branch for your fix:
git checkout -b up-port-pull-13528
. - Apply changes from the existing pull request:
curl -L https://github.com/magento/magento2/pull/13528.patch | git am
. - Push changes to your repository:
git push origin up-port-pull-13528:up-port-pull-13528
. - Create a pull request from
<your-fork>:up-port-pull-13528
tomagento:2.3-develop
. - In the up-port pull request description, add the full path to the original pull request (for example: https://github.com/magento/magento2/pull/13528) to help the Magento team link these pull requests.
The following Git commands detail how to up-port to 2.3-develop
branch from 2.2-develop
branch:
1
2
3
4
git checkout 2.3-develop
git checkout -b up-port-pull-<PR_NUMBER>
curl -L https://github.com/magento/magento2/pull/<PR_NUMBER>.patch | git am
git push origin up-port-pull-<PR_NUMBER>:up-port-pull-<PR_NUMBER>
The following Git commands detail how to back-port to 2.2-develop
branch from 2.3-develop
branch:
1
2
3
4
git checkout 2.2-develop
git checkout -b back-port-pull-<PR_NUMBER>
curl -L https://github.com/magento/magento2/pull/<PR_NUMBER>.patch | git am
git push origin back-port-pull-<PR_NUMBER>:back-port-pull-<PR_NUMBER>
Report an issue
If you find a bug in Magento 2 code, you can report it by creating an issue in the Magento 2 repository. We recommend creating an issue prior to providing a PR fix, to properly validate the issue and verify any duplicates.
Before creating an issue:
- Read the issue reporting guidelines to learn how to create an issue that can be processed in a timely manner.
- Check the documentation to make sure the behavior you are reporting is really a bug, not a feature.
- Check the existing issues to make sure you are not duplicating somebody’s work.
To add an issue:
-
In the Magento 2 public repository, click the Issues tab.
-
Click New issue.
- Select a type of issue: Bug report, Developer experience issue, or Feature request.
- Fill in the Title, description, and additional information for the template.
- Click Submit new issue.
When you submit the issue, a validation process begins. If the issue doesn’t have enough information, you as the Reporter may need to add more information. See GitHub Issues Processing Workflow for complete details on issue verification.
Help triage issues
In addition to contributing code, you can help to triage issues. This can include reproducing bug reports or asking for vital information, such as affected versions or instructions to reproduce bugs. If you would like to start triaging issues, one easy way to get started is to subscribe to Magento on CodeTriage.
Labels applied by the Magento team
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. The following information details global labels used in Magento 2 repositories and across Community Engineering contributions.
Release Lines
Release line labels indicate the specific Magento release lines affected by the issue or PR. For example, if working on a fix for 2.2.6, you would apply the Release Line: 2.2. This effectively includes all releases in this line.
Release Line: 2.2
Release Line: 2.3
Progress
Progress labels indicate the Pull Request status on each review stage:
Progress: needs update
- The Community Engineering Team needs additional information from the reporter to properly prioritize and process the pull request.Progress: on hold
- The pull request is on hold due and will be further reviewed to accept or reject.Progress: accept
- The pull request has been accepted and will be merged into mainline code.Progress: reject
- 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.
Contribution awards
The level of investigation, research, and work required for a task may differ. Contribution Rewards labels indicate what type of contribution awards will be applied when completing an issue and PR. Some awards will provide higher points and rewards than others.
Award: complex
Award: advanced
Award: special achievement
Award: category of expertise
Award: test coverage
Award: devdocs update
Award: MFTF test coverage
Award: bug fix
Cleanup
Port
Partners
All partners Pull Requests should be marked with label partners-contribution
. Additionally, add a partner label for PRs submitted by specific Partners. Use the format: Partner: <PartnerName>
. The following are Partner examples:
Example labels:
partners-contribution
Partner: Atwix
Partner: Comwrap
Partner: Interactiv4
Partner: Wagento
Components
Component labels indicate the components affected by the Pull Request. To learn more about available components and assigned architects, see Magento Components Assignment.
Example labels:
Component: Catalog
Component: Report
Component: Checkout
For edge cases, Component: Other
and Component: Multiple
may be used.
Events
Event labels mark recommended issues and submitted PRs for a specific event. Events may include Contribution Days, Hackathons, Imagine, special events like Smashtoberfest, and others. Contributors and Maintainers can easily locate code when attending those events. Some events may also have a Community Engineering Slack channel using the same label.
Example labels:
Event: mm18in
Event: mm17es
Event: mlau18
General
General labels include a variety of tasks and definitions for pull requests and issues.
good first issue
- Indicates a good issue for first-time contributors.help wanted
- Indicates the creator or author needs help with a decision, advice for resolving, and so on.triage wanted
- Indicates the issues are under triage. See this information to learn more about the Triage Wanted program.
Issue Resolution Status
Labels applied to issues through verification and completion. For details on the process, see GitHub Issues Processing Workflow.
Issue: Format is not valid
- Gate 1 failed. Automatic verification by the Automated Contributor Assistant failed and the issue needs updates. The format of the issue description and minimum required information is not provided: Preconditions, Steps to Reproduce, Actual Result, Expected Result. Previous labelG1 Failed
.Issue: Format is valid
- Gate 1 passed. Automatic verification by the Automated Contributor Assistant passed for all issue content. Previous labelG1 Passed
.Issue: Clear Description
- Gate 2 passed. The Community Engineering Team has confirmed that this issue contains the minimum required information to reproduce. Previous labelG2 Passed
.Issue: Cannot Reproduce
- Gate 3 failed. The issue could not be reproduced or validated. Previous labelCannot Reproduce
.Issue: Confirmed
- Gate 3 passed. Manual verification of the issue description and reproduction steps was confirmed. Previous labelG3 Passed
.Issue: Ready for Work
- Gate 4 passed. The issue is acknowledged and added to the backlog for open development. Previous labelacknowledged
.Reproduced on 2.2.x
- The Community Engineering Team reproduced the issue on latest 2.2.x release.-
Reproduced on 2.3.x
- The Community Engineering Team reproduced the issue on latest 2.3.x release. Fixed in 2.2.x
- The issue has been fixed in one of the 2.2.x releases or in 2.2-develop branch and will be available with the upcoming patch release.Fixed in 2.3.x
- The issue has been fixed in one of the 2.3.x releases or in 2.3-develop branch and will be available with the upcoming patch release.non-issue
- A described behavior in the issue description is valid and shouldn’t be changed in Magento code base.
DevDocs
All contributions to DevDocs receive the following labels:
New topic
- New file submissions for content that has never existed on devdocsMajor update
- Significant updates to existing content, such as a new section or exampleTechnical
- Updates to the code or processes that alter the technical content of the documentEditorial
- Fixes for typos, grammatical inconsistencies, or minor rewrites to correct inaccuracies.
Contribution awards and points
Magento is thankful for all contributions, and we always recognize our most active members. The aim is to find and recognize our top contributors according to points awarded during a given time period (monthly/quarterly/yearly). Contributors can earn points in numerous ways with a focus in pull requests to the backlog and special projects.
The Community Engineering team assesses each Pull Request and determines the best awards for the work involved. Contribution Points are calculated according to the assessment results. We award points when the PR is merged.
How points are awarded
Every merged PR receives one base achievement and potentially one or more additional achievements. These achievements are applied to PRs during review and assessment. Contributors and Maintainers receive points after the PR has been merged.
Due to the level of work required for developing and reviewing a PR, Contributors and Maintainers receive the same amount of points.
See the following examples for calculated reward points:
- Contributor submits PR with complex code contributions: Improvement(base) 10 points + Complex(additional) 20 points = 30 points
- Contributor submits PR with complex code and tests: Improvement(base) 10 points + Complex(additional) 20 points + Test coverage(additional) 10 points = 40 points
- Contributor submits PR port of existing merged PR:
- Original contributor: (Improvement(base) 10 points + Complex(additional) 20 points) + Author of Ported Issue 5 points = 35 points
- Porting contributor: Port(base) 5 points
- Maintainer reviews and approves PR with complex code and tests: Improvement(base) 10 points + Complex(additional) 20 points + Test coverage(additional) 10 points = 40 points
Earned achievements display as labels on GitHub PRs and for each Magento Contributor, Partner, and Maintainer on magento.com.
Base achievements
Every merged PR receives one base achievement.
Achievement | Points | Description |
---|---|---|
Improvement | 10 | Contribution contains code improvements, refactoring, or a bug fix. |
Port | 5 | Contribution ports an existing solution between release lines. The author of the original PR receives an additional 5 points when another person contributes the ported Pull Request. |
Code Cleanup | 1 | Contribution contains code cleanup such as typos, inline documentation, coding style, remove unused code, minor style/design fixes, and so on. |
Additional achievements
Every PR may receive several additional achievements during assessment.
Achievement | Points | Description |
---|---|---|
Advanced | 30 | Contribution provides new features. For example: introducing a new CLI command, integration with the new payment or shipping methods, and so on |
Complex | 20 | Contribution contains complete refactoring of legacy code, improvements to application design, updates to libraries, and so on |
Special achievement | 20 | Contribution earns recognition in a specific category. For example: extensive tests coverage, improved framework design, improved APIs or API coverage, improved customizability, and so on |
Test coverage | 10 | Contribution contains fix or improvement and new tests or test cases |
MFTF test coverage | 10 | Contribution contains MFTF tests |
Bug fix | 10 | Contribution fixes one or more known issues from GitHub |
Author of Ported Issue | 5 | Additional points for a contribution that ports (up or back port) a previous PR across release lines by another contributor |
Issue Triage | 3 | Public issue report is verified and confirmed |
DevDocs awards and points
Contributors and Maintainers can also earn rewards for merged submissions to the DevDocs repository. These earned points add to contributor totals. Like code contributions, the DevDocs team assesses the PRs and applies labels to determine the level of work and achievements. Each PR receives one base achievement and potentially additional achievements.
See the following examples for calculated reward points:
- Contributor submits PR with HTML formatting and typos fixes: Editorial(base) 1 point
- Contributor submits PR with code sample update and new parameter descriptions: Improvement(base) 10 points + Major update(additional) 20 points = 30 points
Base achievements
Every merged PR to the DevDocs repository receives one base achievement. If you enter a PR with editorial fixes and new content, you receive the Improvement and additional achievements.
Achievement | Points | Description |
---|---|---|
Improvement | 10 | Contribution contains document improvements, adding missing features of inconsistency between code base and documentation, and so on. |
Editorial | 1 | Contribution contains fixes only for typos, grammatical inconsistencies, or minor rewrites to correct inaccuracies. |
Additional achievements
Each PR can earn one of the following additional achievements. If you entered an editorial PR, you may not receive an additional achievement.
Achievement | Points | Description |
---|---|---|
New topic | 30 | New file submissions for content that has never existed on devdocs |
Major update | 20 | Significant updates to existing content, such as a new section or example |
Technical | 10 | Updates to code or processes that alter the technical content of the document |