new home for comment strategies

CHANGELOG.md

@@ -1,10 +1,10 @@
 ### v3
 ## New Features
 * Access to local part and domain part from EmailParser
-* Extended validations (TO-DO)
+* Extended validations will be added in its own folder
 
 ## Breacking changes
-* PHP version upgrades using new language features
-* DNSCheckValidation now fails for missing MX records (TO-DO)
+* PHP version upgrades using new language features. PHP version requirements will be upgraded via MINOR (3.x) version upgrades.
+* DNSCheckValidation now fails for missing MX records. While the RFC allows for A records to be valid, for the purpose of this library, they will be considered invalid.
 * Emails domain part are now intenteded to be RFC 1030 compliant, rendering previous valid emails (e.g example@examp&) invalid
 

src/Parser/Comment.php

@@ -6,7 +6,7 @@ use Egulias\EmailValidator\EmailLexer;
 use Egulias\EmailValidator\Result\Result;
 use Egulias\EmailValidator\Warning\QuotedPart;
 use Egulias\EmailValidator\Result\InvalidEmail;
-use Egulias\EmailValidator\Parser\CommentStrategy;
+use Egulias\EmailValidator\Parser\CommentStrategy\CommentStrategy;
 use Egulias\EmailValidator\Result\Reason\UnclosedComment;
 use Egulias\EmailValidator\Result\Reason\UnOpenedComment;
 use Egulias\EmailValidator\Warning\Comment as WarningComment;

src/Parser/CommentStrategy/CommentStrategy.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Egulias\EmailValidator\Parser;
+namespace Egulias\EmailValidator\Parser\CommentStrategy;
 
 use Egulias\EmailValidator\EmailLexer;
 use Egulias\EmailValidator\Result\Result;

src/Parser/CommentStrategy/DomainComment.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Egulias\EmailValidator\Parser;
+namespace Egulias\EmailValidator\Parser\CommentStrategy;
 
 use Egulias\EmailValidator\EmailLexer;
 use Egulias\EmailValidator\Result\Result;

src/Parser/CommentStrategy/LocalComment.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Egulias\EmailValidator\Parser;
+namespace Egulias\EmailValidator\Parser\CommentStrategy;
 
 use Egulias\EmailValidator\EmailLexer;
 use Egulias\EmailValidator\Result\Result;

src/Parser/DomainLiteral.php

@@ -146,11 +146,11 @@ class DomainLiteral extends Parser
 
         // Extract IPv4 part from the end of the address-literal (if there is one)
         if ($IPv4Match > 0) {
-            $index = strrpos($addressLiteralIPv4, $matchesIP[0]);
+            $index = (int) strrpos($addressLiteralIPv4, $matchesIP[0]);
             //There's a match but it is at the start
             if ($index > 0) {
                 // Convert IPv4 part to IPv6 format for further testing
-                return substr($addressLiteralIPv4, 0, (int) $index) . '0:0';
+                return substr($addressLiteralIPv4, 0, $index) . '0:0';
             }
         }
 

src/Parser/DomainPart.php

@@ -3,23 +3,24 @@
 namespace Egulias\EmailValidator\Parser;
 
 use Egulias\EmailValidator\EmailLexer;
-use Egulias\EmailValidator\Result\InvalidEmail;
-use Egulias\EmailValidator\Result\Reason\CharNotAllowed;
-use Egulias\EmailValidator\Result\Reason\DomainHyphened;
-use Egulias\EmailValidator\Result\Reason\DotAtEnd;
-use Egulias\EmailValidator\Result\Reason\DotAtStart;
-use Egulias\EmailValidator\Result\Reason\NoDomainPart;
-use Egulias\EmailValidator\Result\Reason\ConsecutiveAt;
-use Egulias\EmailValidator\Result\Reason\ExpectingATEXT;
-use Egulias\EmailValidator\Result\Reason\ExpectingDomainLiteralClose;
+use Egulias\EmailValidator\Warning\TLD;
 use Egulias\EmailValidator\Result\Result;
 use Egulias\EmailValidator\Result\ValidEmail;
+use Egulias\EmailValidator\Result\InvalidEmail;
+use Egulias\EmailValidator\Result\Reason\DotAtEnd;
+use Egulias\EmailValidator\Result\Reason\DotAtStart;
 use Egulias\EmailValidator\Warning\DeprecatedComment;
-use Egulias\EmailValidator\Warning\TLD;
-use Egulias\EmailValidator\Parser\DomainLiteral as DomainLiteralParser;
 use Egulias\EmailValidator\Result\Reason\CRLFAtTheEnd;
-use Egulias\EmailValidator\Result\Reason\DomainTooLong;
 use Egulias\EmailValidator\Result\Reason\LabelTooLong;
+use Egulias\EmailValidator\Result\Reason\NoDomainPart;
+use Egulias\EmailValidator\Result\Reason\ConsecutiveAt;
+use Egulias\EmailValidator\Result\Reason\DomainTooLong;
+use Egulias\EmailValidator\Result\Reason\CharNotAllowed;
+use Egulias\EmailValidator\Result\Reason\DomainHyphened;
+use Egulias\EmailValidator\Result\Reason\ExpectingATEXT;
+use Egulias\EmailValidator\Parser\CommentStrategy\DomainComment;
+use Egulias\EmailValidator\Result\Reason\ExpectingDomainLiteralClose;
+use Egulias\EmailValidator\Parser\DomainLiteral as DomainLiteralParser;
 
 class DomainPart extends Parser
 {

src/Parser/LocalPart.php

@@ -7,10 +7,11 @@ use Egulias\EmailValidator\Result\Result;
 use Egulias\EmailValidator\Result\ValidEmail;
 use Egulias\EmailValidator\Result\InvalidEmail;
 use Egulias\EmailValidator\Warning\LocalTooLong;
-use Egulias\EmailValidator\Result\Reason\ConsecutiveDot;
 use Egulias\EmailValidator\Result\Reason\DotAtEnd;
 use Egulias\EmailValidator\Result\Reason\DotAtStart;
+use Egulias\EmailValidator\Result\Reason\ConsecutiveDot;
 use Egulias\EmailValidator\Result\Reason\ExpectingATEXT;
+use Egulias\EmailValidator\Parser\CommentStrategy\LocalComment;
 
 class LocalPart extends Parser
 {