Skip to content

Commit 1018458

Browse files
committed
Merge pull request #25 from php-http/update_package
Update package data
2 parents 53a267f + 81f14ec commit 1018458

File tree

7 files changed

+84
-28
lines changed

7 files changed

+84
-28
lines changed

.editorconfig

+4-5
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
root = true
22

33
[*]
4-
end_of_line = lf
54
charset = utf-8
6-
trim_trailing_whitespace = true
7-
insert_final_newline = true
8-
indent_style = space
5+
end_of_line = lf
96
indent_size = 4
7+
indent_style = space
8+
insert_final_newline = true
9+
trim_trailing_whitespace = true
1010

1111
[*.yml*]
12-
indent_style = space
1312
indent_size = 2

.gitattributes

+1
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,6 @@ spec/ export-ignore
55
.scrutinizer.yml export-ignore
66
.travis.yml export-ignore
77
CONTRIBUTING.md export-ignore
8+
CONDUCT.md export-ignore
89
phpspec.yml.ci export-ignore
910
phpspec.yml.dist export-ignore

.travis.yml

+18-9
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,39 @@
11
language: php
22

3+
sudo: false
4+
5+
cache:
6+
directories:
7+
- $HOME/.composer/cache
8+
39
php:
410
- 5.4
511
- 5.5
612
- 5.6
713
- 7.0
814
- hhvm
915

16+
env:
17+
global:
18+
- TEST_COMMAND="composer test"
19+
1020
matrix:
1121
allow_failures:
1222
- php: 7.0
13-
- php: hhvm
23+
fast_finish: true
1424
include:
1525
- php: 5.5
16-
env:
17-
- COMPOSER_FLAGS="--prefer-stable --prefer-lowest"
18-
- COVERAGE=true
19-
- PHPSPEC_FLAGS="-c phpspec.yml.ci"
26+
env: COMPOSER_FLAGS="--prefer-stable --prefer-lowest" COVERAGE=true TEST_COMMAND="composer test-ci"
2027

21-
install:
28+
before_install:
2229
- travis_retry composer self-update
23-
- if [[ "$TRAVIS_PHP_VERSION" == "5.4" ]]; then composer remove "zendframework/zend-diactoros" --dev --no-update; fi
30+
31+
install:
2432
- travis_retry composer update ${COMPOSER_FLAGS} --prefer-source --no-interaction
2533

26-
script: vendor/bin/phpspec run ${PHPSPEC_FLAGS}
34+
script:
35+
- $TEST_COMMAND
2736

28-
after_script:
37+
after_success:
2938
- if [[ "$COVERAGE" = true ]]; then wget https://scrutinizer-ci.com/ocular.phar; fi
3039
- if [[ "$COVERAGE" = true ]]; then php ocular.phar code-coverage:upload --format=php-clover build/coverage.xml; fi

CONDUCT.md

