From e41706d0732044a66bb80546c530386eb767c02f Mon Sep 17 00:00:00 2001 From: Dariusz Ruminski Date: Sun, 6 Jan 2019 11:26:34 +0100 Subject: [PATCH 1/6] Drop exclude-php:7.3 for PHP CS Fixer --- resources/tools.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/tools.json b/resources/tools.json index 2889fe2b..37242d0c 100644 --- a/resources/tools.json +++ b/resources/tools.json @@ -193,7 +193,7 @@ } }, "test": "php-cs-fixer list", - "tags": ["featured", "exclude-php:7.3"] + "tags": ["featured"] }, { "name": "php-formatter", From c51f1333cb87f4aa8326bcfa9a3ecdc470524fec Mon Sep 17 00:00:00 2001 From: Dariusz Ruminski Date: Sun, 6 Jan 2019 11:24:56 +0100 Subject: [PATCH 2/6] Revert "Disable php-formatter on php 7.3 until php-cs-fixer supports it" This reverts commit 784913aac7f6537ee2f8defdbcb0b991220193f6. --- resources/tools.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/resources/tools.json b/resources/tools.json index 37242d0c..6056b5b0 100644 --- a/resources/tools.json +++ b/resources/tools.json @@ -207,8 +207,7 @@ "version": "1fa3d9a3e1c67654f3fe2511bd28fa7c33b59d7e" } }, - "test": "php-formatter list", - "tags": ["exclude-php:7.3"] + "test": "php-formatter list" }, { "name": "php-semver-checker", From da50a8df3771de09ed49875befc58ba981627f56 Mon Sep 17 00:00:00 2001 From: Dariusz Ruminski Date: Sun, 6 Jan 2019 11:25:02 +0100 Subject: [PATCH 3/6] Revert "Disable easycodingstandard on php 7.3 until php-cs-fixer supports it" This reverts commit c7146031bf4fa5cee90a35a94345f727de9fe4b6. --- resources/tools.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/resources/tools.json b/resources/tools.json index 6056b5b0..81cc1b0c 100644 --- a/resources/tools.json +++ b/resources/tools.json @@ -110,8 +110,7 @@ "target-dir": "%target-dir%/EasyCodingStandard" } }, - "test": "ecs -h", - "tags": ["exclude-php:7.3"] + "test": "ecs -h" }, { "name": "infection", From cdce08067ac9a8327b756bcc9fe1939a37fa8bb2 Mon Sep 17 00:00:00 2001 From: Dariusz Ruminski Date: Sun, 6 Jan 2019 11:25:08 +0100 Subject: [PATCH 4/6] Revert "Disable php-coupling-detector on php 7.3 until php-cs-fixer supports it" This reverts commit 49bcc51caff9047a7877aa97e9500568ec9df877. --- resources/tools.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/resources/tools.json b/resources/tools.json index 81cc1b0c..37518994 100644 --- a/resources/tools.json +++ b/resources/tools.json @@ -178,8 +178,7 @@ "namespace": "php-coupling-detector" } }, - "test": "php-coupling-detector list", - "tags": ["exclude-php:7.3"] + "test": "php-coupling-detector list" }, { "name": "php-cs-fixer", From 37d8ac3b503b0e42147ce8d2d8eb3ad72b15d89a Mon Sep 17 00:00:00 2001 From: Dariusz Ruminski Date: Sun, 6 Jan 2019 11:28:43 +0100 Subject: [PATCH 5/6] Revert "Run tests on php 7.3" This reverts commit d7e01c0e063341085dffdbb57d835662174813d1. --- Makefile | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 3ac9ce59..62552c44 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,5 @@ default: build -PHP_VERSION:=$(shell php -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;') TOOLBOX_VERSION?=dev build: install test @@ -34,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 --exclude-tag exclude-php:$(PHP_VERSION) && \ - build/toolbox.phar test --target-dir ./build/tools --exclude-tag exclude-php:$(PHP_VERSION) + build/toolbox.phar install --target-dir ./build/tools && \ + build/toolbox.phar test --target-dir ./build/tools .PHONY: test-integration cs: tools/php-cs-fixer - PHP_CS_FIXER_IGNORE_ENV=1 tools/php-cs-fixer --dry-run --allow-risky=yes --no-interaction --ansi fix + tools/php-cs-fixer --dry-run --allow-risky=yes --no-interaction --ansi fix .PHONY: cs cs-fix: tools/php-cs-fixer - PHP_CS_FIXER_IGNORE_ENV=1 tools/php-cs-fixer --allow-risky=yes --no-interaction --ansi fix + tools/php-cs-fixer --allow-risky=yes --no-interaction --ansi fix .PHONY: cs-fix deptrac: tools/deptrac From d80bb527874f9861b48290e176eb5977ffc0c9ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dariusz=20Rumi=C5=84ski?= Date: Mon, 7 Jan 2019 16:24:48 +0100 Subject: [PATCH 6/6] Update Makefile --- Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 62552c44..36b51308 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,6 @@ default: build +PHP_VERSION:=$(shell php -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;') TOOLBOX_VERSION?=dev build: install test @@ -33,8 +34,8 @@ 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