-
You need to fork this repository to your own GitHub account so you can open PRs to YOUR FORK and merge without conflicts. Click on the fork button on the top right corner of this repository.
Make sure to uncheck the "Copy the production branch only" option.
-
You need your own keys for Magento. During installation you will be guided an instruction on how to get them.
You need to install a module from MarkShust_DisableTwoFactorAuth
.
Click for details
- Clone this repo and setup Magento by running
npm install
andnpm run start
. This is simple CMA app with sample data. - Create a new branch from
production
. - Install the module
- Commit the changes
- Push the changes to your forked repository
- Open a PR to merge the changes to the
dev
branch of your forked repository - Merge the PR (you will need to resolve conflicts) to
dev
branch - Open a PR to merge the changes to the
production
branch of your forked repository - Merge the PR to
production
branch
Image for context:

- The
MarkShust_DisableTwoFactorAuth
module should be installed and working onproduction
anddev
branches. - The
composer.json
andcomposer.lock
files should be updated with the new module. - The
composer.lock
file should be integrable. This means that the SHA in thecomposer.lock
file should be up to date. - The
production
branch shouldn't have any commits, modules or files from thedev
branch.
- You will have to test the repo running
npm run test
to make sure the module is working correctly on bothdev
andproduction
branches.
- Make sure to follow the workflow from the course.
- Make sure to resolve conflicts properly when merging PRs.
- If you have switched branches that have different modules and/or versions installed (AKA different
composer.lock
files), you will need to runcomposer install
make sure thevendor
folder is up to date, since thecomposer.lock
file is integrable. - If you have broken
composer.lock
, you can runcomposer update --lock
to fix it.
- Submit the link to your forked repository with the PRs opened and merged.
- Submit two screenshots of the
npm run test
output for bothdev
andproduction
branches.
- Moodle course for the workflow explanation.
- Make sure you understand how Composer works Composer documentation (and understand package manager logic in abstract)
composer --help
,composer <command> --help
in CLI is giving a lot of useful information too.