+22
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
# Contributor Code of Conduct
2+
3+
As contributors and maintainers of this project, and in the interest of fostering an open and welcoming community, we pledge to respect all people who contribute through reporting issues, posting feature requests, updating documentation, submitting pull requests or patches, and other activities.
4+
5+
We are committed to making participation in this project a harassment-free experience for everyone, regardless of level of experience, gender, gender identity and expression, sexual orientation, disability, personal appearance, body size, race, ethnicity, age, religion, or nationality.
6+
7+
Examples of unacceptable behavior by participants include:
8+
9+
* The use of sexualized language or imagery
10+
* Personal attacks
11+
* Trolling or insulting/derogatory comments
12+
* Public or private harassment
13+
* Publishing other's private information, such as physical or electronic addresses, without explicit permission
14+
* Other unethical or unprofessional conduct.
15+
16+
Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct. By adopting this Code of Conduct, project maintainers commit themselves to fairly and consistently applying these principles to every aspect of managing this project. Project maintainers who do not follow or enforce the Code of Conduct may be permanently removed from the project team.
17+
18+
This code of conduct applies both within project spaces and in public spaces when an individual is representing the project or its community.
19+
20+
Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by opening an issue or contacting one or more of the project maintainers.
21+
22+
This Code of Conduct is adapted from the [Contributor Covenant](http://contributor-covenant.org), version 1.2.0, available at [http://contributor-covenant.org/version/1/2/0/](http://contributor-covenant.org/version/1/2/0/)

CONTRIBUTING.md

+26-6
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,9 @@ please be as precise as possible. Here is a little list of required information:
1515

1616
## Security issues
1717

18-
If you discover any security related issues, please contact us at [[email protected]](mailto:[email protected]) instead of submitting an issue on Github. This allows us to fix the issue and release a security hotfix without publicly disclosing the vulnerability.
18+
If you discover any security related issues,
19+
please contact us at the [security email address](../../#security) instead of submitting an issue on Github.
20+
This allows us to fix the issue and release a security hotfix without publicly disclosing the vulnerability.
1921

2022

2123
## Feature requests
@@ -28,7 +30,8 @@ easily understood/implement it.
2830

2931
## Sending a Pull Request
3032

31-
If you're here, you are going to fix a bug or implement a feature and you're the best! To do it, first fork the repository, clone it and create a new branch with the following commands:
33+
If you're here, you are going to fix a bug or implement a feature and you're the best!
34+
To do it, first fork the repository, clone it and create a new branch with the following commands:
3235

3336
``` bash
3437
$ git clone [email protected]:your-name/repo-name.git
@@ -41,7 +44,12 @@ Then install the dependencies through [Composer](https://getcomposer.org/):
4144
$ composer install
4245
```
4346

44-
Write code and tests. When you are ready, find the testing command in the [README](README.md) and execute it. (This is usually [PHPUnit](http://phpunit.de/) or [PHPSpec](http://phpspec.net/))
47+
Write code and tests. When you are ready, run the tests.
48+
(This is usually [PHPUnit](http://phpunit.de/) or [PHPSpec](http://phpspec.net/))
49+
50+
``` bash
51+
$ composer test
52+
```
4553

4654
When you are ready with the code, tested it and documented it, you can commit and push it with the following commands:
4755

@@ -50,11 +58,15 @@ $ git commit -m "Feature or bug fix description"
5058
$ git push origin feature-or-bug-fix-description
5159
```
5260

53-
**Note:** Please write your commit messages in the imperative and follow the [guidelines](http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html) for clear and concise messages.
61+
**Note:** Please write your commit messages in the imperative and follow the
62+
[guidelines](http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html) for clear and concise messages.
5463

5564
Then [create a pull request](https://help.github.com/articles/creating-a-pull-request/) on GitHub.
5665

57-
Please make sure that each individual commit in your pull request is meaningful. If you had to make multiple intermediate commits while developing, please squash them before submitting with the following commands (here, we assume you would like to squash 3 commits in a single one):
66+
Please make sure that each individual commit in your pull request is meaningful.
67+
If you had to make multiple intermediate commits while developing,
68+
please squash them before submitting with the following commands
69+
(here, we assume you would like to squash 3 commits in a single one):
5870

5971
``` bash
6072
$ git rebase -i HEAD~3
@@ -77,4 +89,12 @@ you must follow these rules.
7789

7890
## Semver
7991

80-
We are trying to follow [semver](http://semver.org/). When you are making BC breaking changes, please let us know why you think it is important. In this case, your patch can only be included in the next major version.
92+
We are trying to follow [semver](http://semver.org/). When you are making BC breaking changes,
93+
please let us know why you think it is important.
94+
In this case, your patch can only be included in the next major version.
95+
96+
97+
## Code of Conduct
98+
99+
This project is released with a [Contributor Code of Conduct](CONDUCT.md).
100+
By participating in this project you agree to abide by its terms.

README.md

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# HTTP Discovery
1+
# HTTPlug Discovery
22

33
[![Latest Version](https://img.shields.io/github/release/php-http/discovery.svg?style=flat-square)](https://github.com/php-http/discovery/releases)
44
[![Software License](https://img.shields.io/badge/license-MIT-brightgreen.svg?style=flat-square)](LICENSE)
@@ -27,18 +27,19 @@ Please see the [official documentation](http://php-http.readthedocs.org/en/lates
2727
## Testing
2828

2929
``` bash
30-
$ phpspec run
30+
$ composer test
3131
```
3232

3333

3434
## Contributing
3535

36-
Please see [CONTRIBUTING](CONTRIBUTING.md) for details.
36+
Please see [CONTRIBUTING](CONTRIBUTING.md) and [CONDUCT](CONDUCT.md) for details.
3737

3838

3939
## Security
4040

41-
If you discover any security related issues, please contact us at [[email protected]](mailto:[email protected]).
41+
If you discover any security related issues, please contact us at [[email protected]](mailto:[email protected])
42+
4243

4344

4445
## License

composer.json

+8-4
Original file line numberDiff line numberDiff line change
@@ -16,23 +16,27 @@
1616
],
1717
"require": {
1818
"php": ">=5.4",
19-
"php-http/message-factory": "~0.2@dev"
19+
"php-http/message-factory": "^0.4"
2020
},
2121
"require-dev": {
2222
"zendframework/zend-diactoros": "^1.0",
2323
"guzzlehttp/psr7": "^1.0",
24-
"phpspec/phpspec": "^2.2",
24+
"phpspec/phpspec": "^2.4@dev",
2525
"henrikbjorn/phpspec-code-coverage" : "^1.0"
2626
},
2727
"suggest": {
28-
"zendframework/zend-diactoros": "Used with Diactoros MessageFactory",
29-
"guzzlehttp/psr7": "Used with Guzzle PSR-7 MessageFactory"
28+
"zendframework/zend-diactoros": "Used with Diactoros Factories",
29+
"guzzlehttp/psr7": "Used with Guzzle PSR-7 Factories"
3030
},
3131
"autoload": {
3232
"psr-4": {
3333
"Http\\Discovery\\": "src/"
3434
}
3535
},
36+
"scripts": {
37+
"test": "vendor/bin/phpspec run",
38+
"test-ci": "vendor/bin/phpspec run -c phpspec.yml.ci"
39+
},
3640
"extra": {
3741
"branch-alias": {
3842
"dev-master": "0.2-dev"

0 commit comments

Comments
 (0)