Move files in typical src and tests folder (#242)

* Move files in typical src and tests folder * Fix psalm error
egulias · Jun 16, 2020 · cfa3d44 · cfa3d44
1 parent 2f38a47
commit cfa3d44
Show file tree

Hide file tree

Showing 78 changed files with 23 additions and 23 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -1,5 +1,5 @@
-/Tests export-ignore
 /documentation export-ignore
+/tests export-ignore
 /.* export-ignore
 /phpunit.xml.dist export-ignore
 /psalm.xml export-ignore

diff --git a/composer.json b/composer.json
@@ -18,21 +18,21 @@
     "symfony/polyfill-intl-idn": "^1.10"
   },
   "require-dev": {
-    "satooshi/php-coveralls": "^1.0.1",
+    "dominicsayers/isemail": "^3.0.7",
     "phpunit/phpunit": "^4.8.36|^7.5.15",
-    "dominicsayers/isemail": "^3.0.7"
+    "satooshi/php-coveralls": "^1.0.1"
   },
   "suggest": {
     "ext-intl": "PHP Internationalization Libraries are required to use the SpoofChecking validation"
   },
   "autoload": {
     "psr-4": {
-      "Egulias\\EmailValidator\\": "EmailValidator"
+      "Egulias\\EmailValidator\\": "src"
     }
   },
   "autoload-dev": {
     "psr-4": {
-      "Egulias\\Tests\\": "Tests"
+      "Egulias\\EmailValidator\\Tests\\": "tests"
     }
   }
 }
diff --git a/psalm.baseline.xml b/psalm.baseline.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <files psalm-version="3.8.3@389af1bfc739bfdff3f9e3dc7bd6499aee51a831">
-  <file src="EmailValidator/EmailLexer.php">
+  <file src="src/EmailLexer.php">
     <DocblockTypeContradiction occurrences="1">
       <code>self::$nullToken</code>
     </DocblockTypeContradiction>
   </file>
-  <file src="EmailValidator/Parser/Parser.php">
+  <file src="src/Parser/Parser.php">
     <MissingReturnType occurrences="1">
       <code>parse</code>
     </MissingReturnType>
   </file>
-  <file src="EmailValidator/Validation/SpoofCheckValidation.php">
+  <file src="src/Validation/SpoofCheckValidation.php">
     <UndefinedClass occurrences="2">
       <code>Spoofchecker</code>
       <code>Spoofchecker</code>

diff --git a/psalm.xml b/psalm.xml
@@ -8,7 +8,7 @@
     errorBaseline="./psalm.baseline.xml"
 >
     <projectFiles>
-        <directory name="EmailValidator" />
+        <directory name="src" />
         <ignoreFiles>
             <directory name="vendor" />
         </ignoreFiles>

