From 8157dd17856866c3f74efd378c86a5d1041c3676 Mon Sep 17 00:00:00 2001 From: Denis Brumann Date: Sun, 22 Oct 2017 12:05:48 +0200 Subject: [PATCH 01/11] Update dependency for Symfony 4. --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index edb9d3d..8db8eb1 100644 --- a/composer.json +++ b/composer.json @@ -12,7 +12,7 @@ ], "require": { "php": ">=5.4", - "symfony/stopwatch": "^2.7|^3.0", + "symfony/stopwatch": "^2.7|^3.0|^4.0", "php-http/client-common": "^1.1" }, "require-dev": { From 584ecfb4529645a20fff905826a8ec7f5403964e Mon Sep 17 00:00:00 2001 From: Denis Brumann Date: Sun, 22 Oct 2017 12:24:53 +0200 Subject: [PATCH 02/11] Add Symfony 4 to travis build matrix. --- .travis.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.travis.yml b/.travis.yml index 7b73ffe..3718b47 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,6 +11,7 @@ php: - 5.5 - 5.6 - 7.0 + - 7.1 - hhvm env: @@ -30,6 +31,8 @@ matrix: include: - php: 5.4 env: COMPOSER_FLAGS="--prefer-stable --prefer-lowest" COVERAGE=true TEST_COMMAND="composer test-ci" SYMFONY_VERSION=2.7.* + - php: 7.1 + env: SYMFONY_VERSION=4.0.* exclude: - php: 5.4 env: SYMFONY_VERSION=3.0.* From a6d3ad2637af3d47b0d4dc4c31c9c26d345265fe Mon Sep 17 00:00:00 2001 From: Denis Brumann Date: Fri, 24 Nov 2017 12:00:17 +0100 Subject: [PATCH 03/11] Add dev flag to Symfony 4 build. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 3718b47..0d6b700 100644 --- a/.travis.yml +++ b/.travis.yml @@ -32,7 +32,7 @@ matrix: - php: 5.4 env: COMPOSER_FLAGS="--prefer-stable --prefer-lowest" COVERAGE=true TEST_COMMAND="composer test-ci" SYMFONY_VERSION=2.7.* - php: 7.1 - env: SYMFONY_VERSION=4.0.* + env: SYMFONY_VERSION=4.0.*@dev exclude: - php: 5.4 env: SYMFONY_VERSION=3.0.* From e0f819c1e6181c785c925d06c50de7b4c72ba5d7 Mon Sep 17 00:00:00 2001 From: Denis Brumann Date: Sat, 25 Nov 2017 10:30:42 +0100 Subject: [PATCH 04/11] Adding dev-flag should not be necessary as composer.json allows for dev-stability. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 0d6b700..3718b47 100644 --- a/.travis.yml +++ b/.travis.yml @@ -32,7 +32,7 @@ matrix: - php: 5.4 env: COMPOSER_FLAGS="--prefer-stable --prefer-lowest" COVERAGE=true TEST_COMMAND="composer test-ci" SYMFONY_VERSION=2.7.* - php: 7.1 - env: SYMFONY_VERSION=4.0.*@dev + env: SYMFONY_VERSION=4.0.* exclude: - php: 5.4 env: SYMFONY_VERSION=3.0.* From 0deb9cd8e161f63638d08ad3144672dbc69c82f6 Mon Sep 17 00:00:00 2001 From: Denis Brumann Date: Mon, 27 Nov 2017 22:19:46 +0100 Subject: [PATCH 05/11] Restructure .travis.yml --- .travis.yml | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3718b47..cd98387 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,14 +6,6 @@ cache: directories: - $HOME/.composer/cache/files -php: - - 5.4 - - 5.5 - - 5.6 - - 7.0 - - 7.1 - - hhvm - env: global: - TEST_COMMAND="composer test" @@ -30,21 +22,33 @@ matrix: fast_finish: true include: - php: 5.4 - env: COMPOSER_FLAGS="--prefer-stable --prefer-lowest" COVERAGE=true TEST_COMMAND="composer test-ci" SYMFONY_VERSION=2.7.* + env: DEPENDENCIES=minimum COVERAGE=true TEST_COMMAND="composer test-ci" SYMFONY_VERSION=2.7.* + - php: 5.5 + - php: 5.6 + - php: 7.0 + - php: 7.1 + env: SYMFONY_VERSION=3.0.* - php: 7.1 - env: SYMFONY_VERSION=4.0.* + env: DEPENDENCIES="dev" SYMFONY_VERSION=4.0.* + - php: hhvm exclude: - php: 5.4 env: SYMFONY_VERSION=3.0.* + allow_failures: + - php: 7.1 + env: DEPENDENCIES="dev" before_install: - travis_retry composer self-update + - if [ "$DEPENDENCIES" = "minimum" ]; then COMPOSER_FLAGS="--prefer-stable --prefer-lowest"; fi; + - if [ "$DEPENDENCIES" = "dev" ]; then composer config minimum-stability dev; fi; install: - travis_retry composer require symfony/symfony:${SYMFONY_VERSION} --no-update - travis_retry composer update ${COMPOSER_FLAGS} --prefer-dist --no-interaction script: + - composer validate --strict --no-check-lock - $TEST_COMMAND after_success: From c8525caf00a40bbbe941b7fac00cfa311db7fbe1 Mon Sep 17 00:00:00 2001 From: Denis Brumann Date: Mon, 27 Nov 2017 22:24:43 +0100 Subject: [PATCH 06/11] Add SYMFONY_VERSION to build allowed failed. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index cd98387..9ceeb9f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -36,7 +36,7 @@ matrix: env: SYMFONY_VERSION=3.0.* allow_failures: - php: 7.1 - env: DEPENDENCIES="dev" + env: DEPENDENCIES="dev" SYMFONY_VERSION=4.0.* before_install: - travis_retry composer self-update From 0c69bee7225849e69655c6602a52feb0442f6b9f Mon Sep 17 00:00:00 2001 From: Denis Brumann Date: Mon, 27 Nov 2017 22:58:37 +0100 Subject: [PATCH 07/11] Remove unused exclude and refine requirement for 3.x LTS. --- .travis.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9ceeb9f..86cc5b0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -27,13 +27,10 @@ matrix: - php: 5.6 - php: 7.0 - php: 7.1 - env: SYMFONY_VERSION=3.0.* + env: DEPENDENCIES="symfony/lts:^3" - php: 7.1 env: DEPENDENCIES="dev" SYMFONY_VERSION=4.0.* - php: hhvm - exclude: - - php: 5.4 - env: SYMFONY_VERSION=3.0.* allow_failures: - php: 7.1 env: DEPENDENCIES="dev" SYMFONY_VERSION=4.0.* @@ -42,6 +39,7 @@ before_install: - travis_retry composer self-update - if [ "$DEPENDENCIES" = "minimum" ]; then COMPOSER_FLAGS="--prefer-stable --prefer-lowest"; fi; - if [ "$DEPENDENCIES" = "dev" ]; then composer config minimum-stability dev; fi; + - if [[ $DEPENDENCIES == *"/"* ]]; then composer require --no-update $DEPENDENCIES; fi; install: - travis_retry composer require symfony/symfony:${SYMFONY_VERSION} --no-update From 670faffb83f857ad4d6a84e0a65297836ace2017 Mon Sep 17 00:00:00 2001 From: Denis Brumann Date: Mon, 27 Nov 2017 23:13:42 +0100 Subject: [PATCH 08/11] Add missing Symfony version. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 86cc5b0..2473f69 100644 --- a/.travis.yml +++ b/.travis.yml @@ -27,7 +27,7 @@ matrix: - php: 5.6 - php: 7.0 - php: 7.1 - env: DEPENDENCIES="symfony/lts:^3" + env: DEPENDENCIES="symfony/lts:^3" SYMFONY_VERSION=3.0.* - php: 7.1 env: DEPENDENCIES="dev" SYMFONY_VERSION=4.0.* - php: hhvm From 92031a373fd506feee2a9769e32bb2e94fc15daf Mon Sep 17 00:00:00 2001 From: Denis Brumann Date: Mon, 27 Nov 2017 23:17:22 +0100 Subject: [PATCH 09/11] Separate matrix sections with comments. --- .travis.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.travis.yml b/.travis.yml index 2473f69..bbe66d5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,16 +21,22 @@ branches: matrix: fast_finish: true include: + # Test stable versions - php: 5.4 env: DEPENDENCIES=minimum COVERAGE=true TEST_COMMAND="composer test-ci" SYMFONY_VERSION=2.7.* - php: 5.5 - php: 5.6 - php: 7.0 + + # Test latest versions: - php: 7.1 env: DEPENDENCIES="symfony/lts:^3" SYMFONY_VERSION=3.0.* - php: 7.1 env: DEPENDENCIES="dev" SYMFONY_VERSION=4.0.* + + # Test alternative runtimes: - php: hhvm + allow_failures: - php: 7.1 env: DEPENDENCIES="dev" SYMFONY_VERSION=4.0.* From e97b4471d13e68135fbf8772eaefd261dad0e988 Mon Sep 17 00:00:00 2001 From: Tobias Nyholm Date: Wed, 29 Nov 2017 19:45:46 +0100 Subject: [PATCH 10/11] Make sure we install sf4 --- .travis.yml | 2 +- composer.json | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index bbe66d5..5e30479 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,7 +23,7 @@ matrix: include: # Test stable versions - php: 5.4 - env: DEPENDENCIES=minimum COVERAGE=true TEST_COMMAND="composer test-ci" SYMFONY_VERSION=2.7.* + env: DEPENDENCIES=minimum COVERAGE=true TEST_COMMAND="composer test-ci" SYMFONY_VERSION="2.7.* henrikbjorn/phpspec-code-coverage^1.0" - php: 5.5 - php: 5.6 - php: 7.0 diff --git a/composer.json b/composer.json index 8db8eb1..76424fb 100644 --- a/composer.json +++ b/composer.json @@ -16,8 +16,7 @@ "php-http/client-common": "^1.1" }, "require-dev": { - "phpspec/phpspec": "^2.5", - "henrikbjorn/phpspec-code-coverage" : "^1.0" + "phpspec/phpspec": "^2.5 || ^3.0 || ^4.0" }, "autoload": { "psr-4": { From 588a3084ae1565bcbe0076684d8b19b162c3a3fb Mon Sep 17 00:00:00 2001 From: Tobias Nyholm Date: Wed, 29 Nov 2017 19:49:05 +0100 Subject: [PATCH 11/11] typo --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 5e30479..46cea4f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,7 +23,7 @@ matrix: include: # Test stable versions - php: 5.4 - env: DEPENDENCIES=minimum COVERAGE=true TEST_COMMAND="composer test-ci" SYMFONY_VERSION="2.7.* henrikbjorn/phpspec-code-coverage^1.0" + env: DEPENDENCIES=minimum COVERAGE=true TEST_COMMAND="composer test-ci" SYMFONY_VERSION="2.7.* henrikbjorn/phpspec-code-coverage:^1.0" - php: 5.5 - php: 5.6 - php: 7.0