Skip to content

Commit 0681df1

Browse files
authored
Merge pull request #43 from php-http/psr-18
Support PSR-18
2 parents 4a818d3 + 1975650 commit 0681df1

File tree

3 files changed

+13
-12
lines changed

3 files changed

+13
-12
lines changed

.travis.yml

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,9 @@ cache:
77
- $HOME/.composer/cache
88

99
php:
10-
- 5.5
11-
- 5.6
12-
- 7.0
1310
- 7.1
1411
- 7.2
15-
- hhvm
12+
- 7.3
1613

1714
env:
1815
global:
@@ -21,10 +18,9 @@ env:
2118
matrix:
2219
fast_finish: true
2320
include:
24-
- php: 5.5
21+
- php: 7.1
22+
name: "Lowest dependencies"
2523
env: COMPOSER_FLAGS="--prefer-stable --prefer-lowest" COVERAGE=true PHPUNIT_FLAGS="--coverage-clover build/coverage.xml"
26-
allow_failures:
27-
- php: hhvm
2824

2925
before_install:
3026
- travis_retry composer self-update

composer.json

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,21 +11,21 @@
1111
}
1212
],
1313
"prefer-stable": true,
14-
"minimum-stability": "beta",
14+
"minimum-stability": "dev",
1515
"config": {
1616
"bin-dir": "vendor/bin"
1717
},
1818
"require": {
19-
"php": "^5.5 || ^7.0",
19+
"php": "^7.1",
2020
"ext-curl": "*",
21-
"php-http/httplug": "^1.0",
21+
"php-http/httplug": "^2.0",
2222
"php-http/message-factory": "^1.0.2",
2323
"php-http/message": "^1.2",
2424
"php-http/discovery": "^1.0"
2525
},
2626
"require-dev": {
2727
"guzzlehttp/psr7": "^1.0",
28-
"php-http/client-integration-tests": "^0.6",
28+
"php-http/client-integration-tests": "dev-master",
2929
"phpunit/phpunit": "^4.8.27",
3030
"zendframework/zend-diactoros": "^1.0"
3131
},
@@ -46,5 +46,10 @@
4646
"scripts": {
4747
"test": "vendor/bin/phpunit",
4848
"test-ci": "vendor/bin/phpunit --coverage-clover build/coverage.xml"
49+
},
50+
"extra": {
51+
"branch-alias": {
52+
"dev-master": "2.x-dev"
53+
}
4954
}
5055
}

src/Client.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ public function __destruct()
108108
* @since 1.6 Throw NetworkException on network errors
109109
* @since 1.0
110110
*/
111-
public function sendRequest(RequestInterface $request)
111+
public function sendRequest(RequestInterface $request): ResponseInterface
112112
{
113113
$responseBuilder = $this->createResponseBuilder();
114114
$options = $this->createCurlOptions($request, $responseBuilder);

0 commit comments

Comments
 (0)