changed to luticate2

composer.json

@@ -12,9 +12,10 @@
       "url":  "https://git.rthoni.com/luticate/api-utils.git"
     }],
     "require": {
-      "vlucas/phpdotenv": "~1.0",
       "twig/twig": "1.x",
-      "luticate/utils": "0.1.x"
+      "luticate/utils": "dev-develop"
+    },
+    "require-dev": {
     },
     "autoload": {
       "psr-4": {

src/Generator/LuGenerator.php

@@ -6,40 +6,35 @@ use PDO;
 use Twig_Autoloader;
 use Twig_Environment;
 use Twig_Loader_Filesystem;
-use Luticate\Utils\LuStringUtils;
+use Luticate\Utils\Business\LuStringUtils;
 
 class LuGenerator {
     private $_pdo;
 
     private $_config = array("dbo" =>
         array(
-            "namespace" => 'App\Http\DBO',
-            "folder" => '../app/Http/DBO'
+            "namespace" => 'App\Dbo',
+            "folder" => '../app/Dbo'
         ),
-        "models" =>
-            array(
-                "namespace" => 'App\Http\DataAccess\Models',
-                "folder" => '../app/Http/DataAccess/Models'
-            ),
         "sp" =>
             array(
-                "namespace" => 'App\Http\DataAccess\SP',
-                "folder" => '../app/Http/DataAccess/SP'
+                "namespace" => 'App\DataAccess\SP',
+                "folder" => '../app/DataAccess/SP'
             ),
         "dataaccess" =>
             array(
-                "namespace" => 'App\Http\DataAccess',
-                "folder" => '../app/Http/DataAccess'
+                "namespace" => 'App\DataAccess',
+                "folder" => '../app/DataAccess'
             ),
         "business" =>
             array(
-                "namespace" => 'App\Http\Business',
-                "folder" => '../app/Http/Business'
+                "namespace" => 'App\Business',
+                "folder" => '../app/Business'
             ),
         "controller" =>
             array(
-                "namespace" => 'App\Http\Controller',
-                "folder" => '../app/Http/Controller'
+                "namespace" => 'App\Controller',
+                "folder" => '../app/Controller'
             ),
         "mode" => 0775,
         "ignore" => array(
@@ -88,8 +83,8 @@ class LuGenerator {
             {
                 $vars[$key] = array(
                     "as_it" => $value,
-                    "camel_upper" => LuStringUtils::stringSnakeToCamelCase($value, true),
-                    "camel_lower" => LuStringUtils::stringSnakeToCamelCase($value, false)
+                    "camel_upper" => LuStringUtils::snakeToCamelCase($value, true),
+                    "camel_lower" => LuStringUtils::snakeToCamelCase($value, false)
                 );
             }
         }
@@ -99,7 +94,6 @@ class LuGenerator {
     protected function buildTwig($templateFile, $destFile, $vars)
     {
         $vars["dbo_namespace"] = $this->_config["dbo"]["namespace"];
-        $vars["models_namespace"] = $this->_config["models"]["namespace"];
         $vars["sp_namespace"] = $this->_config["sp"]["namespace"];
         $vars["dataaccess_namespace"] = $this->_config["dataaccess"]["namespace"];
         $vars["business_namespace"] = $this->_config["business"]["namespace"];
@@ -110,7 +104,7 @@ class LuGenerator {
         Twig_Autoloader::register();
         $loader = new Twig_Loader_Filesystem(__DIR__ );
         $twig = new Twig_Environment($loader, array());
-        $template = $twig->loadTemplate($templateFile . '.twig');
+        $template = $twig->loadTemplate('templates/' . $templateFile . '.twig');
         $content = $template->render($twig_vars);
         file_put_contents($destFile, $content);
     }
@@ -183,21 +177,6 @@ WHERE table_type = 'BASE TABLE' AND table_schema NOT IN ('pg_catalog', 'informat
         $this->buildTwig('dbo_array.php', $fileArray, $vars);
     }
 
-    public function generateModel($modelName, $modelUserName, $dboName, $columns, $file, $fileUser)
-    {
-        $vars = array(
-            "model_name" => $modelName,
-            "model_user_name" => $modelUserName,
-            "dbo_name" => $dboName,
-            "columns" => $columns
-        );
-        $this->buildTwig('model.php', $file, $vars);
-
-        if (file_exists($fileUser))
-            return;
-        $this->buildTwig('model_user.php', $fileUser, $vars);
-    }
-
     public function getStoredProcedures()
     {
         $spQuery = $this->_pdo->prepare("SELECT r.routine_name AS sp_name, r.data_type AS data_type, proc.proretset AS proretset, proc.prosrc AS prosrc
@@ -256,14 +235,14 @@ ORDER BY parameters.ordinal_position;");
         $this->buildTwig('sp.php', $file, $vars);
     }
 
-    public function generateDataAccess($dataAccessName, $modelName, $modelUserName, $dboName, $file)
+    public function generateDataAccess($table_name, $connection_name, $dataAccessName, $dboName, $file)
     {
         if (file_exists($file))
             return;
         $vars = array(
             "data_access_name" => $dataAccessName,
-            "model_name" => $modelName,
-            "model_user_name" => $modelUserName,
+            "connection_name" => $connection_name,
+            "table_name" => $table_name,
             "dbo_name" => $dboName
         );
         $this->buildTwig('dataaccess.php', $file, $vars);
@@ -312,18 +291,17 @@ ORDER BY parameters.ordinal_position;");
     public function run()
     {
         $dbo_dir = $this->_config["dbo"]["folder"] . "/";
-        $model_dir = $this->_config["models"]["folder"] . "/";
         $sp_dir = $this->_config["sp"]["folder"] . "/";
         $sp_src_dir = $this->_config["sp"]["folder"] . "/src/";
         $manager_dir = $this->_config["dataaccess"]["folder"] . "/";
         $business_dir = $this->_config["business"]["folder"] . "/";
         $controller_dir = $this->_config["controller"]["folder"] . "/";
+        $connection_name = getenv("DB_CONNECTION_NAME");
 
         $mode = $this->_config["mode"];
 
         umask(0000);
         $this->mkdir($dbo_dir, $mode);
-        $this->mkdir($model_dir, $mode);
         $this->mkdir($sp_dir, $mode);
         $this->mkdir($sp_src_dir, $mode);
         $this->mkdir($manager_dir, $mode);
@@ -342,17 +320,13 @@ ORDER BY parameters.ordinal_position;");
                 if (is_null($columns))
                     continue;
                 $columns = $this->sqlTypesToPhpTypes($columns);
-                $baseName = LuStringUtils::stringSnakeToCamelCase($table_name, true);
-                $modelName = $baseName . "Model";
-                $modelUserName = $baseName;
+                $baseName = LuStringUtils::snakeToCamelCase($table_name, true);
                 $dboName = $baseName . "Dbo";
                 $dataAccessName = $baseName . "DataAccess";
                 $businessName = $baseName . "Business";
                 $controllerName = $baseName . "Controller";
                 $this->generateDbo($dboName, $columns, $dbo_dir . $dboName . ".php", $dbo_dir . $dboName . "Array.php");
-                $this->generateModel($modelName, $modelUserName, $dboName, $columns, $model_dir . $modelName . ".php",
-                    $model_dir . $modelUserName . ".php");
-                $this->generateDataAccess($dataAccessName, $modelName, $modelUserName, $dboName,
+                $this->generateDataAccess($table_name, $connection_name, $dataAccessName, $dboName,
                     $manager_dir . $dataAccessName . ".php");
                 $this->generateBusiness($businessName, $dataAccessName, $dboName,
                     $business_dir . $businessName . ".php");
@@ -378,7 +352,7 @@ ORDER BY parameters.ordinal_position;");
                     continue;
                 $args["in"] = $this->sqlTypesToPhpTypes($args["in"]);
                 $args["out"] = $this->sqlTypesToPhpTypes($args["out"]);
-                $sp_model_name = LuStringUtils::stringSnakeToCamelCase($sp_name, true);
+                $sp_model_name = LuStringUtils::snakeToCamelCase($sp_name, true);
                 $this->generateSp($sp, $args, $sp_dir . $sp_model_name . ".php", $sp_src_dir . $sp_name . ".sql");
             }
         }

src/Generator/dataaccess.php.twig

@@ -1,14 +0,0 @@
-{{ "<?php" }}
-
-namespace {{ dataaccess_namespace.as_it }};
-
-use Luticate\Utils\LuDataAccess;
-use {{ models_namespace.as_it }}\{{ model_user_name.as_it }};
-use {{ dbo_namespace.as_it }}\{{ dbo_name.as_it }};
-
-class {{ data_access_name.as_it }} extends LuDataAccess {
-    protected static function getModel()
-    {
-        return new {{ model_user_name.as_it }}();
-    }
-}

src/Generator/dbo.php.twig

@@ -1,60 +0,0 @@
-{{ "<?php" }}
-
-/**
- * AUTO GENERATED BY LUTICATE GENERATOR
- * ANY CHANGES WILL BE OVERWRITTEN
- */
-
-namespace {{ dbo_namespace.as_it }};
-
-use Luticate\Utils\LuDbo;
-
-class {{ dbo_name.camel_upper }} extends LuDbo {
-
-    public function jsonSerialize()
-    {
-        return array(
-{% for column in columns %}
-            "{{ column.name.camel_upper }}" => $this->_{{ column.name.camel_lower }}{{ loop.last ? "" : "," }}
-{% endfor %}
-        );
-    }
-
-    public static function jsonDeserialize($json)
-    {
-        $dbo = new {{ dbo_name.camel_upper }}();
-{% for column in columns %}
-        if (isset($json["{{ column.name.camel_upper }}"])) {
-            $dbo->set{{ column.name.camel_upper }}($json["{{ column.name.camel_upper }}"]);
-        }
-{% endfor %}
-        return $dbo;
-    }
-
-    public static function generateSample()
-    {
-        $dbo = new {{ dbo_name.camel_upper }}();
-{% for column in columns %}
-        $dbo->set{{ column.name.camel_upper }}({% if column.data_type.php.as_it == "double" %}42.42{%
-elseif column.data_type.php.as_it == "integer" %}42{%
-elseif column.data_type.php.as_it == "boolean" %}true{%
-else %}"sample string"{% endif %});
-{% endfor %}
-        return $dbo;
-    }
-{% for column in columns %}
-
-    /**
-     * @var {{ column.data_type.php.as_it }}
-     */
-    protected $_{{ column.name.camel_lower }};
-    public function get{{ column.name.camel_upper }}()
-    {
-        return $this->_{{ column.name.camel_lower }};
-    }
-    public function set{{ column.name.camel_upper }}($value)
-    {
-        $this->_{{ column.name.camel_lower }} = $value;
-    }
-{% endfor %}
-}

src/Generator/model.php.twig

@@ -1,51 +0,0 @@
-{{ "<?php" }}
-
-/**
- * AUTO GENERATED BY LUTICATE GENERATOR
- * ANY CHANGES WILL BE OVERWRITTEN
- * DO NOT DIRECTLY USE THIS FILE
- * USE {{ model_user_name.camel_upper }}.php
- * TO MAKE YOUR CHANGES AND DATABASE ACCESS
-*/
-
-namespace {{ models_namespace.as_it }};
-
-use Luticate\Utils\LuModel;
-use {{ dbo_namespace.as_it }}\{{ dbo_name.camel_upper }};
-
-class {{ model_name.camel_upper }} extends LuModel
-{
-    function __construct()
-    {
-        parent::__construct();
-        $this->timestamps = false;
-    }
-
-    public function toDbo()
-    {
-        $dbo = new {{ dbo_name.camel_upper }}();
-
-{% for column in columns %}
-        $dbo->set{{ column.name.camel_upper }}($this->{{ column.name.as_it }});
-{% endfor %}
-
-        return $dbo;
-    }
-
-    /**
-     * @param $dbo {{ dbo_name.camel_upper }}
-     * @param $model LuModel|null
-     * @return {{ model_user_name.camel_upper }}
-     */
-    public function fromDbo($dbo, $model = null)
-    {
-        if (is_null($model))
-            $model = new {{ model_user_name.camel_upper }}();
-
-{% for column in columns %}
-        $model->{{ column.name.as_it }} = $dbo->get{{ column.name.camel_upper }}();
-{% endfor %}
-
-        return $model;
-    }
-}

src/Generator/model_user.php.twig

@@ -1,9 +0,0 @@
-{{ "<?php" }}
-
-namespace {{ models_namespace.as_it }};
-
-use {{ dbo_namespace.as_it }}\{{ dbo_name.camel_upper }};
-
-class {{ model_user_name.camel_upper }} extends {{ model_name.camel_upper }}
-{
-}

src/Generator/business.php.twig → src/Generator/templates/business.php.twig

@@ -2,7 +2,7 @@
 
 namespace {{ business_namespace.as_it }};
 
-use Luticate\Utils\LuBusiness;
+use Luticate\Utils\Business\LuBusiness;
 use {{ dataaccess_namespace.as_it }}\{{ data_access_name.as_it }};
 use {{ dbo_namespace.as_it }}\{{ dbo_name.as_it }};
 

src/Generator/controller.php.twig → src/Generator/templates/controller.php.twig

@@ -2,7 +2,7 @@
 
 namespace {{ controller_namespace.as_it }};
 
-use Luticate\Utils\LuController;
+use Luticate\Utils\Controller\LuController;
 use {{ business_namespace.as_it }}\{{ business_name.as_it }};
 use {{ dbo_namespace.as_it }}\{{ dbo_name.as_it }};
 

src/Generator/templates/dataaccess.php.twig

@@ -0,0 +1,15 @@
+{{ "<?php" }}
+
+namespace {{ dataaccess_namespace.as_it }};
+
+use Luticate\Utils\DataAccess\LuDataAccess;
+use {{ dbo_namespace.as_it }}\{{ dbo_name.as_it }};
+use {{ dbo_namespace.as_it }}\{{ dbo_name.as_it }}Array;
+
+class {{ data_access_name.as_it }} extends LuDataAccess {
+    protected static $_connection = "{{ connection_name.as_it }}";
+    protected static $_table = "{{ table_name.as_it }}";
+    protected static $_dboClass = {{ dbo_name.as_it }}::class;
+    protected static $_dboArrayClass = {{ dbo_name.as_it }}Array::class;
+
+}

src/Generator/templates/dbo.php.twig

@@ -0,0 +1,33 @@
+{{ "<?php" }}
+
+/**
+ * AUTO GENERATED BY LUTICATE GENERATOR
+ * ANY CHANGES WILL BE OVERWRITTEN
+ */
+
+namespace {{ dbo_namespace.as_it }};
+
+use Luticate\Utils\Dbo\LuDbo;
+
+class {{ dbo_name.camel_upper }} extends LuDbo {
+
+{% for column in columns %}
+
+    /**
+     * @var $_{{ column.name.camel_lower }} {{ column.data_type.php.as_it }}
+     */
+    protected $_{{ column.name.camel_lower }};
+{% endfor %}
+
+{% for column in columns %}
+
+    public function get{{ column.name.camel_upper }}()
+    {
+        return $this->_{{ column.name.camel_lower }};
+    }
+    public function set{{ column.name.camel_upper }}($value)
+    {
+        $this->_{{ column.name.camel_lower }} = $value;
+    }
+{% endfor %}
+}

src/Generator/dbo_array.php.twig → src/Generator/templates/dbo_array.php.twig

@@ -7,7 +7,7 @@
 
 namespace {{ dbo_namespace.as_it }};
 
-use Luticate\Utils\LuDbo;
+use Luticate\Utils\Dbo\LuDbo;
 
 class {{ dbo_name.camel_upper }}Array extends LuDbo {
 
@@ -31,7 +31,7 @@ class {{ dbo_name.camel_upper }}Array extends LuDbo {
 
     public static function jsonDeserialize($json)
     {
-        $dbo = new {{ dbo_name.camel_upper }}Array();
+        $dbo = new static();
         $array = [];
         foreach ($json as $data) {
             $array[] = {{ dbo_name.camel_upper }}::jsonDeserialize($data);