diff options
| author | misantron <misantron@gmail.com> | 2016-08-21 20:55:51 +0300 |
|---|---|---|
| committer | misantron <misantron@gmail.com> | 2016-08-21 20:55:51 +0300 |
| commit | 7d49213e23d922ab76ddfdbd6f456046862e8685 (patch) | |
| tree | 4c2af1f00167389c7b049e773edb0f268b1aab88 | |
| parent | 5af53adbcadf57f3a154e7ae8d8a50b64c414390 (diff) | |
| parent | 23193453f681d77adf3f4ac6981e62e26c698537 (diff) | |
| download | php-http-client-7d49213e23d922ab76ddfdbd6f456046862e8685.zip php-http-client-7d49213e23d922ab76ddfdbd6f456046862e8685.tar.gz php-http-client-7d49213e23d922ab76ddfdbd6f456046862e8685.tar.bz2 | |
Merge branch 'master' into refactoring
# Conflicts:
# composer.json
| -rw-r--r-- | .travis.yml | 9 | ||||
| -rw-r--r-- | CONTRIBUTING.md | 2 | ||||
| -rw-r--r-- | README.md | 6 | ||||
| -rw-r--r-- | composer.json | 2 |
4 files changed, 9 insertions, 10 deletions
diff --git a/.travis.yml b/.travis.yml index bd01fad..c9ad9ca 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,19 +1,12 @@ language: php before_script: -- phpenv local 5.4 - composer install --dev --no-interaction -- phpenv local --unset - cd test/unit script: - ../../vendor/bin/phpunit . --bootstrap bootstrap.php --filter test* --coverage-clover clover.xml -after_script: -- cd .. -- phpenv local 5.4 -- phpenv local --unset php: -- 5.4 -- 5.5 - 5.6 +- 7.0 env: global: - secure: eUN0huKA436uIkISu6V3yW01/gZHC6slBvlnprMPEhzclU2szH6qhWEXWS5CcOG6EEDBReqLZdNAwu+FC69KGFO9+6oW2GQQLSsfEViqFi/Ig2N0r4EBO4jLRebgq0GOfetPwQvJH27d8BCiloPy8rXBb5pskxSNw4B4bRyXHz4= diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 87c84ac..eef7f8c 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -64,7 +64,7 @@ We welcome direct contributions to the php-http-client code base. Thank you! ##### Prerequisites ##### -- PHP 5.2 through 5.6 +- PHP 5.6 or 7.0 - [Composer](https://getcomposer.org/) ##### Initial setup: ##### @@ -10,6 +10,12 @@ All updates to this library is documented in our [CHANGELOG](https://github.com/ # Installation +## Prerequisites + +- PHP version 5.6 or 7.0 + +## Install with Composer + 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. ```json diff --git a/composer.json b/composer.json index 48eaec9..e66c4f6 100644 --- a/composer.json +++ b/composer.json @@ -21,7 +21,7 @@ } ], "require": { - "php": ">=5.4" + "php": ">=5.6" }, "autoload": { "psr-4": { |