CONTRIBUTING to Zend Framework Repositories

This documentation outlines the general procedure for contributing to the various Zend Framework components and repositories.

RESOURCES

If you wish to contribute to Zend Framework, please be sure to read/subscribe to the following resources:

If you are working on new features or refactoring, please create an issue detailing the changes on the relevant component repository, as linked below.

Components

This package is a meta-package, declaring a host of ZF components as dependencies. These are listed below, with links to each repository; most issues and pull requests rightfully belong against the individual components and should be made accordingly.

Reporting Potential Security Issues

If you have encountered a potential security vulnerability, please DO NOT report it on public issue trackers; instead, send it to us at zf-security@zend.com instead. We will work with you to verify the vulnerability and patch it as soon as possible.

When reporting issues, please provide the following information:

Component(s) affected
A description indicating how to reproduce the issue
A summary of the security vulnerability and impact

We request that you contact us via the email address above and give the project contributors a chance to resolve the vulnerability and issue a new release prior to any public exposure; this helps protect users and provides them with a chance to upgrade and/or update in order to protect their applications.

For sensitive email communications, please use our PGP key.

Recommended Workflow for Contributions

Your first step is to establish a public repository from which we can pull your work into the master repository. We recommend using GitHub, as that is where the component is already hosted.

Clone the canonical repository locally and enter it.

$ git clone git://github.com/zendframework/{component}.git
$ cd {component}

Add a remote to your fork; substitute your GitHub username in the command below.

$ git remote add {username} git@github.com:{username}/{component}.git
$ git fetch {username}

Keeping Up-to-Date

Periodically, you should update your fork or personal repository to match the canonical ZF repository. Assuming you have setup your local repository per the instructions above, you can do the following:

$ git checkout master
$ git fetch origin
$ git rebase origin/master
# OPTIONALLY, to keep your remote up-to-date -
$ git push {username} master:master

If you're tracking other branches -- for example, the "develop" branch, where new feature development occurs -- you'll want to do the same operations for that branch; simply substitute "develop" for "master".

Working on a patch

We recommend you do each new feature or bugfix in a new branch. This simplifies the task of code review as well as the task of merging your changes into the canonical repository.

A typical workflow will then consist of the following:

Create a new local branch based off either your master or develop branch.
Switch to your new local branch. (This step can be combined with the previous step with the use of git checkout -b.)
Do some work, commit, repeat as necessary.
Push the local branch to your remote repository.
Send a pull request.

The mechanics of this process are actually quite trivial. Below, we will create a branch for fixing an issue in the tracker.

$ git checkout -b hotfix/9295
Switched to a new branch 'hotfix/9295'

... do some work ...

$ git commit

... write your log message ...

$ git push {username} hotfix/9295:hotfix/9295
Counting objects: 38, done.
Delta compression using up to 2 threads.
Compression objects: 100% (18/18), done.
Writing objects: 100% (20/20), 8.19KiB, done.
Total 20 (delta 12), reused 0 (delta 0)
To ssh://git@github.com/{username}/zf2.git
   b5583aa..4f51698  HEAD -> master

To send a pull request, you have two options.

If using GitHub, you can do the pull request from there. Navigate to your repository, select the branch you just created, and then select the "Pull Request" button in the upper right. Select the user/organization "zendframework" as the recipient.

If using your own repository - or even if using GitHub - you can use git format-patch to create a patchset for us to apply; in fact, this is recommended for security-related patches. If you use format-patch, please send the patches as attachments to:

zf-devteam@zend.com for patches without security implications
zf-security@zend.com for security patches

What branch to issue the pull request against?

Which branch should you issue a pull request against?

For fixes against the stable release, issue the pull request against the "master" branch.
For new features, or fixes that introduce new elements to the public API (such as new public methods or properties), issue the pull request against the "develop" branch.

Branch Cleanup

As you might imagine, if you are a frequent contributor, you'll start to get a ton of branches both locally and on your remote.

Once you know that your changes have been accepted to the master repository, we suggest doing some cleanup of these branches.

Local branch cleanup
```
$ git branch -d <branchname>
```
Remote branch removal
```
$ git push {username} :<branchname>
```