moving code around

composer.json

@@ -22,8 +22,8 @@
     "phpunit/phpunit": "~4.4"
   },
   "autoload": {
-    "psr-0": {
-      "Egulias\\": "src/"
+    "psr-4": {
+      "Egulias\\EmailValidator\\": "EmailValidator"
     }
   }
 }

phpunit.xml.dist

@@ -9,11 +9,11 @@
          processIsolation="false"
          stopOnFailure="false"
          syntaxCheck="false"
-         bootstrap="tests/bootstrap.php"
+         bootstrap="vendor/autoload.php"
 >
 <testsuites>
   <testsuite name="EmailValidator Test Suite">
-    <directory>./tests/egulias/Tests/</directory>
+    <directory>./tests/</directory>
     <exclude>./vendor/</exclude>
   </testsuite>
 </testsuites>

tests/Performance/AgainstFilterVar.php

@@ -2,7 +2,7 @@
 
 use Egulias\EmailValidator\EmailValidator;
 
-require __DIR__ . '/../../bootstrap.php';
+require __DIR__ . '/../bootstrap.php';
 
 $iterations = 10000;
 
@@ -19,7 +19,7 @@ echo ($b - $a) . ' seconds with filter_var' . PHP_EOL;
 $a = microtime(true);
 for ($i = 0; $i < $iterations; $i++) {
     $validator = new EmailValidator();
-    $isValid = $validator->isValid($testingMail);
+    $isValid = $validator->isValid($testingMail, new \Egulias\EmailValidator\Validation\RFCValidation());
 }
 $b = microtime(true);
 echo ($b - $a) . ' seconds with EmailValidator + instantiation' . PHP_EOL;
@@ -27,7 +27,7 @@ echo ($b - $a) . ' seconds with EmailValidator + instantiation' . PHP_EOL;
 $a = microtime(true);
 $validator = new EmailValidator();
 for ($i = 0; $i < $iterations; $i++) {
-    $isValid = $validator->isValid($testingMail);
+    $isValid = $validator->isValid($testingMail, new \Egulias\EmailValidator\Validation\RFCValidation());
 }
 $b = microtime(true);
 echo ($b - $a) . ' seconds with EmailValidator once instanced' . PHP_EOL;

tests/Performance/AgainstOldIsemail.php

@@ -2,8 +2,8 @@
 
 use Egulias\EmailValidator\EmailValidator;
 
-require __DIR__ . '/../../bootstrap.php';
-require __DIR__ . '/../../../../isemail/is_email.php';
+require __DIR__ . '/../bootstrap.php';
+require __DIR__ . '/../../../isemail/is_email.php';
 
 $iterations = 10000;
 
@@ -20,7 +20,7 @@ echo ($b - $a) . ' seconds with is_email' . PHP_EOL;
 $a = microtime(true);
 for ($i = 0; $i < $iterations; $i++) {
     $validator = new EmailValidator();
-    $isValid = $validator->isValid($testingMail);
+    $isValid = $validator->isValid($testingMail, new \Egulias\EmailValidator\Validation\RFCValidation());
 }
 $b = microtime(true);
 echo ($b - $a) . ' seconds with EmailValidator + instantiation' . PHP_EOL;
@@ -28,7 +28,7 @@ echo ($b - $a) . ' seconds with EmailValidator + instantiation' . PHP_EOL;
 $a = microtime(true);
 $validator = new EmailValidator();
 for ($i = 0; $i < $iterations; $i++) {
-    $isValid = $validator->isValid($testingMail);
+    $isValid = $validator->isValid($testingMail, new \Egulias\EmailValidator\Validation\RFCValidation());
 }
 $b = microtime(true);
 echo ($b - $a) . ' seconds with EmailValidator once instanced' . PHP_EOL;