bump dependencies and lock

- Removing openlss/lib-array2xml (1.0.0)
  - Removing phpspec/prophecy (v1.15.0)
  - Removing webmozart/path-util (2.3.0)
  - Upgrading composer/pcre (3.0.0 => 3.1.0)
  - Locking fidry/cpu-core-counter (0.4.1)
  - Upgrading guzzlehttp/guzzle (7.4.5 => 7.5.0)
  - Upgrading guzzlehttp/promises (1.5.1 => 1.5.2)
  - Upgrading guzzlehttp/psr7 (2.4.0 => 2.4.3)
  - Upgrading netresearch/jsonmapper (v4.0.0 => v4.1.0)
  - Upgrading nikic/php-parser (v4.13.2 => v4.15.2)
  - Upgrading php-coveralls/php-coveralls (v2.5.2 => v2.5.3)
  - Upgrading phpdocumentor/type-resolver (1.6.1 => 1.6.2)
  - Upgrading phpunit/php-code-coverage (9.2.15 => 9.2.23)
  - Upgrading phpunit/phpunit (9.5.20 => 9.5.27)
  - Upgrading sebastian/comparator (4.0.6 => 4.0.8)
  - Upgrading sebastian/exporter (4.0.4 => 4.0.5)
  - Upgrading sebastian/type (3.0.0 => 3.2.0)
  - Locking spatie/array-to-xml (2.17.1)
  - Upgrading symfony/config (v5.4.9 => v5.4.11)
  - Upgrading symfony/console (v5.4.9 => v5.4.16)
  - Upgrading symfony/deprecation-contracts (v2.5.1 => v2.5.2)
  - Upgrading symfony/filesystem (v5.4.9 => v5.4.13)
  - Upgrading symfony/polyfill-ctype (v1.25.0 => v1.27.0)
  - Upgrading symfony/polyfill-intl-grapheme (v1.25.0 => v1.27.0)
  - Upgrading symfony/polyfill-intl-idn (v1.26.0 => v1.27.0)
  - Upgrading symfony/polyfill-intl-normalizer (v1.26.0 => v1.27.0)
  - Upgrading symfony/polyfill-mbstring (v1.26.0 => v1.27.0)
  - Upgrading symfony/polyfill-php72 (v1.26.0 => v1.27.0)
  - Upgrading symfony/polyfill-php73 (v1.25.0 => v1.27.0)
  - Upgrading symfony/polyfill-php80 (v1.25.0 => v1.27.0)
  - Upgrading symfony/polyfill-php81 (v1.25.0 => v1.27.0)
  - Upgrading symfony/service-contracts (v2.5.1 => v2.5.2)
  - Upgrading symfony/stopwatch (v5.4.5 => v5.4.13)
  - Upgrading symfony/string (v5.4.9 => v5.4.15)
  - Upgrading symfony/yaml (v5.4.3 => v5.4.16)
  - Upgrading vimeo/psalm (4.23.0 => 5.4.0)
  - Upgrading webmozart/assert (1.10.0 => 1.11.0)

.scrutinizer.yml

@@ -3,7 +3,7 @@ imports:
 
 build:
     environment:
-        php: '7.4'
+        php: '7.3'
     tests:
         override:
             -

.travis.yml

@@ -2,6 +2,10 @@ language: php
 
 matrix:
   include:
+    - php: 7.3
+      env:
+        - psalm=yes
+      dist: bionic
     - php: 7.4
       dist: bionic
       env:
@@ -11,6 +15,11 @@ matrix:
         - psalm=yes
       dist: bionic
 #ppc64le support code
+    - php: 7.3
+      arch: ppc64le
+      env:
+        - psalm=yes
+      dist: bionic
     - php: 7.4
       arch: ppc64le
       env:

psalm.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0"?>
 <psalm
+    totallyTyped="false"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns="https://getpsalm.org/schema/config"
     xsi:schemaLocation="https://getpsalm.org/schema/config ./vendor/vimeo/psalm/config.xsd"

