Merge pull request #159 from koriym/php84

Fix empty domain handling in Email validation and add PHP 8.3/8.4 support

Author: harikt

.github/workflows/continuous-integration.yml

@@ -21,6 +21,8 @@ jobs:
           - '8.0'
           - '8.1'
           - '8.2'
+          - '8.3'
+          - '8.4'
     steps:
       - name: Checkout
         uses: actions/checkout@v1

src/Rule/AbstractStrlen.php

@@ -72,7 +72,7 @@ protected function strlen(string $str): int
         return strlen(utf8_to_iso8859_1($str));
     }
 
-     /**
+    /**
      *
      * Wrapper for `iconv_substr()` to throw an exception on malformed UTF-8.
      *
@@ -87,10 +87,10 @@ protected function strlen(string $str): int
      * @throws Exception\MalformedUtf8
      *
      */
-    protected function substrIconv(string $str,int $start,int $length)
+    protected function substrIconv(string $str, int $start, ?int $length = null): string
     {
         $level = error_reporting(0);
-        $substr = iconv_substr($str,$start,$length, 'UTF-8');
+        $substr = iconv_substr($str, $start, $length ?? 0, 'UTF-8');
         error_reporting($level);
 
         if ($substr !== false) {
@@ -111,7 +111,7 @@ protected function substrIconv(string $str,int $start,int $length)
      * @throws Exception\MalformedUtf8
      *
      */
-    protected function strlenIconv(string $str)
+    protected function strlenIconv(string $str): int
     {
         $level = error_reporting(0);
         $strlen = iconv_strlen($str, 'UTF-8');

src/Rule/Validate/Email.php

@@ -404,15 +404,24 @@ protected function intl(): bool
      */
     protected function idnToAscii(string $email): string
     {
+        if (strpos($email, '@') === false) {
+            return $email;
+        }
+
         $parts = explode('@', $email);
-        $domain = array_pop($parts);
-        if (! $parts) {
-            // no parts remaining, so no @ symbol, so not valid to begin with
+
+        if (!isset($parts[1]) || empty($parts[1])) {
             return $email;
         }
 
-        // put the parts back together, with the domain part converted to ascii
-        return implode('@', $parts) . '@' . idn_to_ascii($domain, IDNA_DEFAULT, INTL_IDNA_VARIANT_UTS46);
+        $domain = array_pop($parts);
+        $localPart = implode('@', $parts);
+
+        $asciiDomain = idn_to_ascii($domain, IDNA_DEFAULT, INTL_IDNA_VARIANT_UTS46);
+        if ($asciiDomain === false) {
+            return $email;
+        }
+        return $localPart . '@' . $asciiDomain;
     }
 
     /**