Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into feature/bookdown_docs
- Loading branch information
Showing
22 changed files
with
652 additions
and
214 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,2 +1,4 @@ | ||
| cache/ | ||
| docs/html/ | ||
| vendor/ | ||
| build/ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,187 @@ | ||
| # CONTRIBUTING | ||
|
|
||
| ## Resources | ||
|
|
||
| If you wish to contribute to Disco, please be sure to | ||
| read/subscribe to the following resources: | ||
|
|
||
| - [The PSR-2 Coding Standard](http://www.php-fig.org/psr/psr-2/) | ||
| - The Disco Contributor's IRC channel: #disco.dev on Freenode.net | ||
|
|
||
| If you are working on new features or refactoring [create a proposal](https://github.com/bitExpert/disco/issues/new). | ||
|
|
||
| ## 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 [opensource@bitexpert.de](mailto:opensource@bitexpert.de) 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](http://pgp.mit.edu/pks/lookup?op=vindex&search=0x6DE7F8597CECDF13). | ||
|
|
||
| ## Running Tests | ||
|
|
||
| To run tests: | ||
|
|
||
| 1. Clone the repository: | ||
|
|
||
| ```console | ||
| $ git clone git@github.com:bitExpert/disco.git | ||
| $ cd disco | ||
| ``` | ||
|
|
||
| 2. Install dependencies via composer: | ||
|
|
||
| ```console | ||
| $ ./composer.phar install | ||
| ``` | ||
|
|
||
| If you don't have `curl` installed, you can also download `composer.phar` from https://getcomposer.org/download/ | ||
|
|
||
| 3. Run the tests using the "test" command shipped in the `composer.json`: | ||
|
|
||
| ```console | ||
| $ composer test | ||
| ``` | ||
|
|
||
| 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. | ||
|
|
||
| ## Running Coding Standards Checks | ||
|
|
||
| First, ensure you've installed dependencies via composer, per the previous section on running tests. | ||
| To run CS checks only: | ||
|
|
||
| ```console | ||
| $ composer cs-check | ||
| ``` | ||
|
|
||
| To attempt to automatically fix common CS issues: | ||
|
|
||
| ```console | ||
| $ composer cs-fix | ||
| ``` | ||
|
|
||
| If the above fixes any 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](https://github.com), as that is where the component is already hosted. | ||
|
|
||
| 1. Setup a [GitHub account](http://github.com/), if you haven't yet | ||
| 2. Fork the repository (http://github.com/bitExpert/disco) | ||
| 3. Clone the canonical repository locally and enter it. | ||
|
|
||
| ```console | ||
| $ git clone git://github.com:bitExpert/disco.git | ||
| $ cd disco | ||
| ``` | ||
|
|
||
| 4. Add a remote to your fork; substitute your GitHub username in the command | ||
| below. | ||
|
|
||
| ```console | ||
| $ git remote add {username} git@github.com:{username}/disco.git | ||
| $ git fetch {username} | ||
| ``` | ||
|
|
||
| ### Keeping Up-to-Date | ||
|
|
||
| Periodically, you should update your fork or personal repository to match the canonical Disco repository. | ||
| Assuming you have setup your local repository per the instructions above, you can do the following: | ||
|
|
||
| ```console | ||
| $ 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 you'll want to do the same operations for those branches; simply substitute the branch names 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 your master 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. | ||
|
|
||
| ```console | ||
| $ git checkout -b hotfix/9295 | ||
| Switched to a new branch 'hotfix/9295' | ||
| ``` | ||
|
|
||
| ...do some work... | ||
|
|
||
| ```console | ||
| $ git commit | ||
| ``` | ||
|
|
||
| ...write your log message... | ||
|
|
||
| ```console | ||
| $ 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}/disco.git | ||
| b5583aa..4f51698 HEAD -> master | ||
| ``` | ||
| ### Sending a PR | ||
|
|
||
| Before sending a PR, run `composer.phar validate && composer.phar check`, as the Travis build will also run the command and will fail if the composer.lock file is not up-to-date with the changes in the composer.json file. | ||
|
|
||
| When you’ve done that, and you’re reading to send one, you have two options: | ||
|
|
||
| 1. 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 "bitExpert" as the recipient. | ||
|
|
||
| 2. 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. | ||
|
|
||
| #### 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 latest release 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 "master" 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 | ||
|
|
||
| ```console | ||
| $ git branch -d <branchname> | ||
| ``` | ||
|
|
||
| - Remote branch removal | ||
|
|
||
| ```console | ||
| $ git push {username} :<branchname> | ||
| ``` |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.