Updated testStrictEmail() test

Kdyby · Jul 12, 2018 · 8e5ac95 · 8e5ac95
1 parent d562844
commit 8e5ac95
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 8 deletions.
diff --git a/src/DI/ValidatorExtension.php b/src/DI/ValidatorExtension.php
@@ -16,7 +16,7 @@
 use Nette;
 use Nette\DI\Compiler;
 use Nette\Utils\Validators;
-
+use Symfony\Component\Validator\Constraints\Email;
 
 
 /**
@@ -84,7 +84,7 @@ public function loadConfiguration()
 		if ($config['strictEmail'] !== NULL) {
             Validators::assertField($config, 'strictEmail', 'boolean');
             trigger_error('`strictEmail` configuration option is deprecated, use `emailValidationMode` instead.', E_USER_DEPRECATED);
-            $config['emailValidationMode'] = \Symfony\Component\Validator\Constraints\Email::VALIDATION_MODE_LOOSE;
+            $config['emailValidationMode'] = Email::VALIDATION_MODE_LOOSE;
         }
 
         Validators::assertField($config, 'emailValidationMode', 'string');

diff --git a/tests/KdybyTests/Validator/Extension.phpt b/tests/KdybyTests/Validator/Extension.phpt
@@ -118,9 +118,9 @@ class ExtensionTest extends Tester\TestCase
 	public function strictEmailDataProvider()
 	{
 		return [
-			[[], FALSE],
-			[[__DIR__ . '/config/strict-email.neon'], TRUE],
-			[[__DIR__ . '/config/non-strict-email.neon'], FALSE],
+			[[], 'loose'],
+			[[__DIR__ . '/config/strict-email.neon'], 'strict'],
+			[[__DIR__ . '/config/non-strict-email.neon'], 'loose'],
 		];
 	}
 
@@ -138,7 +138,8 @@ class ExtensionTest extends Tester\TestCase
 		$validator = $factory->getInstance(new \Symfony\Component\Validator\Constraints\Email());
 		Tester\Assert::type('Symfony\Component\Validator\Constraints\EmailValidator', $validator);
 
-		$property = new \ReflectionProperty('Symfony\Component\Validator\Constraints\EmailValidator', 'isStrict');
+		$property = new \ReflectionProperty('Symfony\Component\Validator\Constraints\EmailValidator', 'defaultMode');
+
 		$property->setAccessible(TRUE);
 		Tester\Assert::same($strict, $property->getValue($validator));
 	}

diff --git a/tests/KdybyTests/Validator/config/non-strict-email.neon b/tests/KdybyTests/Validator/config/non-strict-email.neon
@@ -1,2 +1,2 @@
 validator:
-	strictEmail: false
+	emailValidationMode: 'loose'
diff --git a/tests/KdybyTests/Validator/config/strict-email.neon b/tests/KdybyTests/Validator/config/strict-email.neon
@@ -1,2 +1,2 @@
 validator:
-	strictEmail: true
+	emailValidationMode: 'strict'