Add and use public normalize_name() function

Author: DaveRandom

composer.json

@@ -9,7 +9,8 @@
     "autoload": {
         "psr-4": {
             "LibDNS\\": "src/"
-        }
+        },
+        "files": ["src/functions.php"]
     },
     "support": {
         "issues": "https://github.com/DaveRandom/LibDNS/issues"

src/Records/Types/DomainName.php

@@ -24,11 +24,6 @@ class DomainName extends Type
 {
     const FLAG_NO_COMPRESSION = 0x80000000;
 
-    /**
-     * @var callable|null
-     */
-    private static $labelPreProcessor = null;
-
     /**
      * @var string
      */
@@ -47,27 +42,6 @@ class DomainName extends Type
      */
     public function __construct($value = null)
     {
-        if (!isset(self::$labelPreProcessor)) {
-            self::$labelPreProcessor = \function_exists('idn_to_ascii')
-                ? static function($label) {
-                      if (false === $result = \idn_to_ascii($label, 0, INTL_IDNA_VARIANT_UTS46)) {
-                          throw new \InvalidArgumentException("Label '{$label}' could not be processed for IDN");
-                      }
-
-                      return $result;
-                  }
-                : static function($label) {
-                      if (\preg_match('/[\x80-\xff]/', $label)) {
-                          throw new \RuntimeException(
-                              "Label '{$label}' contains non-ASCII characters and IDN support is not available."
-                              . " Verify that ext/intl is installed for IDN support."
-                          );
-                      }
-
-                      return \strtolower($label);
-                  };
-        }
-
         if (\is_array($value)) {
             $this->setLabels($value);
         } else {
@@ -113,7 +87,7 @@ public function setLabels(array $labels, $tldFirst = false)
         $length = $count = 0;
 
         foreach ($labels as &$label) {
-            $label = (self::$labelPreProcessor)($label);
+            $label = \LibDNS\normalize_name($label);
             $labelLength = \strlen($label);
             if ($labelLength > 63) {
                 throw new \InvalidArgumentException('Label list is not a valid domain name: Label ' . $label . ' length exceeds 63 byte limit');

src/functions.php

@@ -0,0 +1,26 @@
+<?php declare(strict_types = 1);
+
+namespace LibDNS;
+
+if (\function_exists('idn_to_ascii')) {
+    function normalize_name(string $label): string
+    {
+        if (false === $result = \idn_to_ascii($label, 0, INTL_IDNA_VARIANT_UTS46)) {
+            throw new \InvalidArgumentException("Label '{$label}' could not be processed for IDN");
+        }
+
+        return $result;
+    }
+} else {
+    function normalize_name(string $label): string
+    {
+        if (\preg_match('/[\x80-\xff]/', $label)) {
+            throw new \InvalidArgumentException(
+                "Label '{$label}' contains non-ASCII characters and IDN support is not available."
+                . " Verify that ext/intl is installed for IDN support."
+            );
+        }
+
+        return \strtolower($label);
+    }
+}