switched to lustringutils

src/Generator/LuGenerator.php

@@ -6,6 +6,7 @@ use PDO;
 use Twig_Autoloader;
 use Twig_Environment;
 use Twig_Loader_Filesystem;
+use Luticate\Utils\LuStringUtils;
 
 class LuGenerator {
     private $_pdo;
@@ -87,8 +88,8 @@ class LuGenerator {
             {
                 $vars[$key] = array(
                     "as_it" => $value,
-                    "camel_upper" => $this->snakeToCamelCase($value, true),
-                    "camel_lower" => $this->snakeToCamelCase($value, false)
+                    "camel_upper" => LuStringUtils::stringSnakeToCamelCase($value, true),
+                    "camel_lower" => LuStringUtils::stringSnakeToCamelCase($value, false)
                 );
             }
         }
@@ -141,16 +142,6 @@ WHERE table_type = 'BASE TABLE' AND table_schema NOT IN ('pg_catalog', 'informat
             return $this->printError($columnsQuery, "Failed to get columns from " . $table_name);
     }
 
-    function snakeToCamelCase($string, $capitalizeFirstCharacter) {
-        $str = preg_replace_callback("/_[a-zA-Z]/", function($matches)
-        {
-            return strtoupper($matches[0][1]);
-        }, $string);
-        if ($capitalizeFirstCharacter)
-            $str[0] = strtoupper($str[0]);
-        return $str;
-    }
-
     public function sqlTypeToPhpType($type)
     {
         if ($type == "character" || $type == "character varying" || $type == "char"
@@ -347,7 +338,7 @@ ORDER BY parameters.ordinal_position;");
                 if (is_null($columns))
                     continue;
                 $columns = $this->sqlTypesToPhpTypes($columns);
-                $baseName = $this->snakeToCamelCase($table_name, true);
+                $baseName = LuStringUtils::stringSnakeToCamelCase($table_name, true);
                 $modelName = $baseName . "Model";
                 $modelUserName = $baseName;
                 $dboName = $baseName . "Dbo";
@@ -383,7 +374,7 @@ ORDER BY parameters.ordinal_position;");
                     continue;
                 $args["in"] = $this->sqlTypesToPhpTypes($args["in"]);
                 $args["out"] = $this->sqlTypesToPhpTypes($args["out"]);
-                $sp_model_name = $this->snakeToCamelCase($sp_name, true);
+                $sp_model_name = LuStringUtils::stringSnakeToCamelCase($sp_name, true);
                 $this->generateSp($sp, $args, $sp_dir . $sp_model_name . ".php");
             }
         }