Merge pull request #4 from wmde/php-7-2

Test against PHP 7.2, too

Author: JeroenDeDauw

Dockerfile renamed to Dockerfile-7.1

@@ -0,0 +1,7 @@
+FROM php:7.2-cli
+
+RUN \
+	apt-get update && \
+	# for intl
+	apt-get install -y libicu-dev && \
+	docker-php-ext-install -j$(nproc) intl

Dockerfile-7.2

@@ -15,16 +15,20 @@ test: covers phpunit
 cs: phpcs stan
 
 phpunit:
-	docker-compose run --rm app ./vendor/bin/phpunit
+	docker-compose run --rm fun-validators-7.1 ./vendor/bin/phpunit
+	docker-compose run --rm fun-validators-7.2 ./vendor/bin/phpunit
 
 phpcs:
-	docker-compose run --rm app ./vendor/bin/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 app ./vendor/bin/phpstan analyse --level=1 --no-progress src/ tests/
+	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 app ./vendor/bin/covers-validator
+	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\

Makefile

@@ -56,3 +56,10 @@ 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
+
+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
+
+    make -i test
+
+In this case do keep in mind that the exit code **can not** be used to assess the run's success.

README.md

@@ -1,8 +1,19 @@
 version: '2'
 
 services:
-  app:
-    build: .
+  fun-validators-7.1:
+    build:
+      context: ./
+      dockerfile: Dockerfile-7.1
+    image: fun-validators:7.1
     volumes:
       - ./:/usr/src/app
     working_dir: /usr/src/app
+
+  fun-validators-7.2:
+    extends:
+      service: fun-validators-7.1
+    build:
+      context: ./
+      dockerfile: Dockerfile-7.2
+    image: fun-validators:7.2

docker-compose.yml

@@ -4,6 +4,8 @@
 
 namespace WMDE\FunValidators\Validators;
 
+use const IDNA_NONTRANSITIONAL_TO_ASCII;
+use const INTL_IDNA_VARIANT_UTS46;
 use WMDE\FunValidators\ConstraintViolation;
 use WMDE\FunValidators\DomainNameValidator;
 use WMDE\FunValidators\ValidationResult;
@@ -36,7 +38,7 @@ public function validate( string $emailAddress ): ValidationResult {
 			return new ValidationResult( new ConstraintViolation( $emailAddress, 'email_address_wrong_format' ) );
 		}
 
-		$normalizedDomain = (string)idn_to_ascii( $domain );
+		$normalizedDomain = (string)idn_to_ascii( $domain, IDNA_NONTRANSITIONAL_TO_ASCII, INTL_IDNA_VARIANT_UTS46 );
 
 		if ( !filter_var( $userName . '@' . $normalizedDomain, FILTER_VALIDATE_EMAIL ) ) {
 			return new ValidationResult( new ConstraintViolation( $emailAddress, 'email_address_invalid' ) );