Skip to content

Commit 705c780

Browse files
committed
Update package
1 parent cc17b17 commit 705c780

13 files changed

+121
-49
lines changed

.editorconfig

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,3 @@ indent_size = 4
77
indent_style = space
88
insert_final_newline = true
99
trim_trailing_whitespace = true
10-
11-
[*.yml*]
12-
indent_size = 2

.gitattributes

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,14 @@
1+
spec/ export-ignore
2+
tests/ export-ignore
13
.editorconfig export-ignore
24
.gitattributes export-ignore
35
.gitignore export-ignore
6+
.php_cs export-ignore
47
.scrutinizer.yml export-ignore
8+
.styleci.yml export-ignore
59
.travis.yml export-ignore
10+
CONDUCT.md export-ignore
611
CONTRIBUTING.md export-ignore
12+
phpspec.yml.ci export-ignore
13+
phpspec.yml.dist export-ignore
14+
phpunit.xml.dist export-ignore

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
build/
22
vendor/
33
composer.lock
4+
phpspec.yml
5+
phpunit.xml

.php_cs

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<?php
2+
3+
/*
4+
* In order to make it work, fabpot/php-cs-fixer and sllh/php-cs-fixer-styleci-bridge must be installed globally
5+
* with composer.
6+
*
7+
* @link https://github.com/Soullivaneuh/php-cs-fixer-styleci-bridge
8+
* @link https://github.com/FriendsOfPHP/PHP-CS-Fixer
9+
*/
10+
11+
use SLLH\StyleCIBridge\ConfigBridge;
12+
13+
return ConfigBridge::create();

.scrutinizer.yml

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
11
filter:
2-
paths: [src/*]
2+
paths: [src/*]
33
checks:
4-
php:
5-
code_rating: true
6-
duplication: true
4+
php:
5+
code_rating: true
6+
duplication: true
77
tools:
8-
external_code_coverage: true
9-
php_code_sniffer:
10-
config:
11-
standard: "PSR2"
8+
external_code_coverage: true

.styleci.yml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
preset: symfony
2+
3+
finder:
4+
exclude:
5+
- "spec"
6+
- "tests"
7+
path:
8+
- "src"
9+
10+
enabled:
11+
- short_array_syntax

.travis.yml

Lines changed: 22 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -3,35 +3,39 @@ language: php
33
sudo: false
44

55
cache:
6-
directories:
7-
- $HOME/.composer/cache
6+
directories:
7+
- $HOME/.composer/cache
88

99
php:
10-
- 5.4
11-
- 5.5
12-
- 5.6
13-
- 7.0
14-
- hhvm
10+
- 5.4
11+
- 5.5
12+
- 5.6
13+
- 7.0
14+
- hhvm
1515

1616
env:
17-
global:
18-
- TEST_COMMAND="composer test"
17+
global:
18+
- TEST_COMMAND="composer test"
19+
20+
branches:
21+
except:
22+
- /^analysis-.*$/
1923

2024
matrix:
21-
fast_finish: true
22-
include:
23-
- php: 5.4
24-
env: COMPOSER_FLAGS="--prefer-stable --prefer-lowest" COVERAGE=true TEST_COMMAND="composer test-ci"
25+
fast_finish: true
26+
include:
27+
- php: 5.4
28+
env: COMPOSER_FLAGS="--prefer-stable --prefer-lowest" COVERAGE=true TEST_COMMAND="composer test-ci"
2529

2630
before_install:
27-
- travis_retry composer self-update
31+
- travis_retry composer self-update
2832

2933
install:
30-
- travis_retry composer update ${COMPOSER_FLAGS} --prefer-source --no-interaction
34+
- travis_retry composer update ${COMPOSER_FLAGS} --prefer-source --no-interaction
3135

3236
script:
33-
- $TEST_COMMAND
37+
- $TEST_COMMAND
3438

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

CONDUCT.md

Lines changed: 22 additions & 0 deletions
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

Lines changed: 23 additions & 7 deletions
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,8 @@ Then install the dependencies through [Composer](https://getcomposer.org/):
4144
$ composer install
4245
```
4346

44-
Write code and tests. When you are ready, run the tests. (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/))
4549

4650
``` bash
4751
$ composer test
@@ -54,11 +58,15 @@ $ git commit -m "Feature or bug fix description"
5458
$ git push origin feature-or-bug-fix-description
5559
```
5660

57-
**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.
5863

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

61-
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):
6270

6371
``` bash
6472
$ git rebase -i HEAD~3
@@ -67,7 +75,7 @@ $ git rebase -i HEAD~3
6775
If your branch conflicts with the master branch, you will need to rebase and repush it with the following commands:
6876

6977
``` bash
70-
$ git remote add upstream [email protected]:php-http/repo-name.git
78+
$ git remote add upstream [email protected]:orga/repo-name.git
7179
$ git pull --rebase upstream master
7280
$ git push -f origin feature-or-bug-fix-description
7381
```
@@ -81,4 +89,12 @@ you must follow these rules.
8189

8290
## Semver
8391

84-
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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@
77
[![Quality Score](https://img.shields.io/scrutinizer/g/php-http/plugins.svg?style=flat-square)](https://scrutinizer-ci.com/g/php-http/plugins)
88
[![Total Downloads](https://img.shields.io/packagist/dt/php-http/plugins.svg?style=flat-square)](https://packagist.org/packages/php-http/plugins)
99

10-
**Plugins for Httplug.**
10+
**Plugins for HTTPlug.**
11+
1112

1213
## Install
1314

@@ -30,12 +31,13 @@ $ composer test
3031

3132
## Contributing
3233

33-
Please see [CONTRIBUTING](CONTRIBUTING.md) for details.
34+
Please see [CONTRIBUTING](CONTRIBUTING.md) and [CONDUCT](CONDUCT.md) for details.
3435

3536

3637
## Security
3738

38-
If you discover any security related issues, please contact us at [[email protected]](mailto:[email protected]).
39+
If you discover any security related issues, please contact us at [[email protected]](mailto:[email protected])
40+
3941

4042

4143
## License

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "php-http/plugins",
3-
"description": "Plugins for Httplug",
3+
"description": "Plugins for HTTPlug",
44
"license": "MIT",
55
"keywords": ["plugin", "http", "psr7"],
66
"homepage": "http://php-http.org",

phpspec.yml.ci

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
suites:
2-
plugin_suite:
3-
namespace: Http\Client\Plugin
4-
psr4_prefix: Http\Client\Plugin
2+
plugin_suite:
3+
namespace: Http\Client\Plugin
4+
psr4_prefix: Http\Client\Plugin
55
formatter.name: pretty
66
extensions:
7-
- PhpSpec\Extension\CodeCoverageExtension
7+
- PhpSpec\Extension\CodeCoverageExtension
88
code_coverage:
9-
format: clover
10-
output: build/coverage.xml
9+
format: clover
10+
output: build/coverage.xml

phpspec.yml.dist

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
suites:
2-
plugin_suite:
3-
namespace: Http\Client\Plugin
4-
psr4_prefix: Http\Client\Plugin
2+
plugin_suite:
3+
namespace: Http\Client\Plugin
4+
psr4_prefix: Http\Client\Plugin
55
formatter.name: pretty

0 commit comments

Comments
 (0)