We've all been there. You're sitting down having an amazing coding session without a care in the world when suddenly an ugly bug rears its head from the depths of Laravel. First thing that comes to mind: god dammit! After a while (sometimes it's longer then a while) you find the source of the bug and luckily for you it's a relatively simple fix. So you patch it up on off you go on your merry way.
"Wait up there, you selfish person you!" says your conscience. "You're just going to leave all those other wonderful, brilliant, and amazing Laravel coders to fend for themselves!? They need you mon!" Wondering why your conscience seems to be Jamaican you decide to submit an issue on GitHub. But didn't you just fix it yourself? Why not contribute your fix to the community and save others the time. That sounds like a much better idea, ninety nine!
So you decided to contribute, that's great! That was a rather long winded introduction actually, sorry about that. In this guide I want to cover an important aspect of any open source project: contributing. Contributing to Laravel is actually quite easy, but a lot of people don't get it (or don't want to, that was me).
This was written about Laravel but can be used for any project, just replace Laravel with the project you want to contribute to!
To start off you'll need your own fork of Laravel. Login to GitHub and find the Laravel repository. To fork the project click the "Fork" button near the top right of the page.
Great you should now be taken to your fork of the project. We need to get a clone of Laravel and add our fork as a remote so we can begin submitting bug fixes and features. Confused? Read on!
This should be fairly straightforward if you've used Git before. Open up your terminal or client (I'll be using the command line for the examples) and
cd to where you want to clone Laravel. Instead of cloning down the actual Laravel repository we'll clone our fork.
$ cd ~/projects $ git clone firstname.lastname@example.org:username/laravel.git laravel-fork
Remember to replace
username with your own GitHub username.
Some things will happen and numbers will be crunched. Afterwards you should now have your Laravel fork cloned into your new directory.
Now it's time to add the Laravel repository as our upstream remote. To do that we'll use the
git remote add command.
$ git remote add upstream https://github.com/laravel/laravel.git
You can check that the remote was added by simply typing
git remote -v which should show two remotes, origin and upstream.
Branching for Pulls
This is where the magic happens. There are a couple of things you need to do before submitting a pull.
Firstly you need to make sure you're on the develop branch. This is extremely important. Always, always make sure you're on the develop branch! Why you ask? Because pulls that have been branched off the master branch generally won't be pulled in. Commits piggy-back there way in and things just look awful. The master branch is considered the stable release of Laravel. Your patch (while it may work and be perfectly stable) won't be merged into the master branch until another stable release of Laravel is tagged. So always make sure you're on the develop branch before continuing, you can switch to the develop branch like so.
As an aside, this will vary depending on the project. Make sure you read any contributing guidelines for the project you're working on.
$ git checkout develop
If this is the first time you've checked out the develop branch you should get a message.
Branch develop set up to track remote branch develop from origin. Switched to a new branch 'develop'
Secondly you need to make sure you are up to date with the upstream remote (that's the Laravel repository, remember). This is easy, all you need to do is run a
$ git pull upstream develop
Most of the time you should get an already up to date message, sometimes it will pull in the most recent changes that have been merged with the branch.
You should now be ready to branch off and begin fixing bugs and adding features. Let's say we found a bug in Eloquent. Here is how we could branch off the develop branch and begin fixing the bug.
$ git checkout -b bug/eloquent Switched to a new branch 'bug/eloquent'
You can be somewhat descriptive with your names, append numbers or whatever makes it easier for you. Say you want to add a feature, you might do it like so.
$ git checkout -b feature/your-cool-feature Switched to a new branch 'feature/your-cool-feature'
Now that you're on the correct branch you can make any changes you need to fix the bug or add the feature.
Before you go committing your snazzy new changes there's something you should be aware of. All commits must use the
-s switch which will automatically sign off on your commit. This just tells the Laravel team that you agree to your code being used in the Laravel core.
Say we changed the
app/Http/routes.php file. We can sign off on it and add a commit message.
$ git add app/Http/routes.php $ git commit -s -m "Made some changes to the default routing setup."
You may need to setup your GitHub username and password in Git for signing off to work correctly.
Pushing to your Fork
Once so you've finished whatever it is you want to submit and committed your code you'll now want to push it to your fork so you can submit a pull request.
Let's use the Eloquent bug example from before. Here is how you would push to your fork.
$ git push origin bug/eloquent
That's so darn easy!
Submit the Pull Request
The final step to contributing your code is submitting a pull request. From your forked repository on GitHub you need to click the "Pull Request" button.
You'll now be able to select what you want to merge and to where. Remember that you need to select the develop branch on the base repo (Laravel), and the branch you made on the head repo (your Laravel fork).
You'll then be shown the files changed and the commits which you can check to ensure everything is as it should be. Make sure you don't get any piggy backing commits! Only the commits you committed yourself should be there. You can also title your pull. Ensure your title is informative and give a good description, including use cases where applicable. Remember! Providing as many details as possible will ensure less questions are asked and will help team members get your changes merged as quickly as possible.
Perhaps now you have another bug you'd like to fix or feature you'd like to add. Remember to always base your branches off the develop branch. So head on back over there and pull down any changes.
$ git checkout develop $ git pull upstream develop
You're now good to go for your next branch. Rinse and repeat the steps above and you'll be on your way. Once your pull request has been merged you're safe to delete your branch.
Don't use the same branch for multiple fixes or features. Have a separate branch for each!
That's all there is to it. Hopefully this guide has been useful to those who were once unsure or afraid to send pull requests. Don't be afraid! Some may have submitted pulls before but they never got merged into the core. Don't worry about it, the core team is growing and issues/pulls are being taken very seriously.
There are a couple things you can do to increase the chances of your pull being merged.
- Follow the same coding style that Laravel already uses. Make sure you study it thoroughly and ensure that your code conforms. This includes bracket placements, spacing of code, etc.
- Providing good examples and use cases in the description will make the entire process a lot easier.
- If you're submitting a feature, post links to any existing discussions on the feature for reference.
Best of luck!