src/EmailLexer.php

@@ -151,7 +151,7 @@ class EmailLexer extends AbstractLexer
     /**
      * The next token in the input.
      *
-     * @var array{position: int, type: int|null|string, value: int|string}|null
+     * @var array|null
      */
     public $lookahead;
 

src/Parser/DomainLiteral.php

@@ -50,7 +50,7 @@ class DomainLiteral extends PartParser
             }
 
             if ($this->lexer->isNextTokenAny(
-                array(EmailLexer::S_HTAB, EmailLexer::S_SP, EmailLexer::CRLF)
+                array(EmailLexer::S_HTAB, EmailLexer::S_SP, $this->lexer->token['type'] === EmailLexer::CRLF)
             )) {
                 $this->warnings[CFWSWithFWS::CODE] = new CFWSWithFWS();
                 $this->parseFWS();

src/Validation/DNSCheckValidation.php

@@ -2,7 +2,6 @@
 
 namespace Egulias\EmailValidator\Validation;
 
-use Egulias\EmailValidator\Validation\DNSGetRecordWrapper;
 use Egulias\EmailValidator\EmailLexer;
 use Egulias\EmailValidator\Result\InvalidEmail;
 use Egulias\EmailValidator\Result\Reason\DomainAcceptsNoMail;
@@ -56,22 +55,11 @@ class DNSCheckValidation implements EmailValidation
      */
     private $mxRecords = [];
 
-    /**
+    public function __construct()
-     * @var DNSGetRecordWrapper
-     */
-    private $dnsGetRecord;
-
-    public function __construct(DNSGetRecordWrapper $dnsGetRecord = null)
     {
         if (!function_exists('idn_to_ascii')) {
             throw new \LogicException(sprintf('The %s class requires the Intl extension.', __CLASS__));
         }
-
-        if ($dnsGetRecord == null) {
-            $dnsGetRecord = new DNSGetRecordWrapper();
-        }
-
-        $this->dnsGetRecord = $dnsGetRecord;
     }
 
     public function isValid(string $email, EmailLexer $emailLexer) : bool
@@ -133,17 +121,27 @@ class DNSCheckValidation implements EmailValidation
      */
     private function validateDnsRecords($host) : bool
     {
-        $dnsRecordsResult = $this->dnsGetRecord->getRecords($host, static::DNS_RECORD_TYPES_TO_CHECK);
+        // A workaround to fix https://bugs.php.net/bug.php?id=73149
+        /** @psalm-suppress InvalidArgument */
+        set_error_handler(
+            static function (int $errorLevel, string $errorMessage): ?bool {
+                throw new \RuntimeException("Unable to get DNS record for the host: $errorMessage");
+            }
+        );
 
-        if ($dnsRecordsResult->withError()) {
+        try {
+            // Get all MX, A and AAAA DNS records for host
+            $dnsRecords = dns_get_record($host, static::DNS_RECORD_TYPES_TO_CHECK);
+        } catch (\RuntimeException $exception) {
             $this->error = new InvalidEmail(new UnableToGetDNSRecord(), '');
+
             return false;
+        } finally {
+            restore_error_handler();
         }
 
-        $dnsRecords = $dnsRecordsResult->getRecords();
-
         // No MX, A or AAAA DNS records
-        if ($dnsRecords === []) {
+        if ($dnsRecords === [] || $dnsRecords === false) {
             $this->error = new InvalidEmail(new ReasonNoDNSRecord(), '');
             return false;
         }
@@ -170,11 +168,6 @@ class DNSCheckValidation implements EmailValidation
      */
     private function validateMxRecord($dnsRecord) : bool
     {
-        if (!isset($dnsRecord['type'])) {
-            $this->error = new InvalidEmail(new ReasonNoDNSRecord(), '');
-            return false;
-        }
-
         if ($dnsRecord['type'] !== 'MX') {
             return true;
         }

src/Validation/DNSGetRecordWrapper.php

@@ -1,28 +0,0 @@
-<?php
-namespace Egulias\EmailValidator\Validation;
-
-class DNSGetRecordWrapper
-{
-    /**
-     * @param string $host
-     * @param int $type
-     */
-    public function getRecords(string $host, int $type) : DNSRecords
-    {
-        // A workaround to fix https://bugs.php.net/bug.php?id=73149
-        /** @psalm-suppress InvalidArgument */
-        set_error_handler(
-            static function (int $errorLevel, string $errorMessage): ?bool {
-                throw new \RuntimeException("Unable to get DNS record for the host: $errorMessage");
-            }
-        );
-        try {
-            // Get all MX, A and AAAA DNS records for host
-            return new DNSRecords(dns_get_record($host, $type));
-        } catch (\RuntimeException $exception) {
-            return new DNSRecords([], true);
-        } finally {
-            restore_error_handler();
-        }
-    }
-}

src/Validation/DNSRecords.php

@@ -1,35 +0,0 @@
-<?php
-
-namespace Egulias\EmailValidator\Validation;
-
-class DNSRecords
-{
-    
-    /**
-     * @var array $records
-     */
-    private $records = [];
-
-    /**
-     * @var bool $error
-     */
-    private $error = false;
-
-    public function __construct(array $records, bool $error = false)
-    {
-        $this->records = $records;
-        $this->error = $error;
-    }
-
-    public function getRecords() : array
-    {
-        return $this->records;
-    }
-
-    public function withError() : bool
-    {
-        return $this->error;
-    }
-
-
-}

tests/EmailValidator/Validation/DNSCheckValidationTest.php

@@ -9,8 +9,6 @@ use Egulias\EmailValidator\Result\Reason\LocalOrReservedDomain;
 use Egulias\EmailValidator\Result\Reason\NoDNSRecord;
 use Egulias\EmailValidator\Result\Reason\UnableToGetDNSRecord;
 use Egulias\EmailValidator\Validation\DNSCheckValidation;
-use Egulias\EmailValidator\Validation\DNSGetRecordWrapper;
-use Egulias\EmailValidator\Validation\DNSRecords;
 use Egulias\EmailValidator\Warning\NoDNSMXRecord;
 use PHPUnit\Framework\TestCase;
 
@@ -118,35 +116,13 @@ class DNSCheckValidationTest extends TestCase
         error_reporting(\E_ALL);
 
         // UnableToGetDNSRecord raises on network errors (e.g. timeout) that we can‘t emulate in tests (for sure),
-        // but we can simulate with the wrapper helper
+        // but we can try to get timeout error by trying to fetch all DNS records
-
+        $validation = new class extends DNSCheckValidation {
-        $wrapper = new class extends DNSGetRecordWrapper {
+            protected const DNS_RECORD_TYPES_TO_CHECK = \DNS_ALL;
-            public function getRecords(string $host, int $type) : DNSRecords
-            {
-                return new DNSRecords([], true);
-            }
         };
-
-        $validation = new DNSCheckValidation($wrapper);
         $expectedError = new InvalidEmail(new UnableToGetDNSRecord(), '');
 
         $validation->isValid('example@invalid.example.com', new EmailLexer());
         $this->assertEquals($expectedError, $validation->getError());
     }
-
+}
-    public function testMissingTypeKey()
-    {
-        $wrapper = new class extends DNSGetRecordWrapper {
-            public function getRecords(string $host, int $type): DNSRecords
-            {
-                return new DNSRecords(['host' => 'test']);
-            }
-        };
-
-        $validation = new DNSCheckValidation($wrapper);
-        $expectedError = new InvalidEmail(new NoDNSRecord(), '');
-
-        $validation->isValid('example@invalid.example.com', new EmailLexer());
-        $this->assertEquals($expectedError, $validation->getError());
-    }
-}