From 565adf993342491d8381b17e06af696f4554652f Mon Sep 17 00:00:00 2001 From: Tobias Nyholm Date: Thu, 28 Dec 2017 16:41:29 +0100 Subject: [PATCH 1/7] Added travis config --- .travis.yml | 69 +++++++++++++++++++++++++++++++++------------------ composer.json | 12 ++++----- 2 files changed, 50 insertions(+), 31 deletions(-) diff --git a/.travis.yml b/.travis.yml index f2aefc53..7e3dc0ae 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,43 +9,64 @@ branches: - /^analysis-.*$/ - /^patch-.*$/ -php: - - 5.5 - - 5.6 - - 7.0 - - 7.1 - - 7.2 - env: global: - TEST_COMMAND="composer test" matrix: - fast_finish: true - include: - - php: 5.5 - env: COMPOSER_FLAGS="--prefer-stable --prefer-lowest" COVERAGE=true TEST_COMMAND="composer test-ci" - - php: 7.1 - env: DEPENDENCIES=dev - # Test against LTS versions - - php: 7.0 - env: SYMFONY_VERSION=2.7.* - - php: 7.0 - env: SYMFONY_VERSION=2.8.* PACKAGES=twig/twig:^1.34 - - php: 7.0 - env: SYMFONY_VERSION=2.8.* + fast_finish: true + include: + # Test with lowest dependencies + - php: 7.1 + env: COMPOSER_FLAGS="--prefer-stable --prefer-lowest" SYMFONY_DEPRECATIONS_HELPER="weak" + - php: 5.5 + env: COMPOSER_FLAGS="--prefer-stable --prefer-lowest" SYMFONY_DEPRECATIONS_HELPER="weak" + + # Test the latest stable release + - php: 5.5 + - php: 5.6 + - php: 7.0 + - php: 7.1 + - php: 7.2 + env: COVERAGE=true TEST_COMMAND="composer test-ci" + + # Force some major versions of Symfony + - php: 7.2 + env: DEPENDENCIES="dunglas/symfony-lock:^2" + - php: 7.2 + env: DEPENDENCIES="dunglas/symfony-lock:^3" + - php: 7.2 + env: DEPENDENCIES="dunglas/symfony-lock:^4" + - php: 7.0 + env: DEPENDENCIES="dunglas/symfony-lock:^2 twig/twig:^1.34" + + # Latest commit to master + - php: 7.2 + env: STABILITY="dev" + + allow_failures: + # Dev-master is allowed to fail. + - env: STABILITY="dev" before_install: - - if [ "$SYMFONY_VERSION" != "" ]; then composer require "symfony/symfony:${SYMFONY_VERSION}" --no-update; fi; - - if [ "$PACKAGES" != "" ]; then composer require $PACKAGES --no-update; fi; - - if [ "$DEPENDENCIES" = "dev" ]; then perl -pi -e 's/^}$/,"minimum-stability":"dev"}/' composer.json; fi; + - if [[ $COVERAGE != true ]]; then phpenv config-rm xdebug.ini || true; fi + - if ! [ -z "$STABILITY" ]; then composer config minimum-stability ${STABILITY}; fi; + - if ! [ -z "$DEPENDENCIES" ]; then composer require --no-update ${DEPENDENCIES}; fi; install: - - travis_retry composer update ${COMPOSER_FLAGS} --prefer-dist --no-interaction + # To be removed when this issue will be resolved: https://github.com/composer/composer/issues/5355 + - if [[ "$COMPOSER_FLAGS" == *"--prefer-lowest"* ]]; then composer update --prefer-dist --no-interaction --prefer-stable --quiet; fi + - composer update ${COMPOSER_FLAGS} --prefer-dist --no-interaction + - vendor/bin/simple-phpunit install script: + - composer validate --strict --no-check-lock - $TEST_COMMAND after_success: - if [[ $COVERAGE = true ]]; then wget https://scrutinizer-ci.com/ocular.phar; fi - if [[ $COVERAGE = true ]]; then php ocular.phar code-coverage:upload --format=php-clover build/coverage.xml; fi + +after_script: + - wget http://tnyholm.se/reporter.phar + - php reporter.phar build:upload diff --git a/composer.json b/composer.json index 56062828..93ddd4ed 100644 --- a/composer.json +++ b/composer.json @@ -22,7 +22,7 @@ "php-translation/extractor": "^1.2" }, "require-dev": { - "phpunit/phpunit": "^4.8.36 || ^5.5 || ^6.2", + "symfony/phpunit-bridge": "^3.4 || ^4.0", "php-translation/translator": "^0.1", "php-http/curl-client": "^1.7", "php-http/message": "^1.6", @@ -34,10 +34,10 @@ "symfony/templating": "^2.7 || ^3.0 || ^4.0", "symfony/dependency-injection": "^2.7 || ^3.0 || ^4.0", "symfony/web-profiler-bundle": "^2.7 || ^3.0 || ^4.0", - "matthiasnoback/symfony-dependency-injection-test": "^1.0 || ^2.0", + "matthiasnoback/symfony-dependency-injection-test": "^1.0 || 2.0", "guzzlehttp/psr7": "^1.4", "nyholm/nsa": "^1.1", - "nyholm/symfony-bundle-test": "^1.2" + "nyholm/symfony-bundle-test": "^1.2.3" }, "suggest": { "php-http/httplug-bundle": "To easier configure your httplug clients." @@ -46,11 +46,9 @@ "psr-4": { "Translation\\Bundle\\": "" } }, "scripts": { - "test": "vendor/bin/phpunit", - "test-ci": "vendor/bin/phpunit --coverage-text --coverage-clover=build/coverage.xml" + "test": "vendor/bin/simple-phpunit", + "test-ci": "vendor/bin/simple-phpunit --coverage-text --coverage-clover=build/coverage.xml" }, - "minimum-stability": "dev", - "prefer-stable": true, "extra": { "branch-alias": { "dev-master": "0.4-dev" From d916189f0a1f9d58aaff55af0e235750b45d679b Mon Sep 17 00:00:00 2001 From: Tobias Nyholm Date: Thu, 28 Dec 2017 16:42:52 +0100 Subject: [PATCH 2/7] Bugfix --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 93ddd4ed..f04d1818 100644 --- a/composer.json +++ b/composer.json @@ -34,7 +34,7 @@ "symfony/templating": "^2.7 || ^3.0 || ^4.0", "symfony/dependency-injection": "^2.7 || ^3.0 || ^4.0", "symfony/web-profiler-bundle": "^2.7 || ^3.0 || ^4.0", - "matthiasnoback/symfony-dependency-injection-test": "^1.0 || 2.0", + "matthiasnoback/symfony-dependency-injection-test": "^1.0 || ^2.0", "guzzlehttp/psr7": "^1.4", "nyholm/nsa": "^1.1", "nyholm/symfony-bundle-test": "^1.2.3" From a7bae2ed3794189c0cbc1d04df32dc939b720703 Mon Sep 17 00:00:00 2001 From: Tobias Nyholm Date: Thu, 28 Dec 2017 19:17:22 +0100 Subject: [PATCH 3/7] minor --- .travis.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 7e3dc0ae..71940864 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,6 +12,7 @@ branches: env: global: - TEST_COMMAND="composer test" + - SYMFONY_PHPUNIT_VERSION="6.3" matrix: fast_finish: true @@ -20,11 +21,13 @@ matrix: - php: 7.1 env: COMPOSER_FLAGS="--prefer-stable --prefer-lowest" SYMFONY_DEPRECATIONS_HELPER="weak" - php: 5.5 - env: COMPOSER_FLAGS="--prefer-stable --prefer-lowest" SYMFONY_DEPRECATIONS_HELPER="weak" + 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 From e89531837efc91ce47bd7e369846dade4972b7ca Mon Sep 17 00:00:00 2001 From: Tobias Nyholm Date: Thu, 28 Dec 2017 19:24:01 +0100 Subject: [PATCH 4/7] Temporary allow deprecations --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 71940864..ea1f8b2a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,6 +13,7 @@ env: global: - TEST_COMMAND="composer test" - SYMFONY_PHPUNIT_VERSION="6.3" + - SYMFONY_DEPRECATIONS_HELPER="weak" # Temporary, To be removed matrix: fast_finish: true From 4bb550b5d77f2b467cb817a917cadbf70b6444d2 Mon Sep 17 00:00:00 2001 From: Tobias Nyholm Date: Thu, 28 Dec 2017 19:26:20 +0100 Subject: [PATCH 5/7] Added property access in sf 2 --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index ea1f8b2a..e3292ecd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -36,13 +36,13 @@ matrix: # Force some major versions of Symfony - php: 7.2 - env: DEPENDENCIES="dunglas/symfony-lock:^2" + env: DEPENDENCIES="dunglas/symfony-lock:^2 symfony/property-access:^2.8" - php: 7.2 env: DEPENDENCIES="dunglas/symfony-lock:^3" - php: 7.2 env: DEPENDENCIES="dunglas/symfony-lock:^4" - php: 7.0 - env: DEPENDENCIES="dunglas/symfony-lock:^2 twig/twig:^1.34" + env: DEPENDENCIES="dunglas/symfony-lock:^2 twig/twig:^1.34 symfony/property-access:^2.8" # Latest commit to master - php: 7.2 From b9d0b19b55adadfebf05919caa71b51aa19cc700 Mon Sep 17 00:00:00 2001 From: Tobias Nyholm Date: Thu, 28 Dec 2017 19:32:55 +0100 Subject: [PATCH 6/7] Better versions of matthias nobacks tests --- composer.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index f04d1818..054282f1 100644 --- a/composer.json +++ b/composer.json @@ -34,7 +34,8 @@ "symfony/templating": "^2.7 || ^3.0 || ^4.0", "symfony/dependency-injection": "^2.7 || ^3.0 || ^4.0", "symfony/web-profiler-bundle": "^2.7 || ^3.0 || ^4.0", - "matthiasnoback/symfony-dependency-injection-test": "^1.0 || ^2.0", + "matthiasnoback/symfony-dependency-injection-test": "^1.2 || ^2.3", + "matthiasnoback/symfony-config-test": "^2.2 || ^3.1", "guzzlehttp/psr7": "^1.4", "nyholm/nsa": "^1.1", "nyholm/symfony-bundle-test": "^1.2.3" From d746e954d6f89c4a3c5db29b635ae23640664b50 Mon Sep 17 00:00:00 2001 From: Tobias Nyholm Date: Thu, 28 Dec 2017 20:16:21 +0100 Subject: [PATCH 7/7] Using phpunit 5.7 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index e3292ecd..f75590e7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,7 +20,7 @@ matrix: include: # Test with lowest dependencies - php: 7.1 - env: COMPOSER_FLAGS="--prefer-stable --prefer-lowest" SYMFONY_DEPRECATIONS_HELPER="weak" + env: COMPOSER_FLAGS="--prefer-stable --prefer-lowest" SYMFONY_DEPRECATIONS_HELPER="weak" SYMFONY_PHPUNIT_VERSION="5.7" - php: 5.5 env: COMPOSER_FLAGS="--prefer-stable --prefer-lowest" SYMFONY_DEPRECATIONS_HELPER="weak" SYMFONY_PHPUNIT_VERSION="5.7"