From 0d3573e5ee370ffce7c8254de49b98c16c49c705 Mon Sep 17 00:00:00 2001 From: Tobias Nyholm Date: Fri, 4 Jan 2019 08:29:12 +0100 Subject: [PATCH 1/3] Drop PHP7.0 --- .travis.yml | 3 +-- composer.json | 10 +++++----- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index 10d366e..cf3a664 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,7 +6,6 @@ cache: - $HOME/.composer/cache/files php: -- 7.0 - 7.1 - 7.2 - 7.3 @@ -16,7 +15,7 @@ matrix: jobs: include: - - php: 7.0 + - php: 7.1 env: COMPOSER_FLAGS="--prefer-stable --prefer-lowest" - php: 7.2 env: COVERAGE=true DEPENDENCIES="leanphp/phpspec-code-coverage" diff --git a/composer.json b/composer.json index 53f91e1..fa5aa37 100644 --- a/composer.json +++ b/composer.json @@ -11,18 +11,18 @@ } ], "require": { - "php": "^7.0", + "php": "^7.1", "php-http/httplug": "^2.0", "php-http/message-factory": "^1.0", "php-http/message": "^1.6", - "symfony/options-resolver": "^2.6 || ^3.0 || ^4.0" + "symfony/options-resolver": " ^3.4.20 || ^4.0.15 || ^4.1.9 || ^4.2.1" }, "require-dev": { - "doctrine/instantiator": ">=1.0.5", + "doctrine/instantiator": "^1.1", "guzzlehttp/psr7": "^1.4", "phpspec/phpspec": "^3.4 || ^4.2", - "phpspec/prophecy": ">=1.8", - "sebastian/comparator": ">=2" + "phpspec/prophecy": "^1.8", + "sebastian/comparator": "^2.1.3 || ^3.0" }, "suggest": { "ext-json": "To detect JSON responses with the ContentTypePlugin", From 3f2b7a7472f930e95b4207db0cae97e98adfe6b2 Mon Sep 17 00:00:00 2001 From: Tobias Nyholm Date: Fri, 4 Jan 2019 08:37:19 +0100 Subject: [PATCH 2/3] Drop more versions of dependencies --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index fa5aa37..9d65c4a 100644 --- a/composer.json +++ b/composer.json @@ -20,9 +20,9 @@ "require-dev": { "doctrine/instantiator": "^1.1", "guzzlehttp/psr7": "^1.4", - "phpspec/phpspec": "^3.4 || ^4.2", + "phpspec/phpspec": "^5.1", "phpspec/prophecy": "^1.8", - "sebastian/comparator": "^2.1.3 || ^3.0" + "sebastian/comparator": "^3.0" }, "suggest": { "ext-json": "To detect JSON responses with the ContentTypePlugin", From 4a55debd642370b23ed7484d6b7a191256a43f5e Mon Sep 17 00:00:00 2001 From: Tobias Nyholm Date: Fri, 4 Jan 2019 08:46:06 +0100 Subject: [PATCH 3/3] Fixes --- .travis.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index cf3a664..9e10589 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,15 +18,13 @@ jobs: - php: 7.1 env: COMPOSER_FLAGS="--prefer-stable --prefer-lowest" - php: 7.2 - env: COVERAGE=true DEPENDENCIES="leanphp/phpspec-code-coverage" + env: COVERAGE=true DEPENDENCIES="leanphp/phpspec-code-coverage phpspec/phpspec:^4.2" script: - composer test-ci after_success: - wget https://scrutinizer-ci.com/ocular.phar - php ocular.phar code-coverage:upload --format=php-clover build/coverage.xml --revision=$TRAVIS_COMMIT # Test LTS versions - - php: 7.2 - env: DEPENDENCIES="dunglas/symfony-lock:^2" - php: 7.2 env: DEPENDENCIES="dunglas/symfony-lock:^3" - php: 7.2