From 60d4ab4cf9799ee627e394fcc713cffbf0f6e246 Mon Sep 17 00:00:00 2001 From: Tobias Nyholm Date: Fri, 7 Jul 2017 19:33:15 +0200 Subject: [PATCH 1/3] Update to use the latest integration tests --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index d9bc91b..93a4dbb 100644 --- a/composer.json +++ b/composer.json @@ -17,7 +17,7 @@ "cakephp/cakephp": "^3.1" }, "require-dev": { - "php-http/client-integration-tests": "^0.5.1" + "php-http/client-integration-tests": "^0.6" }, "autoload": { "psr-4": { From f670ca3e887e385278da194e8cb2430bdb008a99 Mon Sep 17 00:00:00 2001 From: Tobias Nyholm Date: Fri, 7 Jul 2017 20:01:24 +0200 Subject: [PATCH 2/3] Fixed HHVM build --- .travis.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 169d024..4c08668 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,7 +11,6 @@ php: - 5.6 - 7.0 - 7.1 - - hhvm env: global: @@ -22,12 +21,12 @@ branches: - /^analysis-.*$/ matrix: - allow_failures: - - php: hhvm fast_finish: true include: - php: 5.5 env: COMPOSER_FLAGS="--prefer-stable --prefer-lowest" COVERAGE=true TEST_COMMAND="composer test-ci" + - php: hhvm + dist: trusty before_install: - if [[ $COVERAGE != true ]]; then phpenv config-rm xdebug.ini || true; fi From 209b28c982ec46ee5cb7a649507c666417ea09b0 Mon Sep 17 00:00:00 2001 From: Tobias Nyholm Date: Fri, 7 Jul 2017 20:08:12 +0200 Subject: [PATCH 3/3] Allow failures on HHVM --- .travis.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.travis.yml b/.travis.yml index 4c08668..92bc412 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,6 +21,9 @@ branches: - /^analysis-.*$/ matrix: + allow_failures: + - php: hhvm + dist: trusty fast_finish: true include: - php: 5.5