Create tests for "egulias/email-validator" ~2.1

composer.json

@@ -16,7 +16,7 @@
         "symfony/polyfill-mbstring": "^1.2"
     },
     "require-dev": {
-        "egulias/email-validator": "~1.2",
+        "egulias/email-validator": "~2.1",
         "malkusch/bav": "~1.0",
         "mikey179/vfsStream": "^1.5",
         "phpunit/phpunit": "~5.3",

library/Rules/Email.php

@@ -23,8 +23,8 @@ class Email extends AbstractRule
 
     public function getEmailValidator()
     {
-        if (!$this->emailValidator instanceof EmailValidator
-            && class_exists('Egulias\\EmailValidator\\EmailValidator')) {
+        if (class_exists(EmailValidator::class)
+            && !$this->emailValidator instanceof EmailValidator) {
             $this->emailValidator = new EmailValidator();
         }
 
@@ -38,7 +38,7 @@ class Email extends AbstractRule
             return is_string($input) && filter_var($input, FILTER_VALIDATE_EMAIL);
         }
 
-        if (!class_exists('Egulias\\EmailValidator\\Validation\\RFCValidation')) {
+        if (!class_exists(RFCValidation::class)) {
             return $emailValidator->isValid($input);
         }
 

tests/unit/Rules/EmailTest.php

@@ -11,6 +11,9 @@
 
 namespace Respect\Validation\Rules;
 
+use Egulias\EmailValidator\EmailValidator;
+use Egulias\EmailValidator\Validation\RFCValidation;
+
 function class_exists($className)
 {
     if (isset($GLOBALS['class_exists'][$className])) {
@@ -29,7 +32,8 @@ class EmailTest extends \PHPUnit_Framework_TestCase
 {
     private function setEmailValidatorExists($value)
     {
-        $GLOBALS['class_exists']['Egulias\EmailValidator\EmailValidator'] = (bool) $value;
+        $GLOBALS['class_exists'][EmailValidator::class] = (bool) $value;
+        $GLOBALS['class_exists'][RFCValidation::class] = (bool) $value;
     }
 
     private function resetClassExists()
@@ -40,7 +44,7 @@ class EmailTest extends \PHPUnit_Framework_TestCase
     private function getEmailValidatorMock()
     {
         $emailValidatorMock = $this
-            ->getMockBuilder('Egulias\\EmailValidator\\EmailValidator')
+            ->getMockBuilder(EmailValidator::class)
             ->disableOriginalConstructor()
             ->getMock();
 
@@ -74,7 +78,7 @@ class EmailTest extends \PHPUnit_Framework_TestCase
 
         $rule = new Email();
 
-        $this->assertInstanceOf('Egulias\\EmailValidator\\EmailValidator', $rule->getEmailValidator());
+        $this->assertInstanceOf(EmailValidator::class, $rule->getEmailValidator());
     }
 
     public function testShouldUseEmailValidatorWhenDefined()
@@ -87,7 +91,7 @@ class EmailTest extends \PHPUnit_Framework_TestCase
         $emailValidator
             ->expects($this->once())
             ->method('isValid')
-            ->with($input)
+            ->with($input, $this->isInstanceOf(RFCValidation::class))
             ->will($this->returnValue(true));
 
         $rule = new Email($emailValidator);