diff --git a/EmailValidator/EmailLexer.php → src/EmailLexer.php b/EmailValidator/EmailLexer.php → src/EmailLexer.php
diff --git a/EmailValidator/EmailParser.php → src/EmailParser.php b/EmailValidator/EmailParser.php → src/EmailParser.php
diff --git a/EmailValidator/EmailValidator.php → src/EmailValidator.php b/EmailValidator/EmailValidator.php → src/EmailValidator.php
diff --git a/EmailValidator/Exception/AtextAfterCFWS.php → src/Exception/AtextAfterCFWS.php b/EmailValidator/Exception/AtextAfterCFWS.php → src/Exception/AtextAfterCFWS.php
diff --git a/EmailValidator/Exception/CRLFAtTheEnd.php → src/Exception/CRLFAtTheEnd.php b/EmailValidator/Exception/CRLFAtTheEnd.php → src/Exception/CRLFAtTheEnd.php
diff --git a/EmailValidator/Exception/CRLFX2.php → src/Exception/CRLFX2.php b/EmailValidator/Exception/CRLFX2.php → src/Exception/CRLFX2.php
diff --git a/EmailValidator/Exception/CRNoLF.php → src/Exception/CRNoLF.php b/EmailValidator/Exception/CRNoLF.php → src/Exception/CRNoLF.php
diff --git a/EmailValidator/Exception/CharNotAllowed.php → src/Exception/CharNotAllowed.php b/EmailValidator/Exception/CharNotAllowed.php → src/Exception/CharNotAllowed.php
diff --git a/EmailValidator/Exception/CommaInDomain.php → src/Exception/CommaInDomain.php b/EmailValidator/Exception/CommaInDomain.php → src/Exception/CommaInDomain.php
diff --git a/EmailValidator/Exception/ConsecutiveAt.php → src/Exception/ConsecutiveAt.php b/EmailValidator/Exception/ConsecutiveAt.php → src/Exception/ConsecutiveAt.php
diff --git a/EmailValidator/Exception/ConsecutiveDot.php → src/Exception/ConsecutiveDot.php b/EmailValidator/Exception/ConsecutiveDot.php → src/Exception/ConsecutiveDot.php
diff --git a/EmailValidator/Exception/DomainHyphened.php → src/Exception/DomainHyphened.php b/EmailValidator/Exception/DomainHyphened.php → src/Exception/DomainHyphened.php
diff --git a/EmailValidator/Exception/DotAtEnd.php → src/Exception/DotAtEnd.php b/EmailValidator/Exception/DotAtEnd.php → src/Exception/DotAtEnd.php
diff --git a/EmailValidator/Exception/DotAtStart.php → src/Exception/DotAtStart.php b/EmailValidator/Exception/DotAtStart.php → src/Exception/DotAtStart.php
diff --git a/EmailValidator/Exception/ExpectingAT.php → src/Exception/ExpectingAT.php b/EmailValidator/Exception/ExpectingAT.php → src/Exception/ExpectingAT.php
diff --git a/EmailValidator/Exception/ExpectingATEXT.php → src/Exception/ExpectingATEXT.php b/EmailValidator/Exception/ExpectingATEXT.php → src/Exception/ExpectingATEXT.php
diff --git a/EmailValidator/Exception/ExpectingCTEXT.php → src/Exception/ExpectingCTEXT.php b/EmailValidator/Exception/ExpectingCTEXT.php → src/Exception/ExpectingCTEXT.php
diff --git a/EmailValidator/Exception/ExpectingDTEXT.php → src/Exception/ExpectingDTEXT.php b/EmailValidator/Exception/ExpectingDTEXT.php → src/Exception/ExpectingDTEXT.php
diff --git a/...Exception/ExpectingDomainLiteralClose.php → ...Exception/ExpectingDomainLiteralClose.php b/...Exception/ExpectingDomainLiteralClose.php → ...Exception/ExpectingDomainLiteralClose.php
diff --git a/EmailValidator/Exception/ExpectingQPair.php → src/Exception/ExpectingQPair.php b/EmailValidator/Exception/ExpectingQPair.php → src/Exception/ExpectingQPair.php
diff --git a/EmailValidator/Exception/InvalidEmail.php → src/Exception/InvalidEmail.php b/EmailValidator/Exception/InvalidEmail.php → src/Exception/InvalidEmail.php
diff --git a/EmailValidator/Exception/NoDNSRecord.php → src/Exception/NoDNSRecord.php b/EmailValidator/Exception/NoDNSRecord.php → src/Exception/NoDNSRecord.php
diff --git a/EmailValidator/Exception/NoDomainPart.php → src/Exception/NoDomainPart.php b/EmailValidator/Exception/NoDomainPart.php → src/Exception/NoDomainPart.php
diff --git a/EmailValidator/Exception/NoLocalPart.php → src/Exception/NoLocalPart.php b/EmailValidator/Exception/NoLocalPart.php → src/Exception/NoLocalPart.php
diff --git a/EmailValidator/Exception/UnclosedComment.php → src/Exception/UnclosedComment.php b/EmailValidator/Exception/UnclosedComment.php → src/Exception/UnclosedComment.php
diff --git a/...idator/Exception/UnclosedQuotedString.php → src/Exception/UnclosedQuotedString.php b/...idator/Exception/UnclosedQuotedString.php → src/Exception/UnclosedQuotedString.php
diff --git a/EmailValidator/Exception/UnopenedComment.php → src/Exception/UnopenedComment.php b/EmailValidator/Exception/UnopenedComment.php → src/Exception/UnopenedComment.php
diff --git a/EmailValidator/Parser/DomainPart.php → src/Parser/DomainPart.php b/EmailValidator/Parser/DomainPart.php → src/Parser/DomainPart.php
diff --git a/EmailValidator/Parser/LocalPart.php → src/Parser/LocalPart.php b/EmailValidator/Parser/LocalPart.php → src/Parser/LocalPart.php
diff --git a/EmailValidator/Parser/Parser.php → src/Parser/Parser.php b/EmailValidator/Parser/Parser.php → src/Parser/Parser.php
@@ -22,7 +22,7 @@
 abstract class Parser
 {
     /**
-     * @var \Egulias\EmailValidator\Warning\Warning[]
+     * @var array
      */
     protected $warnings = [];
 

diff --git a/...lidator/Validation/DNSCheckValidation.php → src/Validation/DNSCheckValidation.php b/...lidator/Validation/DNSCheckValidation.php → src/Validation/DNSCheckValidation.php
diff --git a/...lValidator/Validation/EmailValidation.php → src/Validation/EmailValidation.php b/...lValidator/Validation/EmailValidation.php → src/Validation/EmailValidation.php
diff --git a/...alidator/Validation/Error/RFCWarnings.php → src/Validation/Error/RFCWarnings.php b/...alidator/Validation/Error/RFCWarnings.php → src/Validation/Error/RFCWarnings.php
diff --git a/...Validator/Validation/Error/SpoofEmail.php → src/Validation/Error/SpoofEmail.php b/...Validator/Validation/Error/SpoofEmail.php → src/Validation/Error/SpoofEmail.php
diff --git a/...idation/Exception/EmptyValidationList.php → ...idation/Exception/EmptyValidationList.php b/...idation/Exception/EmptyValidationList.php → ...idation/Exception/EmptyValidationList.php
diff --git a/EmailValidator/Validation/MultipleErrors.php → src/Validation/MultipleErrors.php b/EmailValidator/Validation/MultipleErrors.php → src/Validation/MultipleErrors.php
diff --git a/.../Validation/MultipleValidationWithAnd.php → src/Validation/MultipleValidationWithAnd.php b/.../Validation/MultipleValidationWithAnd.php → src/Validation/MultipleValidationWithAnd.php
diff --git a/...or/Validation/NoRFCWarningsValidation.php → src/Validation/NoRFCWarningsValidation.php b/...or/Validation/NoRFCWarningsValidation.php → src/Validation/NoRFCWarningsValidation.php
diff --git a/EmailValidator/Validation/RFCValidation.php → src/Validation/RFCValidation.php b/EmailValidator/Validation/RFCValidation.php → src/Validation/RFCValidation.php
diff --git a/...dator/Validation/SpoofCheckValidation.php → src/Validation/SpoofCheckValidation.php b/...dator/Validation/SpoofCheckValidation.php → src/Validation/SpoofCheckValidation.php
diff --git a/EmailValidator/Warning/AddressLiteral.php → src/Warning/AddressLiteral.php b/EmailValidator/Warning/AddressLiteral.php → src/Warning/AddressLiteral.php
diff --git a/EmailValidator/Warning/CFWSNearAt.php → src/Warning/CFWSNearAt.php b/EmailValidator/Warning/CFWSNearAt.php → src/Warning/CFWSNearAt.php
diff --git a/EmailValidator/Warning/CFWSWithFWS.php → src/Warning/CFWSWithFWS.php b/EmailValidator/Warning/CFWSWithFWS.php → src/Warning/CFWSWithFWS.php
diff --git a/EmailValidator/Warning/Comment.php → src/Warning/Comment.php b/EmailValidator/Warning/Comment.php → src/Warning/Comment.php
diff --git a/EmailValidator/Warning/DeprecatedComment.php → src/Warning/DeprecatedComment.php b/EmailValidator/Warning/DeprecatedComment.php → src/Warning/DeprecatedComment.php
diff --git a/EmailValidator/Warning/DomainLiteral.php → src/Warning/DomainLiteral.php b/EmailValidator/Warning/DomainLiteral.php → src/Warning/DomainLiteral.php
diff --git a/EmailValidator/Warning/DomainTooLong.php → src/Warning/DomainTooLong.php b/EmailValidator/Warning/DomainTooLong.php → src/Warning/DomainTooLong.php
diff --git a/EmailValidator/Warning/EmailTooLong.php → src/Warning/EmailTooLong.php b/EmailValidator/Warning/EmailTooLong.php → src/Warning/EmailTooLong.php
diff --git a/EmailValidator/Warning/IPV6BadChar.php → src/Warning/IPV6BadChar.php b/EmailValidator/Warning/IPV6BadChar.php → src/Warning/IPV6BadChar.php
diff --git a/EmailValidator/Warning/IPV6ColonEnd.php → src/Warning/IPV6ColonEnd.php b/EmailValidator/Warning/IPV6ColonEnd.php → src/Warning/IPV6ColonEnd.php
diff --git a/EmailValidator/Warning/IPV6ColonStart.php → src/Warning/IPV6ColonStart.php b/EmailValidator/Warning/IPV6ColonStart.php → src/Warning/IPV6ColonStart.php
diff --git a/EmailValidator/Warning/IPV6Deprecated.php → src/Warning/IPV6Deprecated.php b/EmailValidator/Warning/IPV6Deprecated.php → src/Warning/IPV6Deprecated.php
diff --git a/EmailValidator/Warning/IPV6DoubleColon.php → src/Warning/IPV6DoubleColon.php b/EmailValidator/Warning/IPV6DoubleColon.php → src/Warning/IPV6DoubleColon.php
diff --git a/EmailValidator/Warning/IPV6GroupCount.php → src/Warning/IPV6GroupCount.php b/EmailValidator/Warning/IPV6GroupCount.php → src/Warning/IPV6GroupCount.php
diff --git a/EmailValidator/Warning/IPV6MaxGroups.php → src/Warning/IPV6MaxGroups.php b/EmailValidator/Warning/IPV6MaxGroups.php → src/Warning/IPV6MaxGroups.php
diff --git a/EmailValidator/Warning/LabelTooLong.php → src/Warning/LabelTooLong.php b/EmailValidator/Warning/LabelTooLong.php → src/Warning/LabelTooLong.php
diff --git a/EmailValidator/Warning/LocalTooLong.php → src/Warning/LocalTooLong.php b/EmailValidator/Warning/LocalTooLong.php → src/Warning/LocalTooLong.php
diff --git a/EmailValidator/Warning/NoDNSMXRecord.php → src/Warning/NoDNSMXRecord.php b/EmailValidator/Warning/NoDNSMXRecord.php → src/Warning/NoDNSMXRecord.php
diff --git a/EmailValidator/Warning/ObsoleteDTEXT.php → src/Warning/ObsoleteDTEXT.php b/EmailValidator/Warning/ObsoleteDTEXT.php → src/Warning/ObsoleteDTEXT.php
diff --git a/EmailValidator/Warning/QuotedPart.php → src/Warning/QuotedPart.php b/EmailValidator/Warning/QuotedPart.php → src/Warning/QuotedPart.php
diff --git a/EmailValidator/Warning/QuotedString.php → src/Warning/QuotedString.php b/EmailValidator/Warning/QuotedString.php → src/Warning/QuotedString.php
diff --git a/EmailValidator/Warning/TLD.php → src/Warning/TLD.php b/EmailValidator/Warning/TLD.php → src/Warning/TLD.php
diff --git a/EmailValidator/Warning/Warning.php → src/Warning/Warning.php b/EmailValidator/Warning/Warning.php → src/Warning/Warning.php
diff --git a/Tests/EmailValidator/EmailLexerTest.php → tests/EmailValidator/EmailLexerTest.php b/Tests/EmailValidator/EmailLexerTest.php → tests/EmailValidator/EmailLexerTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Egulias\Tests\EmailValidator;
+namespace Egulias\EmailValidator\Tests\EmailValidator;
 
 use Egulias\EmailValidator\EmailLexer;
 use PHPUnit\Framework\TestCase;

diff --git a/Tests/EmailValidator/EmailValidatorTest.php → tests/EmailValidator/EmailValidatorTest.php b/Tests/EmailValidator/EmailValidatorTest.php → tests/EmailValidator/EmailValidatorTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Egulias\Tests\EmailValidator;
+namespace Egulias\EmailValidator\Tests\EmailValidator;
 
 use Egulias\EmailValidator\EmailValidator;
 use Egulias\EmailValidator\Validation\EmailValidation;

diff --git a/...tor/Validation/DNSCheckValidationTest.php → ...tor/Validation/DNSCheckValidationTest.php b/...tor/Validation/DNSCheckValidationTest.php → ...tor/Validation/DNSCheckValidationTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Egulias\Tests\EmailValidator\Validation;
+namespace Egulias\EmailValidator\Tests\EmailValidator\Validation;
 
 use Egulias\EmailValidator\EmailLexer;
 use Egulias\EmailValidator\Exception\NoDNSRecord;
@@ -24,7 +24,7 @@ public function validEmailsProvider()
             ['"Abc@def"@example.com'],
             ['"Fred\ Bloggs"@example.com'],
             ['"Joe.\\Blow"@example.com'],
-            
+
             // unicide
             ['ñandu.cl'],
         ];

