Skip to content

Support PSR-18 #43

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Oct 29, 2018
Merged

Support PSR-18 #43

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
668bc6f
Support PSR-18
Nyholm Oct 27, 2018
ec29679
Update PHP versions
Nyholm Oct 27, 2018
8ce55ee
Remove HHVM
Nyholm Oct 27, 2018
c1e422b
Remove explicit declaration of PSR18
Nyholm Oct 27, 2018
7ea399c
Remove dependency to psr/http-client
Nyholm Oct 27, 2018
fda86d8
Test on PHP 7.3
GrahamCampbell Oct 27, 2018
1975650
add branch alias
dbu Oct 29, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 3 additions & 7 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,9 @@ cache:
- $HOME/.composer/cache

php:
- 5.5
- 5.6
- 7.0
- 7.1
- 7.2
- hhvm
- 7.3

env:
global:
Expand All @@ -21,10 +18,9 @@ env:
matrix:
fast_finish: true
include:
- php: 5.5
- php: 7.1
name: "Lowest dependencies"
env: COMPOSER_FLAGS="--prefer-stable --prefer-lowest" COVERAGE=true PHPUNIT_FLAGS="--coverage-clover build/coverage.xml"
allow_failures:
- php: hhvm

before_install:
- travis_retry composer self-update
Expand Down
13 changes: 9 additions & 4 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,21 +11,21 @@
}
],
"prefer-stable": true,
"minimum-stability": "beta",
"minimum-stability": "dev",
"config": {
"bin-dir": "vendor/bin"
},
"require": {
"php": "^5.5 || ^7.0",
"php": "^7.1",
"ext-curl": "*",
"php-http/httplug": "^1.0",
"php-http/httplug": "^2.0",
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

HTTTPlug extends psr/http-client.

"php-http/message-factory": "^1.0.2",
"php-http/message": "^1.2",
"php-http/discovery": "^1.0"
},
"require-dev": {
"guzzlehttp/psr7": "^1.0",
"php-http/client-integration-tests": "^0.6",
"php-http/client-integration-tests": "dev-master",
"phpunit/phpunit": "^4.8.27",
"zendframework/zend-diactoros": "^1.0"
},
Expand All @@ -46,5 +46,10 @@
"scripts": {
"test": "vendor/bin/phpunit",
"test-ci": "vendor/bin/phpunit --coverage-clover build/coverage.xml"
},
"extra": {
"branch-alias": {
"dev-master": "2.x-dev"
}
}
}
2 changes: 1 addition & 1 deletion src/Client.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ public function __destruct()
* @since 1.6 Throw NetworkException on network errors
* @since 1.0
*/
public function sendRequest(RequestInterface $request)
public function sendRequest(RequestInterface $request): ResponseInterface
{
$responseBuilder = $this->createResponseBuilder();
$options = $this->createCurlOptions($request, $responseBuilder);
Expand Down