move functions around

Author: simonLeary42

resources/lib/UnityConfig.php

@@ -73,34 +73,6 @@ public static function validateConfig(array $CONFIG): void
         self::validateMailSmtpConfig($CONFIG);
     }
 
-    /** @param mixed[] $x */
-    private static function validateArrayNotEmpty(array $x, string $name): void
-    {
-        if (count($x) === 0) {
-            throw new InvalidConfigurationException("$name must not be empty");
-        }
-    }
-
-    private static function validateStringNotEmpty(string $x, string $name): void
-    {
-        if (empty($x)) {
-            throw new InvalidConfigurationException("$name must not be empty");
-        }
-    }
-
-    /** @param mixed[] $options */
-    private static function validateOneOf(string $x, string $name, array $options): void
-    {
-        foreach ($options as $option) {
-            if ($x === $option) {
-                return;
-            }
-        }
-        throw new InvalidConfigurationException(
-            sprintf("%s must be one of %s", $name, _json_encode($options)),
-        );
-    }
-
     /** @param mixed[] $CONFIG */
     private static function validateExpiryConfig(array $CONFIG): void
     {
@@ -148,6 +120,34 @@ private static function validateMailSmtpConfig(array $CONFIG): void
         self::validateOneOf($CONFIG["smtp"]["ssl_verify"], '$CONFIG["smtp"]["ssl_verify"]', [0, 1]);
     }
 
+    /** @param mixed[] $x */
+    private static function validateArrayNotEmpty(array $x, string $name): void
+    {
+        if (count($x) === 0) {
+            throw new InvalidConfigurationException("$name must not be empty");
+        }
+    }
+
+    private static function validateStringNotEmpty(string $x, string $name): void
+    {
+        if (empty($x)) {
+            throw new InvalidConfigurationException("$name must not be empty");
+        }
+    }
+
+    /** @param mixed[] $options */
+    private static function validateOneOf(string $x, string $name, array $options): void
+    {
+        foreach ($options as $option) {
+            if ($x === $option) {
+                return;
+            }
+        }
+        throw new InvalidConfigurationException(
+            sprintf("%s must be one of %s", $name, _json_encode($options)),
+        );
+    }
+
     private static function assertHttpHostValid(string $host): void
     {
         if (!_preg_match("/^[a-zA-Z0-9._:-]+$/", $host)) {