From d7e01c0e063341085dffdbb57d835662174813d1 Mon Sep 17 00:00:00 2001 From: Jakub Zalas Date: Mon, 31 Dec 2018 14:49:26 +0000 Subject: [PATCH 1/4] Run tests on php 7.3 --- .travis.yml | 3 ++- Makefile | 10 ++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 65c7c30d..40cb9d67 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,10 +4,11 @@ matrix: - php: 7.1 env: EXECUTE_DEPLOYMENT=true - php: 7.2 + - php: 7.3 env: deps=low fast_finish: true before_install: -- phpenv config-rm xdebug.ini +- phpenv config-rm xdebug.ini || echo "XDebug is not enabled" install: - if [[ $deps = low ]]; then make update-min; else make install; fi script: diff --git a/Makefile b/Makefile index 24804b44..12d40409 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,7 @@ default: build +PHP_VERSION:=$(shell php -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;') + build: install test .PHONY: build @@ -31,16 +33,16 @@ test-integration: package export COMPOSER_HOME=$(shell pwd)/build/tools/.composer && \ chmod +x build/toolbox.phar && \ mkdir -p ./build/tools && \ - build/toolbox.phar install --target-dir ./build/tools && \ - build/toolbox.phar test --target-dir ./build/tools + build/toolbox.phar install --target-dir ./build/tools --exclude-tag exclude-php:$(PHP_VERSION) && \ + build/toolbox.phar test --target-dir ./build/tools --exclude-tag exclude-php:$(PHP_VERSION) .PHONY: test-integration cs: tools/php-cs-fixer - tools/php-cs-fixer --dry-run --allow-risky=yes --no-interaction --ansi fix + PHP_CS_FIXER_IGNORE_ENV=1 tools/php-cs-fixer --dry-run --allow-risky=yes --no-interaction --ansi fix .PHONY: cs cs-fix: tools/php-cs-fixer - tools/php-cs-fixer --allow-risky=yes --no-interaction --ansi fix + PHP_CS_FIXER_IGNORE_ENV=1 tools/php-cs-fixer --allow-risky=yes --no-interaction --ansi fix .PHONY: cs-fix deptrac: tools/deptrac From 49bcc51caff9047a7877aa97e9500568ec9df877 Mon Sep 17 00:00:00 2001 From: Jakub Zalas Date: Mon, 31 Dec 2018 15:01:50 +0000 Subject: [PATCH 2/4] Disable php-coupling-detector on php 7.3 until php-cs-fixer supports it --- resources/tools.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/resources/tools.json b/resources/tools.json index e94be81e..a71bd47d 100644 --- a/resources/tools.json +++ b/resources/tools.json @@ -172,7 +172,8 @@ "namespace": "php-coupling-detector" } }, - "test": "php-coupling-detector list" + "test": "php-coupling-detector list", + "tags": ["exclude-php:7.3"] }, { "name": "php-cs-fixer", From c7146031bf4fa5cee90a35a94345f727de9fe4b6 Mon Sep 17 00:00:00 2001 From: Jakub Zalas Date: Mon, 31 Dec 2018 15:07:18 +0000 Subject: [PATCH 3/4] Disable easycodingstandard on php 7.3 until php-cs-fixer supports it --- resources/tools.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/resources/tools.json b/resources/tools.json index a71bd47d..fa82567b 100644 --- a/resources/tools.json +++ b/resources/tools.json @@ -107,7 +107,8 @@ "target-dir": "%target-dir%/EasyCodingStandard" } }, - "test": "ecs -h" + "test": "ecs -h", + "tags": ["exclude-php:7.3"] }, { "name": "infection", From 784913aac7f6537ee2f8defdbcb0b991220193f6 Mon Sep 17 00:00:00 2001 From: Jakub Zalas Date: Mon, 31 Dec 2018 15:13:27 +0000 Subject: [PATCH 4/4] Disable php-formatter on php 7.3 until php-cs-fixer supports it --- resources/tools.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/resources/tools.json b/resources/tools.json index fa82567b..cdba1608 100644 --- a/resources/tools.json +++ b/resources/tools.json @@ -201,7 +201,8 @@ "version": "1fa3d9a3e1c67654f3fe2511bd28fa7c33b59d7e" } }, - "test": "php-formatter list" + "test": "php-formatter list", + "tags": ["exclude-php:7.3"] }, { "name": "php-semver-checker",