diff --git a/...dator/Validation/IsEmailFunctionTests.php → ...dator/Validation/IsEmailFunctionTests.php b/...dator/Validation/IsEmailFunctionTests.php → ...dator/Validation/IsEmailFunctionTests.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Egulias\Tests\EmailValidator\Validation;
+namespace Egulias\EmailValidator\Tests\EmailValidator\Validation;
 
 use Egulias\EmailValidator\EmailValidator;
 use Egulias\EmailValidator\Validation\DNSCheckValidation;
@@ -27,7 +27,7 @@ public function testAgainstIsEmailTestSuite($email)
 
     public function isEmailTestSuite()
     {
-        $testSuite = dirname(__FILE__) . '/../../resources/is_email_tests.xml';
+        $testSuite = __DIR__ . '/../../resources/is_email_tests.xml';
         $document = new \DOMDocument();
         $document->load($testSuite);
         $elements = $document->getElementsByTagName('test');

diff --git a/...idation/MultipleValidationWithAndTest.php → ...idation/MultipleValidationWithAndTest.php b/...idation/MultipleValidationWithAndTest.php → ...idation/MultipleValidationWithAndTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Egulias\Tests\EmailValidator\Validation;
+namespace Egulias\EmailValidator\Tests\EmailValidator\Validation;
 
 use Egulias\EmailValidator\EmailLexer;
 use Egulias\EmailValidator\Exception\CommaInDomain;
@@ -18,7 +18,7 @@ class MultipleValidationWithAndTest extends TestCase
     public function testUsesAndLogicalOperation()
     {
         $lexer = new EmailLexer();
-        $validationTrue = $this->getMockBuilder("Egulias\\EmailValidator\\Validation\\EmailValidation")->getMock();
+        $validationTrue = $this->getMockBuilder(EmailValidation::class)->getMock();
         $validationTrue->expects($this->any())->method("isValid")->willReturn(true);
         $validationTrue->expects($this->any())->method("getWarnings")->willReturn([]);
         $validationFalse = $this->getMockBuilder(EmailValidation::class)->getMock();
@@ -60,7 +60,7 @@ public function testAccumulatesWarnings()
         $expectedResult = array_merge($warnings1, $warnings2);
 
         $lexer = new EmailLexer();
-        $validation1 = $this->getMockBuilder("Egulias\\EmailValidator\\Validation\\EmailValidation")->getMock();
+        $validation1 = $this->getMockBuilder(EmailValidation::class)->getMock();
         $validation1->expects($this->any())->method("isValid")->willReturn(true);
         $validation1->expects($this->once())->method("getWarnings")->willReturn($warnings1);
 

diff --git a/...alidation/NoRFCWarningsValidationTest.php → ...alidation/NoRFCWarningsValidationTest.php b/...alidation/NoRFCWarningsValidationTest.php → ...alidation/NoRFCWarningsValidationTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Egulias\Tests\EmailValidator\Validation;
+namespace Egulias\EmailValidator\Tests\EmailValidator\Validation;
 
 use Egulias\EmailValidator\EmailLexer;
 use Egulias\EmailValidator\Exception\NoDomainPart;

diff --git a/...alidator/Validation/RFCValidationTest.php → ...alidator/Validation/RFCValidationTest.php b/...alidator/Validation/RFCValidationTest.php → ...alidator/Validation/RFCValidationTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Egulias\Tests\EmailValidator\Validation;
+namespace Egulias\EmailValidator\Tests\EmailValidator\Validation;
 
 use Egulias\EmailValidator\EmailLexer;
 use Egulias\EmailValidator\Validation\RFCValidation;
@@ -104,7 +104,7 @@ public function getValidEmails()
 
     public function testInvalidUTF8Email()
     {
-        $email     = "\x80\x81\x82@\x83\x84\x85.\x86\x87\x88";
+        $email = "\x80\x81\x82@\x83\x84\x85.\x86\x87\x88";
         $this->assertFalse($this->validator->isValid($email, $this->lexer));
     }
 

diff --git a/...r/Validation/SpoofCheckValidationTest.php → ...r/Validation/SpoofCheckValidationTest.php b/...r/Validation/SpoofCheckValidationTest.php → ...r/Validation/SpoofCheckValidationTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Egulias\Tests\EmailValidator\Validation;
+namespace Egulias\EmailValidator\Tests\EmailValidator\Validation;
 
 use Egulias\EmailValidator\EmailLexer;
 use Egulias\EmailValidator\Validation\SpoofCheckValidation;

diff --git a/Tests/Performance/AgainstFilterVar.php → tests/Performance/AgainstFilterVar.php b/Tests/Performance/AgainstFilterVar.php → tests/Performance/AgainstFilterVar.php
diff --git a/Tests/Performance/AgainstOldIsemail.php → tests/Performance/AgainstOldIsemail.php b/Tests/Performance/AgainstOldIsemail.php → tests/Performance/AgainstOldIsemail.php
diff --git a/Tests/resources/is_email_tests.xml → tests/resources/is_email_tests.xml b/Tests/resources/is_email_tests.xml → tests/resources/is_email_tests.xml