Skip to content

Latest commit

 

History

History
executable file
·
185 lines (123 loc) · 6.37 KB

CONTRIBUTING.md

File metadata and controls

executable file
·
185 lines (123 loc) · 6.37 KB
Raw

Contributing to FuelPHP

Any person or company wanting to contribute to FuelPHP should follow the following rules to increase the chance of the contribution being accepted.

Sign your Work

We require that all contributors "sign-off" on their commits. This certifies that the contribution is your original work, or you have rights to submit it under the same license, or a compatible license.

Any contribution which contains commits that are not Signed-Off will not be accepted.

To sign off on a commit you simply use the --signoff (or -s) option when committing your changes:

$ git commit -s -m "Adding a new widget driver for cogs."

This will append the following to your commit message:

Signed-off-by: Your Name <your@email.com>

By doing this you certify the below:

Developer's Certificate of Origin 1.1

By making a contribution to this project, I certify that:

(a) The contribution was created in whole or in part by me and I
    have the right to submit it under the open source license
    indicated in the file; or

(b) The contribution is based upon previous work that, to the best
    of my knowledge, is covered under an appropriate open source
    license and I have the right under that license to submit that
    work with modifications, whether created in whole or in part
    by me, under the same open source license (unless I am
    permitted to submit under a different license), as indicated
    in the file; or

(c) The contribution was provided directly to me by some other
    person who certified (a), (b) or (c) and I have not modified
    it.

(d) I understand and agree that this project and the contribution
    are public and that a record of the contribution (including all
    personal information I submit with it, including my sign-off) is
    maintained indefinitely and may be redistributed consistent with
    this project or the open source license(s) involved.

Quick Tip

If you would like to Sign-Off on all of your commits automatically (not recommended unless you are 100% sure). To do this, you can simply create an alias for git commit -s:

$ git config --global alias.cs 'commit -s'

If you wish to only include this for your current repository, simply leave the --global option off:

$ git config alias.cs 'commit -s'

Now you can Sign-Off on all of your commits if you commit with git cs.

Creating and Submitting Contributions

FuelPHP uses the Git version control system and hosts it's repositories on GitHub. All contributions are submitted using the GitHub Pull Request system. No contributions are accepted via email or the community forums.

FuelPHP takes advantage of Git submodules. They allow for the separation of the components and packages into individual repositories, making it easier for development and upgrades.

Setting Up Your Local Environment

To get started, you first need to Fork the repository you wish to contribute to on GitHub by visiting the the repository GitHub and clicking the "Fork" button.

Note: We will assume throughout this document that you are contributing to the core repository.

Once you have setup your Fork you are ready to clone it and start working:

  1. Start by cloning your Fork:

    $ git clone git@github.com:USERNAME/core.git

  2. Next you need to add the original repository as a new remote named upstream:

    $ cd core
$ git remote add upstream git://github.com/fuel/core.git
$ git fetch upstream

Developing with Contribution in Mind

When developing with the intent for contribution, there are a few things to keep in mind:

  1. All contributions must be made on the appropriate branch. Most of the time, this will be the develop branch for the appropriate version.

    The best way to do this is to make a branch off of the current version's develop branch:

    $ git checkout BRANCH_NAME 1.6/develop

    Note: If the contribution is submitted to the wrong branch, you will be asked to re-submit on the correct branch.

  2. Ensure you follow the FuelPHP Coding Standards.

  3. Unit Tests should be submitted with the contribution if applicable.

  4. A separate complimentary contribution should be submitted to the doc repository containing the documentation for your change if applicable.

  5. Write good commit messages (no "Some changes" type messages please).

Submitting your Contribution

After you are done making all of your changes, you need to push them up to your Fork on GitHub, but first you need to update your branch with any changes from the original repository.

When updating your branch, you should use rebase and not merge in the changes:

  1. Update your 1.6/develop branch with changes from upstream:

    $ git checkout 1.6/develop
$ git fetch upstream
$ git merge upstream/1.6/develop

  2. Rebase your branch with the 1.6/develop branch:

    $ git checkout BRANCH_NAME
$ git rebase 1.6/develop

    You may get merge conflicts while running the rebase command. Resolve all conflicts, then continue the rebase:

    $ git add ...
$ git rebase --continue

Once the rebase is complete, you are ready to push your changes up to GitHub:

$ git push origin BRANCH_NAME

Now visit your Fork on GitHub (https://github.com/USERNAME/core), switch to your new branch, then click the "Pull Request" button.

In your Pull Request message you should give as much detail as you can, including any related links (Issues, Forum Threads, etc.).

After Submission

After submission, you may need to make changes after discussions on the Pull Request. If this is the case, there are a few things you need to be aware of or do.

  1. After making your changes and committing them locally, you need to Rebase your branch with the the upstream/1.6/develop branch:

    $ git rebase -f upstream/1.6/develop

  2. You will need to Force Push your changes up to GitHub. This will automatically update your Pull Request:

    $ git push -f origin BRANCH_NAME

Once we are satisfied, we will merge and close your Pull Request.

Resources

If you have any questions, you can usually find at least one of the core developers in our IRC channel: #fuelphp on FreeNode