From 790881fe752e928cb67bdf077855213b243e7fbf Mon Sep 17 00:00:00 2001
From: Eduardo Gulias Davis <eduardomgulias@gmail.com>
Date: Sat, 5 Dec 2020 23:16:56 +0100
Subject: [PATCH] improving types

---
 src/EmailLexer.php                           | 1 -
 src/EmailParser.php                          | 6 +-----
 src/Validation/DNSCheckValidation.php        | 2 +-
 src/Validation/EmailValidation.php           | 2 +-
 src/Validation/MultipleValidationWithAnd.php | 2 +-
 src/Validation/NoRFCWarningsValidation.php   | 2 +-
 src/Validation/RFCValidation.php             | 4 ++--
 src/Validation/SpoofCheckValidation.php      | 2 +-
 8 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/src/EmailLexer.php b/src/EmailLexer.php
index fa57ae4..853f100 100644
--- a/src/EmailLexer.php
+++ b/src/EmailLexer.php
@@ -105,7 +105,6 @@ class EmailLexer extends AbstractLexer
         '?'    => self::QUESTIONMARK,
         '#'    => self::NUMBER_SIGN,
         '¡'    => self::INVERT_EXCLAMATION,
-        null   => self::S_EMPTY,
     );
 
     /**
diff --git a/src/EmailParser.php b/src/EmailParser.php
index 5259998..9b30c03 100644
--- a/src/EmailParser.php
+++ b/src/EmailParser.php
@@ -40,11 +40,7 @@ class EmailParser
         $this->lexer = $lexer;
     }
 
-    /**
-     * @param string $str
-     * @return Result 
-     */
-    public function parse($str) : Result
+    public function parse(string $str) : Result
     {
         $this->lexer->setInput($str);
 
diff --git a/src/Validation/DNSCheckValidation.php b/src/Validation/DNSCheckValidation.php
index 6f5652f..07a786f 100644
--- a/src/Validation/DNSCheckValidation.php
+++ b/src/Validation/DNSCheckValidation.php
@@ -34,7 +34,7 @@ class DNSCheckValidation implements EmailValidation
         }
     }
 
-    public function isValid($email, EmailLexer $emailLexer) : bool
+    public function isValid(string $email, EmailLexer $emailLexer) : bool
     {
         // use the input to check DNS if we cannot extract something similar to a domain
         $host = $email;
diff --git a/src/Validation/EmailValidation.php b/src/Validation/EmailValidation.php
index 66a4792..669b9d1 100644
--- a/src/Validation/EmailValidation.php
+++ b/src/Validation/EmailValidation.php
@@ -16,7 +16,7 @@ interface EmailValidation
      *
      * @return bool
      */
-    public function isValid($email, EmailLexer $emailLexer) : bool;
+    public function isValid(string $email, EmailLexer $emailLexer) : bool;
 
     /**
      * Returns the validation error.
diff --git a/src/Validation/MultipleValidationWithAnd.php b/src/Validation/MultipleValidationWithAnd.php
index 552fe62..6debf22 100644
--- a/src/Validation/MultipleValidationWithAnd.php
+++ b/src/Validation/MultipleValidationWithAnd.php
@@ -58,7 +58,7 @@ class MultipleValidationWithAnd implements EmailValidation
     /**
      * {@inheritdoc}
      */
-    public function isValid($email, EmailLexer $emailLexer) : bool
+    public function isValid(string $email, EmailLexer $emailLexer) : bool
     {
         $result = true;
         foreach ($this->validations as $validation) {
diff --git a/src/Validation/NoRFCWarningsValidation.php b/src/Validation/NoRFCWarningsValidation.php
index 39a2c8f..06885ed 100644
--- a/src/Validation/NoRFCWarningsValidation.php
+++ b/src/Validation/NoRFCWarningsValidation.php
@@ -16,7 +16,7 @@ class NoRFCWarningsValidation extends RFCValidation
     /**
      * {@inheritdoc}
      */
-    public function isValid($email, EmailLexer $emailLexer) : bool
+    public function isValid(string $email, EmailLexer $emailLexer) : bool
     {
         if (!parent::isValid($email, $emailLexer)) {
             return false;
diff --git a/src/Validation/RFCValidation.php b/src/Validation/RFCValidation.php
index 89af864..e2c27ba 100644
--- a/src/Validation/RFCValidation.php
+++ b/src/Validation/RFCValidation.php
@@ -24,11 +24,11 @@ class RFCValidation implements EmailValidation
      */
     private $error;
 
-    public function isValid($email, EmailLexer $emailLexer) : bool
+    public function isValid(string $email, EmailLexer $emailLexer) : bool
     {
         $this->parser = new EmailParser($emailLexer);
         try {
-            $result = $this->parser->parse((string)$email);
+            $result = $this->parser->parse($email);
             $this->warnings = $this->parser->getWarnings();
             if ($result->isInvalid()) {
                 /** @psalm-suppress PropertyTypeCoercion */
diff --git a/src/Validation/SpoofCheckValidation.php b/src/Validation/SpoofCheckValidation.php
index 372d5a8..16d8e36 100644
--- a/src/Validation/SpoofCheckValidation.php
+++ b/src/Validation/SpoofCheckValidation.php
@@ -24,7 +24,7 @@ class SpoofCheckValidation implements EmailValidation
     /**
      * @psalm-suppress InvalidArgument
      */
-    public function isValid($email, EmailLexer $emailLexer) : bool
+    public function isValid(string $email, EmailLexer $emailLexer) : bool
     {
         $checker = new Spoofchecker();
         $checker->setChecks(Spoofchecker::SINGLE_SCRIPT);