Added the following validator: isEmail.

lfbn · Feb 21, 2018 · fc46cc1 · fc46cc1
1 parent 25662ae
commit fc46cc1
Show file tree

Hide file tree

Showing 4 changed files with 69 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,7 +5,13 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
-- Add the following validators: isEmail and isUrl.
+- Add the following validator isUrl.
+- Refactor unit tests to mock also PHP built-in methods.
+- Add type casting.
+
+## [1.0.4] - 2018-02-21
+### Added
+- Added the following validator: isEmail.
 
 ## [1.0.3] - 2018-02-20
 ### Added

diff --git a/composer.json b/composer.json
@@ -1,6 +1,6 @@
 {
   "name": "lfbn/base-model",
-  "version": "1.0.3",
+  "version": "1.0.4",
   "description": "This is a Base Model that can be extended to define Models. It helps handling data validation, and data conversion.",
   "keywords": ["validation", "model"],
   "homepage": "https://github.com/lfbn/base-model",

diff --git a/src/Helpers/ValidatorHelper.php b/src/Helpers/ValidatorHelper.php
@@ -197,4 +197,17 @@ public function isArray($value)
 
         return false;
     }
+
+    /**
+     * @param string $value
+     * @return boolean
+     */
+    public function isEmail($value)
+    {
+        if (filter_var($value, FILTER_VALIDATE_EMAIL)) {
+            return true;
+        }
+
+        return false;
+    }
 }
diff --git a/tests/Helpers/ValidatorHelperTest.php b/tests/Helpers/ValidatorHelperTest.php
@@ -81,7 +81,7 @@ public function testIfIsNumericFails($input)
 
     /**
      * @param integer $input
-         * @dataProvider numericProvider
+     * @dataProvider numericProvider
      */
     public function testIfIsNumericSucceeds($input)
     {
@@ -256,7 +256,7 @@ public function testIfIsNotNullFails($input)
     }
 
     /**
-     * @param null $input
+     * @param mixed $input
      * @dataProvider notNullProvider
      */
     public function testIfIsNotNullSucceeds($input)
@@ -278,7 +278,7 @@ public function testIfIsArrayFails($input)
     }
 
     /**
-     * @param null $input
+     * @param array $input
      * @dataProvider arrayProvider
      */
     public function testIfIsArraySucceeds($input)
@@ -288,6 +288,32 @@ public function testIfIsArraySucceeds($input)
         );
     }
 
+    /**
+     * @param string $input
+     * @dataProvider notEmailProvider
+     */
+    public function testIfIsEmailFails($input)
+    {
+        $this->assertFalse(
+            $this->validatorHelperMock->isEmail($input)
+        );
+    }
+
+    /**
+     * @param string $input
+     * @dataProvider emailProvider
+     */
+    public function testIfIsEmailSucceeds($input)
+    {
+        $this->assertTrue(
+            $this->validatorHelperMock->isEmail($input)
+        );
+    }
+
+    /**
+     * PROVIDERS
+     */
+
     /**
      * @return array
      */
@@ -471,4 +497,23 @@ public function notArrayProvider()
             'Boolean' => [true]
         ];
     }
+
+    public function emailProvider()
+    {
+        return [
+            'Valid e-mail' => ['test@test.com'],
+            'Valid e-mail with several dots' => ['test.test.test@test.com'],
+            'Valid e-mail with plus sign' => ['test+test@test.com'],
+            'Valid e-mail with underscore' => ['test_test@test.com']
+        ];
+    }
+
+    public function notEmailProvider()
+    {
+        return [
+            'Invalid e-mail without domain' => ['test'],
+            'Invalid e-mail with only domain' => ['@test.com'],
+            'Invalid e-mail with two at' => ['test@test@.com']
+        ];
+    }
 }