Skip to content

Commit 76e1bf9

Browse files
authored
Merge pull request #37 from graze/fix/makefile-php-versions
Makefile: target PHP 7.4 (and matrix 8.0-8.5), use phpcs.xml.dist
2 parents 5f9ef4e + e3bd8fe commit 76e1bf9

1 file changed

Lines changed: 10 additions & 7 deletions

File tree

Makefile

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
SHELL = /bin/sh
22

33
DOCKER = $(shell which docker)
4-
PHP_VER := 7.2
4+
PHP_VER := 7.4
55
IMAGE := graze/php-alpine:${PHP_VER}-test
66
VOLUME := /srv
77
DOCKER_RUN_BASE := ${DOCKER} run --rm -t -v $$(pwd):${VOLUME} -w ${VOLUME}
@@ -41,10 +41,10 @@ test: ## Run the unit and integration testsuites.
4141
test: lint test-unit
4242

4343
lint: ## Run phpcs against the code.
44-
${DOCKER_RUN} vendor/bin/phpcs -p --warning-severity=0 src/ tests/
44+
${DOCKER_RUN} vendor/bin/phpcs --standard=./phpcs.xml.dist -p --warning-severity=0 src/ tests/
4545

4646
lint-fix: ## Run phpcsf and fix possible lint errors.
47-
${DOCKER_RUN} vendor/bin/phpcbf -p src/ tests/
47+
${DOCKER_RUN} vendor/bin/phpcbf --standard=./phpcs.xml.dist -p src/ tests/
4848

4949
test-unit: ## Run the unit testsuite.
5050
${DOCKER_RUN} vendor/bin/phpunit --testsuite unit
@@ -58,10 +58,13 @@ test-matrix-lowest: ## Test all version, with the lowest version
5858
${MAKE} build-update
5959

6060
test-matrix: ## Run the unit tests against multiple targets.
61-
${MAKE} PHP_VER="5.6" build-update test
62-
${MAKE} PHP_VER="7.0" build-update test
63-
${MAKE} PHP_VER="7.1" build-update test
64-
${MAKE} PHP_VER="7.2" build-update test
61+
${MAKE} PHP_VER="7.4" build-update test
62+
${MAKE} PHP_VER="8.0" build-update test
63+
${MAKE} PHP_VER="8.1" build-update test
64+
${MAKE} PHP_VER="8.2" build-update test
65+
${MAKE} PHP_VER="8.3" build-update test
66+
${MAKE} PHP_VER="8.4" build-update test
67+
${MAKE} PHP_VER="8.5" build-update test
6568

6669
test-coverage: ## Run all tests and output coverage to the console.
6770
${DOCKER_RUN} phpdbg7 -qrr vendor/bin/phpunit --coverage-text

0 commit comments

Comments
 (0)