From 61ffbae4f81e54b909c60775ece3576a1c689bd1 Mon Sep 17 00:00:00 2001 From: Nyholm Date: Sat, 29 Dec 2018 15:29:24 +0100 Subject: [PATCH 1/3] Support client-common 2.0 --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index ec93269..1f59e7f 100644 --- a/composer.json +++ b/composer.json @@ -13,7 +13,7 @@ "require": { "php": "^5.5 || ^7.0", "php-http/httplug": "^1.0", - "php-http/client-common": "^1.1", + "php-http/client-common": "^1.1 || ^2.0", "php-http/discovery": "^1.0", "php-http/message-factory": "^1.0" }, @@ -36,7 +36,7 @@ }, "extra": { "branch-alias": { - "dev-master": "1.1-dev" + "dev-master": "1.2-dev" } } } From 64d6c4c9fd46f87203fac1d3a4338a5151e5e076 Mon Sep 17 00:00:00 2001 From: Nyholm Date: Sat, 29 Dec 2018 15:32:00 +0100 Subject: [PATCH 2/3] minors --- .travis.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index c9569fa..2d3930d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,6 +11,8 @@ php: - 5.6 - 7.0 - 7.1 + - 7.2 + - 7.3 env: global: @@ -32,7 +34,7 @@ before_install: install: # To be removed when this issue will be resolved: https://github.com/composer/composer/issues/5355 - if [[ "$COMPOSER_FLAGS" == *"--prefer-lowest"* ]]; then travis_retry composer update --prefer-dist --no-interaction --prefer-stable --quiet; fi - - travis_retry composer update ${COMPOSER_FLAGS} --prefer-dist --no-interaction + - composer update ${COMPOSER_FLAGS} --prefer-dist --no-interaction script: - $TEST_COMMAND From 12fb561229fac59241e0c628bc5ffd569db22538 Mon Sep 17 00:00:00 2001 From: Nyholm Date: Sat, 29 Dec 2018 15:34:07 +0100 Subject: [PATCH 3/3] Added prefer stable and min-stab: deb --- composer.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 1f59e7f..5eb00e6 100644 --- a/composer.json +++ b/composer.json @@ -38,5 +38,7 @@ "branch-alias": { "dev-master": "1.2-dev" } - } + }, + "prefer-stable": true, + "minimum-stability": "dev" }