From 47bbd09abe4318912e8b8b984a8e7d5527d4175b Mon Sep 17 00:00:00 2001 From: Fabien Bourigault Date: Wed, 29 Nov 2017 22:37:21 +0100 Subject: [PATCH 1/7] test with symfony 4 only dependencies --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 20b288f0..a47ea388 100644 --- a/composer.json +++ b/composer.json @@ -37,7 +37,7 @@ }, "require-dev": { "guzzlehttp/psr7": "^1.0", - "matthiasnoback/symfony-dependency-injection-test": "^1.1 || ^2.0", + "matthiasnoback/symfony-dependency-injection-test": "^1.1 || ^2.0 || dev-feature/symfony-4", "nyholm/nsa": "^1.1", "php-http/buzz-adapter": "^0.3", "php-http/curl-client": "^1.0", From 23f0ddb9122f965fe8dffd202a340880ca9ec005 Mon Sep 17 00:00:00 2001 From: Fabien Bourigault Date: Wed, 29 Nov 2017 23:03:05 +0100 Subject: [PATCH 2/7] use dunglas/symfony-lock instead of symfony/lts --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3a94202c..086d7128 100644 --- a/.travis.yml +++ b/.travis.yml @@ -33,9 +33,9 @@ matrix: # Test LTS versions - php: 5.5 - env: DEPENDENCIES="symfony/lts:^2" + env: DEPENDENCIES="dunglas/symfony-lock:^2" - php: 5.5 - env: DEPENDENCIES="symfony/lts:^3" + env: DEPENDENCIES="dunglas/symfony-lock:^3" # Latest commit to master - php: 7.1 From d36dc50222b65abc2a14fe67c14757b440d5f3e6 Mon Sep 17 00:00:00 2001 From: Fabien Bourigault Date: Wed, 29 Nov 2017 23:30:09 +0100 Subject: [PATCH 3/7] add Symfony 4 build in travis-ci matrix --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 086d7128..a792a370 100644 --- a/.travis.yml +++ b/.travis.yml @@ -36,6 +36,8 @@ matrix: env: DEPENDENCIES="dunglas/symfony-lock:^2" - php: 5.5 env: DEPENDENCIES="dunglas/symfony-lock:^3" + - php: 7.1 + env: DEPENDENCIES="dunglas/symfony-lock:^4" # Latest commit to master - php: 7.1 From f6f211f06d024ef47f69d7bb3251e32890c608f8 Mon Sep 17 00:00:00 2001 From: Tobias Nyholm Date: Thu, 30 Nov 2017 09:58:08 +0100 Subject: [PATCH 4/7] Run test with dev-master --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index a47ea388..169e417f 100644 --- a/composer.json +++ b/composer.json @@ -37,7 +37,7 @@ }, "require-dev": { "guzzlehttp/psr7": "^1.0", - "matthiasnoback/symfony-dependency-injection-test": "^1.1 || ^2.0 || dev-feature/symfony-4", + "matthiasnoback/symfony-dependency-injection-test": "^1.1 || ^2.0 || dev-master", "nyholm/nsa": "^1.1", "php-http/buzz-adapter": "^0.3", "php-http/curl-client": "^1.0", From dfe7f562085ab7caa13547be12429bd6e6a27d3c Mon Sep 17 00:00:00 2001 From: Tobias Nyholm Date: Thu, 30 Nov 2017 13:40:54 +0100 Subject: [PATCH 5/7] Use stable versions --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 169e417f..636ef6a2 100644 --- a/composer.json +++ b/composer.json @@ -37,7 +37,7 @@ }, "require-dev": { "guzzlehttp/psr7": "^1.0", - "matthiasnoback/symfony-dependency-injection-test": "^1.1 || ^2.0 || dev-master", + "matthiasnoback/symfony-dependency-injection-test": "^1.1 || ^2.3", "nyholm/nsa": "^1.1", "php-http/buzz-adapter": "^0.3", "php-http/curl-client": "^1.0", From 85f9571597000790d6774714dd36928da1c8a24b Mon Sep 17 00:00:00 2001 From: Fabien Bourigault Date: Thu, 30 Nov 2017 14:16:12 +0100 Subject: [PATCH 6/7] improve travis-ci matrix --- .travis.yml | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/.travis.yml b/.travis.yml index a792a370..d0172ed4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,38 +21,40 @@ matrix: fast_finish: true include: # Minimum supported Symfony version and latest PHP version - - php: 7.1 - env: DEPENDENCIES="minimum" COVERAGE=true TEST_COMMAND="composer test-ci" SYMFONY_DEPRECATIONS_HELPER="weak" SYMFONY_PHPUNIT_VERSION="5.7" + - php: 7.2 + env: COMPOSER_FLAGS="--prefer-stable --prefer-lowest" SYMFONY_DEPRECATIONS_HELPER="weak" SYMFONY_PHPUNIT_VERSION="5.7" # Test the latest stable release + - php: 5.5 + env: SYMFONY_PHPUNIT_VERSION="5.7" - php: 5.6 env: SYMFONY_PHPUNIT_VERSION="5.7" - php: 7.0 - php: 7.1 - php: 7.2 + env: COVERAGE=true TEST_COMMAND="composer test-ci" # Test LTS versions - - php: 5.5 + - php: 7.2 env: DEPENDENCIES="dunglas/symfony-lock:^2" - - php: 5.5 + - php: 7.2 env: DEPENDENCIES="dunglas/symfony-lock:^3" - - php: 7.1 - env: DEPENDENCIES="dunglas/symfony-lock:^4" + - php: 7.2 + env: DEPENDENCIES="dunglas/symfony-lock:^4" STABILITY="rc" # Latest commit to master - - php: 7.1 - env: DEPENDENCIES="dev" + - php: 7.2 + env: STABILITY="dev" allow_failures: # dev-master is allowed to fail. - - php: 7.1 - env: DEPENDENCIES="dev" + - php: 7.2 + env: STABILITY="dev" before_install: - if [[ $COVERAGE != true ]]; then phpenv config-rm xdebug.ini || true; fi - - 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; + - if ! [ -z "$STABILITY" ]; then composer config minimum-stability ${STABILITY}; fi; + - if ! [ -v "$DEPENDENCIES" ]; then composer require --no-update ${DEPENDENCIES}; fi; install: # To be removed when this issue will be resolved: https://github.com/composer/composer/issues/5355 From d349100b6f83821aa569104a0caed5e0013afc7a Mon Sep 17 00:00:00 2001 From: Fabien Bourigault Date: Thu, 30 Nov 2017 15:31:04 +0100 Subject: [PATCH 7/7] any job with dev stability is allowed to fail --- .travis.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index d0172ed4..934be369 100644 --- a/.travis.yml +++ b/.travis.yml @@ -47,9 +47,8 @@ matrix: env: STABILITY="dev" allow_failures: - # dev-master is allowed to fail. - - php: 7.2 - env: STABILITY="dev" + # dev stability is allowed to fail. + - env: STABILITY="dev" before_install: - if [[ $COVERAGE != true ]]; then phpenv config-rm xdebug.ini || true; fi