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

Commit 98b61e0

Browse files
committed
Update package
1 parent 0746749 commit 98b61e0

File tree

10 files changed

+67
-35
lines changed

10 files changed

+67
-35
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: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,14 @@
1+
spec/ export-ignore
12
tests/ export-ignore
23
.editorconfig export-ignore
34
.gitattributes export-ignore
45
.gitignore export-ignore
6+
.php_cs export-ignore
57
.scrutinizer.yml export-ignore
8+
.styleci.yml export-ignore
69
.travis.yml export-ignore
7-
CONTRIBUTING.md export-ignore
810
CONDUCT.md export-ignore
11+
CONTRIBUTING.md export-ignore
12+
phpspec.yml.ci export-ignore
13+
phpspec.yml.dist export-ignore
914
phpunit.xml.dist export-ignore

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
build/
22
vendor/
33
composer.lock
4+
phpspec.yml
45
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: 23 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -3,39 +3,42 @@ 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.5
11-
- 5.6
12-
- 7.0
13-
- hhvm
10+
- 5.4
11+
- 5.5
12+
- 5.6
13+
- 7.0
14+
- hhvm
1415

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

1924
matrix:
20-
allow_failures:
21-
- php: hhvm
22-
fast_finish: true
23-
include:
24-
- php: 5.5
25-
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"
2629

2730
before_install:
28-
- travis_retry composer self-update
31+
- travis_retry composer self-update
2932

3033
install:
31-
- travis_retry composer update ${COMPOSER_FLAGS} --prefer-source --no-interaction
34+
- travis_retry composer update ${COMPOSER_FLAGS} --prefer-source --no-interaction
3235

3336
before_script:
34-
- vendor/bin/http_test_server > /dev/null 2>&1 &
37+
- vendor/bin/http_test_server > /dev/null 2>&1 &
3538

3639
script:
37-
- $TEST_COMMAND
40+
- $TEST_COMMAND
3841

3942
after_success:
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
43+
- if [[ "$COVERAGE" = true ]]; then wget https://scrutinizer-ci.com/ocular.phar; fi
44+
- if [[ "$COVERAGE" = true ]]; then php ocular.phar code-coverage:upload --format=php-clover build/coverage.xml; fi

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ $ git rebase -i HEAD~3
7575
If your branch conflicts with the master branch, you will need to rebase and repush it with the following commands:
7676

7777
``` bash
78-
$ git remote add upstream [email protected]:php-http/repo-name.git
78+
$ git remote add upstream [email protected]:orga/repo-name.git
7979
$ git pull --rebase upstream master
8080
$ git push -f origin feature-or-bug-fix-description
8181
```

README.md

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ $ composer require php-http/guzzle6-adapter
2121

2222
## Documentation
2323

24-
Please see the [official documentation](http://php-http.readthedocs.org/en/latest/).
24+
Please see the [official documentation](http://docs.httplug.io).
2525

2626

2727
## Testing
@@ -42,6 +42,11 @@ If you discover any security related issues, please contact us at [security@http
4242
4343

4444

45+
## Credits
46+
47+
Thanks to [David de Boer](https://github.com/ddeboer) for implementing this adapter.
48+
49+
4550
## License
4651

4752
The MIT License (MIT). Please see [License File](LICENSE) for more information.

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"require": {
1818
"php": ">=5.5.0",
1919
"php-http/httplug": "1.0.0-alpha3",
20-
"php-http/client-tools": "^0.1@dev",
20+
"php-http/client-tools": "^0.1",
2121
"guzzlehttp/guzzle": "^6.0"
2222
},
2323
"require-dev": {

0 commit comments

Comments
 (0)