Merge pull request #5 from wmde/php72-v2

PHP 7.2 - revised

.travis.yml

@@ -1,10 +1,9 @@
 language: php
 
+# php version to use for travis' composer & coverage
 php:
   - 7.1
 
-sudo: false
-
 services:
   - docker
 
@@ -16,7 +15,6 @@ script:
   - make ci
 
 after_success:
-  - if [[ "`phpenv version-name`" != "7.1" ]]; then exit 0; fi
   - vendor/bin/phpunit --coverage-clover coverage.clover
   - wget https://scrutinizer-ci.com/ocular.phar
   - php ocular.phar code-coverage:upload --format=php-clover coverage.clover

Dockerfile-7.1 → Dockerfile

@@ -1,4 +1,6 @@
-FROM php:7.1-cli
+ARG PHP_VERSION
+
+FROM php:${PHP_VERSION}-cli
 
 RUN \
 	apt-get update && \

Makefile

@@ -20,15 +20,12 @@ phpunit:
 
 phpcs:
 	docker-compose run --rm fun-validators-7.1 ./vendor/bin/phpcs
-	docker-compose run --rm fun-validators-7.2 ./vendor/bin/phpcs
 
 stan:
 	docker-compose run --rm fun-validators-7.1 ./vendor/bin/phpstan analyse --level=1 --no-progress src/ tests/
-	docker-compose run --rm fun-validators-7.2 ./vendor/bin/phpstan analyse --level=1 --no-progress src/ tests/
 
 covers:
 	docker-compose run --rm fun-validators-7.1 ./vendor/bin/covers-validator
-	docker-compose run --rm fun-validators-7.2 ./vendor/bin/covers-validator
 
 composer:
 	docker run --rm --interactive --tty --volume $(shell pwd):/app -w /app\

README.md

@@ -55,7 +55,7 @@ To run just the PHPUnit tests run
 
 To run only a subset of PHPUnit tests or otherwise pass flags to PHPUnit, run
 
-    docker-compose run --rm app ./vendor/bin/phpunit --filter SomeClassNameOrFilter
+    docker-compose run --rm fun-validators-7.1 ./vendor/bin/phpunit --filter SomeClassNameOrFilter
 
 If you have failing unit tests but want to run them for all PHP versions
 (normally it would bail on the first error) you can do so using

docker-compose.yml

@@ -3,17 +3,18 @@ version: '2'
 services:
   fun-validators-7.1:
     build:
-      context: ./
-      dockerfile: Dockerfile-7.1
-    image: fun-validators:7.1
+      context: .
+      args:
+        PHP_VERSION: 7.1
     volumes:
       - ./:/usr/src/app
     working_dir: /usr/src/app
+    image: wmde/fun-validators:7.1
 
   fun-validators-7.2:
     extends:
       service: fun-validators-7.1
     build:
-      context: ./
-      dockerfile: Dockerfile-7.2
-    image: fun-validators:7.2
+      args:
+        PHP_VERSION: 7.2
+    image: wmde/fun-validators:7.2