formatting and cleaning

Author: taylorotwell

src/Illuminate/Validation/Concerns/FilterEmailValidation.php

@@ -8,28 +8,31 @@
 class FilterEmailValidation implements EmailValidation
 {
     /**
-     * @var int
+     * The flags to pass to the filter_var function.
+     *
+     * @var int|null
      */
     protected $flags;
 
     /**
-     * Create a new instance which allows any unicode characters in local-part.
+     * Create a new validation instance.
      *
-     * @return static
+     * @param  int  $flags
+     * @return void
      */
-    public static function unicode()
+    public function __construct($flags = null)
     {
-        return new static(FILTER_FLAG_EMAIL_UNICODE);
+        $this->flags = $flags;
     }
 
     /**
-     * FilterEmailValidation constructor.
+     * Create a new instance which allows any unicode characters in local-part.
      *
-     * @param int $flags
+     * @return static
      */
-    public function __construct($flags = 0)
+    public static function unicode()
     {
-        $this->flags = $flags;
+        return new static(FILTER_FLAG_EMAIL_UNICODE);
     }
 
     /**
@@ -41,7 +44,9 @@ public function __construct($flags = 0)
      */
     public function isValid($email, EmailLexer $emailLexer)
     {
-        return filter_var($email, FILTER_VALIDATE_EMAIL, $this->flags) !== false;
+        return is_null($this->flags)
+                    ? filter_var($email, FILTER_VALIDATE_EMAIL) !== false
+                    : filter_var($email, FILTER_VALIDATE_EMAIL, $this->flags) !== false;
     }
 
     /**