Skip to content

Commit 7d49213

Browse files
committed
Merge branch 'master' into refactoring
# Conflicts: # composer.json
2 parents 5af53ad + 2319345 commit 7d49213

File tree

4 files changed

+9
-10
lines changed

4 files changed

+9
-10
lines changed

.travis.yml

+1-8
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,12 @@
11
language: php
22
before_script:
3-
- phpenv local 5.4
43
- composer install --dev --no-interaction
5-
- phpenv local --unset
64
- cd test/unit
75
script:
86
- ../../vendor/bin/phpunit . --bootstrap bootstrap.php --filter test* --coverage-clover clover.xml
9-
after_script:
10-
- cd ..
11-
- phpenv local 5.4
12-
- phpenv local --unset
137
php:
14-
- 5.4
15-
- 5.5
168
- 5.6
9+
- 7.0
1710
env:
1811
global:
1912
- secure: eUN0huKA436uIkISu6V3yW01/gZHC6slBvlnprMPEhzclU2szH6qhWEXWS5CcOG6EEDBReqLZdNAwu+FC69KGFO9+6oW2GQQLSsfEViqFi/Ig2N0r4EBO4jLRebgq0GOfetPwQvJH27d8BCiloPy8rXBb5pskxSNw4B4bRyXHz4=

CONTRIBUTING.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ We welcome direct contributions to the php-http-client code base. Thank you!
6464

6565
##### Prerequisites #####
6666

67-
- PHP 5.2 through 5.6
67+
- PHP 5.6 or 7.0
6868
- [Composer](https://getcomposer.org/)
6969

7070
##### Initial setup: #####

README.md

+6
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,12 @@ All updates to this library is documented in our [CHANGELOG](https://github.com/
1010

1111
# Installation
1212

13+
## Prerequisites
14+
15+
- PHP version 5.6 or 7.0
16+
17+
## Install with Composer
18+
1319
Add php-http-client to your `composer.json` file. If you are not using [Composer](http://getcomposer.org), you should be. It's an excellent way to manage dependencies in your PHP application.
1420

1521
```json

composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
}
2222
],
2323
"require": {
24-
"php": ">=5.4"
24+
"php": ">=5.6"
2525
},
2626
"autoload": {
2727
"psr-4": {

0 commit comments

Comments
 (0)