Skip to content

Commit c331802

Browse files
authored
Merge pull request #190 from toniperic/contribution
Versioning and contribution documentation
2 parents 59881ac + b23fddb commit c331802

File tree

3 files changed

+69
-42
lines changed

3 files changed

+69
-42
lines changed

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
All notable changes to this project will be documented in this file.
33

44
The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
5-
and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
5+
and this project [adheres to Semantic Versioning, but only for the public API](README.md#versioning).
66

77
## [3.1.1] - 2020-04-10
88
### Removed

CONTRIBUTING.md

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
# Contributing
2+
3+
All contributions are **welcome** and **very much appreciated**.
4+
5+
We accept contributions via Pull Requests on [Github](https://github.com/trikoder/oauth2-bundle).
6+
7+
## Pull Request guidelines
8+
9+
- **Add tests!** - We strongly encourage adding tests as well since the PR might not be accepted without them.
10+
11+
- **Document any change in behaviour** - Make sure the `README.md` and any other relevant documentation are kept up-to-date.
12+
13+
- **One pull request per feature** - If you want to do more than one thing, send multiple pull requests.
14+
15+
- **Send coherent history** - Make sure each individual commit in your pull request is meaningful. If you had to make multiple intermediate commits while developing, please [squash them](http://www.git-scm.com/book/en/v2/Git-Tools-Rewriting-History#Changing-Multiple-Commit-Messages) before submitting.
16+
17+
## Development
18+
19+
[Docker](https://www.docker.com/) 18.03+ and [Docker Compose](https://github.com/docker/compose) 1.13+ are required for the development environment.
20+
21+
### Building the environment
22+
23+
Make sure your Docker images are all built and up-to-date using the following command:
24+
25+
```sh
26+
dev/bin/docker-compose build
27+
```
28+
29+
> **NOTE:** You can target a different version of PHP during development by appending the `--build-arg PHP_VERSION=<version>` argument.
30+
31+
After that, install all the needed packages required to develop the project:
32+
33+
```sh
34+
dev/bin/php composer install
35+
```
36+
37+
### Debugging
38+
39+
You can run the debugger using the following command:
40+
41+
```sh
42+
dev/bin/php-debug vendor/bin/phpunit
43+
```
44+
45+
Make sure your IDE is setup properly, for more information check out the [dedicated documentation](docs/debugging.md).
46+
47+
### Code linting
48+
49+
This bundle enforces the PSR-2 and Symfony code standards during development by using the [PHP CS Fixer](https://cs.sensiolabs.org/) utility. Before committing any code, you can run the utility to fix any potential rule violations:
50+
51+
```sh
52+
dev/bin/php composer lint
53+
```
54+
55+
### Testing
56+
57+
You can run the whole test suite using the following command:
58+
59+
```sh
60+
dev/bin/php-test composer test
61+
```
62+
63+
**Happy coding**!

README.md

Lines changed: 5 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -153,51 +153,15 @@ security:
153153
* [Password grant handling](docs/password-grant-handling.md)
154154
* [Implementing custom grant type](docs/implementing-custom-grant-type.md)
155155
156-
## Development
156+
## Contributing
157157
158-
[Docker](https://www.docker.com/) 18.03+ and [Docker Compose](https://github.com/docker/compose) 1.13+ are required for the development environment.
158+
Please see [CONTRIBUTING](CONTRIBUTING.md) for details.
159159
160-
### Building the environment
160+
## Versioning
161161
162-
Make sure your Docker images are all built and up-to-date using the following command:
162+
This project adheres to [Semantic Versioning 2.0.0](http://semver.org/). Randomly breaking public APIs is not an option.
163163
164-
```sh
165-
dev/bin/docker-compose build
166-
```
167-
168-
> **NOTE:** You can target a different version of PHP during development by appending the `--build-arg PHP_VERSION=<version>` argument.
169-
170-
After that, install all the needed packages required to develop the project:
171-
172-
```sh
173-
dev/bin/php composer install
174-
```
175-
176-
### Testing
177-
178-
You can run the test suite using the following command:
179-
180-
```sh
181-
dev/bin/php-test composer test
182-
```
183-
184-
### Debugging
185-
186-
You can run the debugger using the following command:
187-
188-
```sh
189-
dev/bin/php-debug vendor/bin/phpunit
190-
```
191-
192-
Make sure your IDE is setup properly, for more information check out the [dedicated documentation](docs/debugging.md).
193-
194-
### Code linting
195-
196-
This bundle enforces the PSR-2 and Symfony code standards during development using the [PHP CS Fixer](https://cs.sensiolabs.org/) utility. Before committing any code, you can run the utility so it can fix any potential rule violations for you:
197-
198-
```sh
199-
dev/bin/php composer lint
200-
```
164+
However, starting with version 4, we only promise to follow SemVer on structural elements marked with the [@api tag](https://github.com/php-fig/fig-standards/blob/2668020622d9d9eaf11d403bc1d26664dfc3ef8e/proposed/phpdoc-tags.md#51-api).
201165
202166
## Changes
203167

0 commit comments

Comments
 (0)