From 7b268eaae62b9404c4b88cd2283777eaf6e1315b Mon Sep 17 00:00:00 2001 From: Tobias Nyholm Date: Mon, 27 Mar 2017 12:59:36 +0200 Subject: [PATCH 1/3] added missing dev --- composer.json | 1 + 1 file changed, 1 insertion(+) diff --git a/composer.json b/composer.json index bfcfb8b..e3123ee 100644 --- a/composer.json +++ b/composer.json @@ -23,6 +23,7 @@ "php-http/message-factory": "^1.0.2", "php-http/curl-client": "^1.6", "php-http/message": "^1.0", + "nyholm/nsa": "^1.0", "guzzlehttp/psr7": "^1.3" }, "autoload": { From e5aaa9f3b3802fd2315cb0be28f4ed456424e78c Mon Sep 17 00:00:00 2001 From: Tobias Nyholm Date: Mon, 27 Mar 2017 13:01:15 +0200 Subject: [PATCH 2/3] Added branch alias --- composer.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/composer.json b/composer.json index e3123ee..41e2e75 100644 --- a/composer.json +++ b/composer.json @@ -35,5 +35,10 @@ "scripts": { "test": "vendor/bin/phpunit", "test-ci": "vendor/bin/phpunit --coverage-text --coverage-clover=build/coverage.xml" + }, + "extra": { + "branch-alias": { + "dev-master": "2.0.x-dev" + } } } From 8a06d4242aac3f6db6cafe257fe39fd70056e117 Mon Sep 17 00:00:00 2001 From: Tobias Nyholm Date: Mon, 27 Mar 2017 13:30:13 +0200 Subject: [PATCH 3/3] make sure build is green --- .travis.yml | 1 - composer.json | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index e944b8d..b4a567d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,7 +12,6 @@ php: - 5.6 - 7.0 - 7.1 - - hhvm env: global: - TEST_COMMAND="composer test" diff --git a/composer.json b/composer.json index 41e2e75..2030510 100644 --- a/composer.json +++ b/composer.json @@ -12,14 +12,14 @@ } ], "require": { - "php": "^5.5 || ^7.0", + "php": "^5.6 || ^7.0", "php-http/httplug": "^1.0", "php-http/client-common": "^1.1", "php-http/discovery": "^1.0", "webmozart/assert": "^1.2" }, "require-dev": { - "phpunit/phpunit": "^4.5 || ^5.4", + "phpunit/phpunit": "^5.6", "php-http/message-factory": "^1.0.2", "php-http/curl-client": "^1.6", "php-http/message": "^1.0",