From a7a6a7f4f840873c2e0901b9693e05b6020bea75 Mon Sep 17 00:00:00 2001 From: l0gicgate Date: Fri, 2 Nov 2018 13:16:06 -0600 Subject: [PATCH 1/4] fixes broken code coverage --- .travis.yml | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/.travis.yml b/.travis.yml index d51a45a..8ceb9a7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,25 +2,27 @@ sudo: false language: php -php: - - 7.1 - - 7.2 - - 7.3 - - nightly +dist: trusty matrix: + include: + - php: 7.1 + env: ANALYSIS='true' + - php: 7.2 + - php: 7.3 + - php: nightly allow_failures: - - php: nightly + - php: nightly before_script: - - composer require php-coveralls/php-coveralls:^2.1.0 - - composer install -n +- composer require php-coveralls/php-coveralls:^2.1.0 +- composer install -n script: - - mkdir -p build/logs && phpunit --coverage-clover build/logs/clover.xml - - vendor/bin/phpunit - - vendor/bin/phpcs - - vendor/bin/phpstan analyse src tests +- if [[ "$ANALYSIS" == 'true' ]]; then vendor/bin/phpunit --coverage-clover clover.xml ; fi +- vendor/bin/phpunit +- vendor/bin/phpcs +- vendor/bin/phpstan analyse src tests -after_script: - - php vendor/bin/coveralls -v +after_success: +- if [[ "$ANALYSIS" == 'true' ]]; then vendor/bin/php-coveralls --clover=clover.xml -v ; fi From c335b2b22ebbc40278403757ac3c66e90c1222e5 Mon Sep 17 00:00:00 2001 From: l0gicgate Date: Fri, 2 Nov 2018 13:20:42 -0600 Subject: [PATCH 2/4] fix coverage clover parameter --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 8ceb9a7..70e9873 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,4 +25,4 @@ script: - vendor/bin/phpstan analyse src tests after_success: -- if [[ "$ANALYSIS" == 'true' ]]; then vendor/bin/php-coveralls --clover=clover.xml -v ; fi +- if [[ "$ANALYSIS" == 'true' ]]; then vendor/bin/php-coveralls --coverage_clover=clover.xml -v ; fi From e62018a9d9fd6eb2cb1102b63922f6eee1bf4284 Mon Sep 17 00:00:00 2001 From: l0gicgate Date: Fri, 2 Nov 2018 13:28:00 -0600 Subject: [PATCH 3/4] removed unrecognized option from coveralls.yml --- .coveralls.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.coveralls.yml b/.coveralls.yml index 943ea2a..9160059 100644 --- a/.coveralls.yml +++ b/.coveralls.yml @@ -1,2 +1 @@ service_name: travis-ci -src_dir: src From 273f977b959d7dd6ed0caaab23d75a9e3bf36f7c Mon Sep 17 00:00:00 2001 From: l0gicgate Date: Fri, 2 Nov 2018 13:29:42 -0600 Subject: [PATCH 4/4] add json_path to coveralls.yml --- .coveralls.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.coveralls.yml b/.coveralls.yml index 9160059..a8172fe 100644 --- a/.coveralls.yml +++ b/.coveralls.yml @@ -1 +1 @@ -service_name: travis-ci +json_path: coveralls-upload.json