soft validate email address

tanigami · Nov 6, 2018 · 6f67fe5 · 6f67fe5
1 parent 4b73640
commit 6f67fe5
Show file tree

Hide file tree

Showing 2 changed files with 44 additions and 5 deletions.
diff --git a/src/Web/EmailAddress.php b/src/Web/EmailAddress.php
@@ -13,13 +13,15 @@ class EmailAddress
 
     /**
      * @param string $emailAddress
+     * @param bool $validateSoft
      */
-    public function __construct(string $emailAddress)
+    public function __construct(string $emailAddress, bool $validateSoft = false)
     {
-        if (false === filter_var($emailAddress, FILTER_VALIDATE_EMAIL)) {
+        if ($validateSoft && !$this->validateSoft($emailAddress) ||
+            !$validateSoft && !$this->validateStrict($emailAddress)
+        ) {
             throw new InvalidArgumentException(sprintf('Invalid email address: %s', $emailAddress));
         }
-
         $this->emailAddress = $emailAddress;
     }
 
@@ -39,4 +41,22 @@ public function emailAddress(): string
     {
         return $this->emailAddress;
     }
+
+    /**
+     * @param string $emailAddress
+     * @return bool
+     */
+    private function validateSoft(string $emailAddress): bool
+    {
+        return preg_match('/^.+\@\S+\.\S+$/', $emailAddress);
+    }
+
+    /**
+     * @param string $emailAddress
+     * @return bool
+     */
+    private function validateStrict(string $emailAddress): bool
+    {
+        return filter_var($emailAddress, FILTER_VALIDATE_EMAIL);
+    }
 }
diff --git a/tests/Web/EmailAddressTest.php b/tests/Web/EmailAddressTest.php
@@ -8,13 +8,32 @@ class EmailAddressTest extends TestCase
 {
     /**
      * @expectedException \InvalidArgumentException
-     * @expectedMessage nvalid email address: this_is_not_email_address
+     * @expectedMessage Invalid email address: this_is_not_email_address
      */
-    public function testConstructorReturnsExceptionIfUrlIsInvalid()
+    public function testConstructorThrowsExceptionIfUrlIsInvalid()
     {
         new EmailAddress('this_is_not_email_address');
     }
 
+    /**
+     * @expectedException \InvalidArgumentException
+     * @expectedMessage Invalid email address: [email protected]'
+     */
+    public function testConstructorValidatesStrict()
+    {
+        new EmailAddress('[email protected]');
+    }
+
+    /**
+     * @expectedException \InvalidArgumentException
+     * @expectedMessage Invalid email address: this_is_not_email_address
+     */
+    public function testConstructorValidatesSoft()
+    {
+        new EmailAddress('[email protected]', true);
+        new EmailAddress('this_is_not_email_address', true);
+    }
+
     public function testGetterReturnsValueString()
     {
         $this->assertSame('[email protected]', (new EmailAddress('[email protected]'))->emailAddress());