Skip to content
This repository was archived by the owner on Jan 6, 2024. It is now read-only.

Commit afb3854

Browse files
committed
Update package
1 parent 9cd0df8 commit afb3854

File tree

6 files changed

+56
-18
lines changed

6 files changed

+56
-18
lines changed

.editorconfig

Lines changed: 4 additions & 5 deletions
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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,5 @@ tests/ export-ignore
55
.scrutinizer.yml export-ignore
66
.travis.yml export-ignore
77
CONTRIBUTING.md export-ignore
8+
CONDUCT.md export-ignore
89
phpunit.xml.dist export-ignore

.travis.yml

Lines changed: 22 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,42 @@
11
language: php
22

3+
sudo: false
4+
5+
cache:
6+
directories:
7+
- $HOME/.composer/cache
8+
39
php:
10+
- 5.4
411
- 5.5
512
- 5.6
613
- 7.0
714
- hhvm
815

16+
env:
17+
global:
18+
- TEST_COMMAND="composer test"
19+
920
matrix:
1021
allow_failures:
1122
- php: 7.0
12-
- php: hhvm
23+
fast_finish: true
1324
include:
14-
- php: 5.5
15-
env:
16-
- COMPOSER_FLAGS="--prefer-stable --prefer-lowest"
17-
- COVERAGE=true
18-
- PHPUNIT_FLAGS="--coverage-clover build/coverage.xml"
25+
- php: 5.4
26+
env: COMPOSER_FLAGS="--prefer-stable --prefer-lowest" COVERAGE=true TEST_COMMAND="composer test-ci"
1927

20-
install:
28+
before_install:
2129
- travis_retry composer self-update
30+
31+
install:
2232
- travis_retry composer update ${COMPOSER_FLAGS} --prefer-source --no-interaction
2333

24-
before_script: vendor/bin/http_test_server > /dev/null 2>&1 &
34+
before_script:
35+
- vendor/bin/http_test_server > /dev/null 2>&1 &
2536

26-
script: vendor/bin/phpunit ${PHPUNIT_FLAGS}
37+
script:
38+
- $TEST_COMMAND
2739

28-
after_script:
40+
after_success:
2941
- if [[ "$COVERAGE" = true ]]; then wget https://scrutinizer-ci.com/ocular.phar; fi
3042
- 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/)

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ $ phpunit
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

composer.json

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,15 @@
1616
],
1717
"require": {
1818
"php": ">=5.4",
19-
"php-http/adapter": "^0.1",
19+
"php-http/httplug": "^1.0@dev",
2020
"guzzlehttp/guzzle": "^6.0"
2121
},
2222
"require-dev": {
2323
"ext-curl": "*",
2424
"php-http/adapter-integration-tests": "^0.1"
2525
},
2626
"provide": {
27-
"php-http/adapter-implementation": "0.1"
27+
"php-http/client-implementation": "1.0"
2828
},
2929
"autoload": {
3030
"psr-4": {
@@ -36,6 +36,10 @@
3636
"Http\\Adapter\\Tests\\": "tests/"
3737
}
3838
},
39+
"scripts": {
40+
"test": "vendor/bin/phpunit",
41+
"test-ci": "vendor/bin/phpunit --coverage-text --coverage-clover=build/coverage.xml"
42+
},
3943
"extra": {
4044
"branch-alias": {
4145
"dev-master": "0.2-dev"

0 commit comments

Comments
 (0)