Merge pull request #5 from wmde/fix-travis

Fix Travis

.travis.yml

@@ -2,13 +2,13 @@ language: php
 
 # php version to use for travis' composer & coverage
 php:
-  - 7.3
+  - 7.4
 
 services:
   - docker
 
 install:
-  - travis_retry make composer install
+  - travis_retry composer install
 
 script:
   - composer validate --no-interaction

Makefile

@@ -15,16 +15,16 @@ test: covers phpunit
 cs: phpcs stan
 
 phpunit:
-	docker-compose run --rm email-address-7.3 ./vendor/bin/phpunit
+	docker-compose run --rm email-address ./vendor/bin/phpunit
 
 phpcs:
-	docker-compose run --rm email-address-7.3 ./vendor/bin/phpcs
+	docker-compose run --rm email-address ./vendor/bin/phpcs
 
 stan:
-	docker-compose run --rm email-address-7.3 ./vendor/bin/phpstan analyse --level=1 --no-progress src/ tests/
+	docker-compose run --rm email-address ./vendor/bin/phpstan analyse --level=1 --no-progress src/ tests/
 
 covers:
-	docker-compose run --rm email-address-7.3 ./vendor/bin/covers-validator
+	docker-compose run --rm email-address ./vendor/bin/covers-validator
 
 composer:
 	docker run --rm --interactive --tty --volume $(shell pwd):/app -w /app\

README.md

@@ -24,7 +24,7 @@ class EmailAddress {
 
 To use the Email Address library in your project, simply add a dependency on wmde/email-address
 to your project's `composer.json` file. Here is a minimal example of a `composer.json`
-file that just defines a dependency on Email Address 1.x:
+file that just defines a dependency on Email Address 2.x:
 
 ```json
 {
@@ -60,11 +60,11 @@ To run all CI checks, which includes PHPUnit tests, PHPCS style checks and cover
 
 ### Running the tests
 
-To run just the PHPUnit tests run
+To run the PHPUnit tests run
 
     make test
 
-To run only a subset of PHPUnit tests or otherwise pass flags to PHPUnit, run
+To run a subset of PHPUnit tests or otherwise pass flags to PHPUnit, run
 
-    docker-compose run --rm email-address-7.1 ./vendor/bin/phpunit --filter SomeClassNameOrFilter
+    docker-compose run --rm email-address ./vendor/bin/phpunit --filter SomeClassNameOrFilter
 

docker-compose.yml

@@ -1,14 +1,10 @@
 version: '2'
 
 services:
-  email-address-7.3:
-    build:
-      context: .
-      args:
-        PHP_VERSION: 7.3
+  email-address:
     volumes:
       - ./:/usr/src/app
     working_dir: /usr/src/app
-    image: wmde/email-address:7.3
+    image: wikimediade/fundraising-frontend:latest