extracted validateName to ErrorTrait

Author: transistive

src/Traits/ErrorTrait.php

@@ -21,10 +21,14 @@
 
 namespace WikibaseSolutions\CypherDSL\Traits;
 
+use InvalidArgumentException;
 use ReflectionClass;
 use TypeError;
 use function gettype;
 use function is_array;
+use function is_numeric;
+use function strlen;
+use function trim;
 
 /**
  * Convenience trait including simple assertions and error reporting functions
@@ -154,4 +158,34 @@ private function isType($types, $userInput): bool
 
         return false;
     }
+
+    /**
+     * Validates the name to see if it can be used as a parameter or variable.
+     *
+     * @see https://neo4j.com/docs/cypher-manual/current/syntax/naming/#_naming_rules
+     *
+     * @param string $name
+     *
+     * @return void
+     */
+    private static function validateName(string $name): void
+    {
+        $name = trim($name);
+
+        if ($name === "") {
+            throw new InvalidArgumentException("A name cannot be an empty string");
+        }
+
+        if (!ctype_alnum($name)) {
+            throw new InvalidArgumentException('A name can only contain alphanumeric characters');
+        }
+
+        if (is_numeric($name[0])) {
+            throw new InvalidArgumentException('A name cannot begin with a numeric character');
+        }
+
+        if (strlen($name) >= 65535) {
+            throw new InvalidArgumentException('A name cannot be longer than 65534 characters');
+        }
+    }
 }

src/Traits/HasNameTrait.php

@@ -10,7 +10,8 @@
 
 trait HasNameTrait
 {
-    public static function automaticVariableLength(): int {
+    public static function automaticVariableLength(): int
+    {
         return 32;
     }
 
@@ -26,40 +27,10 @@ public static function automaticVariableLength(): int {
      *
      * @return string
      */
-    public static function generateName(string $prefix = 'var', int $length = null): string
+    private static function generateName(string $prefix = 'var', int $length = null): string
     {
         $length ??= self::automaticVariableLength();
 
         return $prefix . substr(bin2hex(openssl_random_pseudo_bytes(ceil($length / 2))), 0, $length);
     }
-
-    /**
-     * Validates the name to see if it can be used as a parameter or variable.
-     *
-     * @see https://neo4j.com/docs/cypher-manual/current/syntax/naming/#_naming_rules
-     *
-     * @param string $name
-     *
-     * @return void
-     */
-    public static function validateName(string $name): void
-    {
-        $name = trim($name);
-
-        if ($name === "") {
-            throw new InvalidArgumentException("A name cannot be an empty string");
-        }
-
-        if(!ctype_alnum($name)) {
-            throw new InvalidArgumentException('A name can only contain alphanumeric characters');
-        }
-
-        if (is_numeric($name[0])) {
-            throw new InvalidArgumentException('A name cannot begin with a numeric character');
-        }
-
-        if (strlen($name) >= 65535) {
-            throw new InvalidArgumentException('A name cannot be longer than 65534 characters');
-        }
-    }
 }