Skip to content

Latest commit

 

History

History
254 lines (182 loc) · 8.2 KB

CONTRIBUTING.md

File metadata and controls

254 lines (182 loc) · 8.2 KB
Raw

CONTRIBUTING

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 create a proposal.

Reporting Potential Security Issues

If you have encountered a potential security vulnerability, please DO NOT report it on the public issue tracker: send it to us at [email protected] 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.

RUNNING TESTS

Note: testing versions prior to 2.4

This component originates with Zend Framework 2. During the lifetime of ZF2, testing infrastructure migrated from PHPUnit 3 to PHPUnit 4. In most cases, no changes were necessary. However, due to the migration, tests may not run on versions < 2.4. As such, you may need to change the PHPUnit dependency if attempting a fix on such a version.

To run tests:

  • Clone the repository:

    $ git clone [email protected]:zendframework/zend-ldap.git
$ cd

  • Install dependencies via composer:

    $ curl -sS https://getcomposer.org/installer | php --
$ ./composer.phar install

    If you don't have curl installed, you can also download composer.phar from https://getcomposer.org/

  • Run the tests via phpunit and the provided PHPUnit config, like in this example:

    $ ./vendor/bin/phpunit

You can turn on conditional tests with the phpunit.xml file. To do so:

  • Copy phpunit.xml.dist file to phpunit.xml
  • Edit phpunit.xml to enable any specific functionality you want to test, as well as to provide test values to utilize.

Execute tests against a real LDAP server

This project provides a Vagrant virtual machine definition with an OpenLDAP server installed and configured.

To execute the tests against this server, do the following steps (which assume you have Vagrant > 1.6 installed)

  1. Run the virtual machine with the LDAP server: vagrant up
  2. Copy phpunit.xml.dist to phpunit.xml.
  3. Edit phpunit.xml to set the config value TESTS_ZEND_LDAP_ONLINE_ENABLED value to true.
  4. Run the unit tests using ./vendor/bin/phpunit.

When done, you can halt the LDAP server using vagrant halt.

Alternate testing approach

The PHPUnit config file defines environment variables, which allows users on unix-like systems to simplify steps 2-4 to:

$ TESTS_ZEND_LDAP_ONLINE_ENABLED=true ./vendor/bin/phpunit

Running Coding Standards Checks

This component uses php-cs-fixer for coding standards checks, and provides configuration for our selected checks. php-cs-fixer is installed by default via Composer.

To run checks only:

$ ./vendor/bin/php-cs-fixer fix . -v --diff --dry-run --config-file=.php_cs

To have php-cs-fixer attempt to fix problems for you, omit the --dry-run flag:

$ ./vendor/bin/php-cs-fixer fix . -v --diff --config-file=.php_cs

If you allow php-cs-fixer to fix CS issues, please re-run the tests to ensure they pass, and make sure you add and commit the changes after verification.

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.

  1. Setup a GitHub account, if you haven't yet

  2. Fork the repository (http://github.com/zendframework/zend-ldap)

  3. Clone the canonical repository locally and enter it.

    $ git clone git://github.com:zendframework/zend-ldap.git
$ cd zend-ldap

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

    $ git remote add {username} [email protected]:{username}/zend-ldap.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:

  1. Create a new local branch based off either your master or develop branch.
  2. Switch to your new local branch. (This step can be combined with the previous step with the use of git checkout -b.)
  3. Do some work, commit, repeat as necessary.
  4. Push the local branch to your remote repository.
  5. 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://[email protected]/{username}/zend-ldap.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:

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>