diff --git a/.gitignore b/.gitignore index 51b61c4..987d687 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ vendor/ .idea/ +.phpunit.result.cache diff --git a/.travis.yml b/.travis.yml index 0214a87..794b93c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,7 +2,7 @@ language: php # php version to use for travis' composer & coverage php: - - 7.1 + - 7.4 services: - docker diff --git a/Dockerfile b/Dockerfile deleted file mode 100644 index 0d8e7ac..0000000 --- a/Dockerfile +++ /dev/null @@ -1,9 +0,0 @@ -ARG PHP_VERSION - -FROM php:${PHP_VERSION}-cli - -RUN \ - apt-get update && \ - # for intl - apt-get install -y libicu-dev && \ - docker-php-ext-install -j$(nproc) intl diff --git a/Makefile b/Makefile index 23d7e0b..e486432 100644 --- a/Makefile +++ b/Makefile @@ -15,16 +15,16 @@ test: covers phpunit cs: phpcs stan phpunit: - docker-compose run --rm fun-validators-7.2 ./vendor/bin/phpunit + docker-compose run --rm fun-validators ./vendor/bin/phpunit phpcs: - docker-compose run --rm fun-validators-7.2 ./vendor/bin/phpcs + docker-compose run --rm fun-validators ./vendor/bin/phpcs stan: - docker-compose run --rm fun-validators-7.2 ./vendor/bin/phpstan analyse --level=1 --no-progress src/ tests/ + docker-compose run --rm fun-validators ./vendor/bin/phpstan analyse --level=1 --no-progress src/ tests/ covers: - docker-compose run --rm fun-validators-7.2 ./vendor/bin/covers-validator + docker-compose run --rm fun-validators ./vendor/bin/covers-validator composer: docker run --rm --interactive --tty --volume $(shell pwd):/app -w /app\ diff --git a/composer.json b/composer.json index b1256c7..5d56916 100644 --- a/composer.json +++ b/composer.json @@ -6,12 +6,12 @@ "php": ">=7.2" }, "require-dev": { - "phpunit/phpunit": "~7.0", + "phpunit/phpunit": "~8.0", "ockcyp/covers-validator": "~1.0", - "squizlabs/php_codesniffer": "~3.0", - "slevomat/coding-standard": "~4.0", - "mediawiki/mediawiki-codesniffer": "~13.0", - "phpstan/phpstan": "^0.10" + "squizlabs/php_codesniffer": "~3.4", + "slevomat/coding-standard": "~4.4", + "mediawiki/mediawiki-codesniffer": "~30.0", + "phpstan/phpstan": "^0.11" }, "autoload": { "psr-4": { diff --git a/docker-compose.yml b/docker-compose.yml index 0b6be95..9adbab6 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,12 +1,8 @@ version: '2' services: - fun-validators-7.2: - build: - context: . - args: - PHP_VERSION: 7.2 + fun-validators: + image: wikimediade/fundraising-frontend:dev volumes: - ./:/usr/src/app working_dir: /usr/src/app - image: wmde/fun-validators:7.2 \ No newline at end of file diff --git a/phpcs.xml b/phpcs.xml index 8aa68bb..6e41e4f 100644 --- a/phpcs.xml +++ b/phpcs.xml @@ -136,6 +136,7 @@ +