fixed namespaces

composer.json

@@ -7,14 +7,20 @@
             "email": "robin@rthoni.com"
         }
     ],
+    "repositories": [{
+      "type": "vcs",
+      "url":  "https://git.rthoni.com/luticate/utils.git"
+    }],
     "require": {
       "laravel/lumen-framework": "5.1.x-dev",
       "vlucas/phpdotenv": "~1.0",
-      "twig/twig": "1.x-dev"
+      "twig/twig": "1.x-dev",
+      "luticate/utils": "*"
     },
     "autoload": {
       "psr-4": {
         "Luticate\\": "src/"
       }
-    }
+    },
+    "minimum-stability": "dev"
 }

src/Generator/LuGenerator.php

@@ -91,6 +91,12 @@ 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"];
+
         $twig_vars = $this->buildTwigVars($vars);
 
         Twig_Autoloader::register();
@@ -157,24 +163,22 @@ WHERE table_type = 'BASE TABLE' AND table_schema NOT IN ('pg_catalog', 'informat
         return $array;
     }
 
-    public function generateDbo($name, $columns, $file, $namespace)
+    public function generateDbo($name, $columns, $file)
     {
         $vars = array(
             "dbo_name" => $name,
-            "columns" => $columns,
-            "namespace" => $namespace
+            "columns" => $columns
         );
         $this->buildTwig('dbo.php', $file, $vars);
     }
 
-    public function generateModel($modelName, $modelUserName, $dboName, $columns, $file, $fileUser, $namespace)
+    public function generateModel($modelName, $modelUserName, $dboName, $columns, $file, $fileUser)
     {
         $vars = array(
             "model_name" => $modelName,
             "model_user_name" => $modelUserName,
             "dbo_name" => $dboName,
-            "columns" => $columns,
-            "namespace" => $namespace
+            "columns" => $columns
         );
         $this->buildTwig('model.php', $file, $vars);
 
@@ -231,38 +235,36 @@ ORDER BY parameters.ordinal_position;");
             return $this->printError($spQuery, "Failed to get arguments for stored procedure " . $sp_name);
     }
 
-    public function generateSp($sp, $args, $file, $namespace)
+    public function generateSp($sp, $args, $file)
     {
         $vars = array(
             "sp" => $sp,
-            "args" => $args,
-            "namespace" => $namespace
+            "args" => $args
         );
         $this->buildTwig('sp.php', $file, $vars);
     }
 
-    public function generateDataAccess($dataAccessName, $modelName, $dboName, $file, $namespace)
+    public function generateDataAccess($dataAccessName, $modelName, $modelUserName, $dboName, $file)
     {
         if (file_exists($file))
             return;
         $vars = array(
             "data_access_name" => $dataAccessName,
             "model_name" => $modelName,
-            "dbo_name" => $dboName,
-            "namespace" => $namespace
+            "model_user_name" => $modelUserName,
+            "dbo_name" => $dboName
         );
         $this->buildTwig('dataaccess.php', $file, $vars);
     }
 
-    public function generateBusiness($businessName, $dataAccessName, $dboName, $file, $namespace)
+    public function generateBusiness($businessName, $dataAccessName, $dboName, $file)
     {
         if (file_exists($file))
             return;
         $vars = array(
             "business_name" => $businessName,
             "data_access_name" => $dataAccessName,
-            "dbo_name" => $dboName,
-            "namespace" => $namespace
+            "dbo_name" => $dboName
         );
         $this->buildTwig('business.php', $file, $vars);
     }
@@ -318,14 +320,13 @@ ORDER BY parameters.ordinal_position;");
                 $dboName = $baseName . "Dbo";
                 $dataAccessName = $baseName . "DataAccess";
                 $businessName = $baseName . "Business";
-                $this->generateDbo($dboName, $columns, $dbo_dir . $dboName . ".php",
-                    $this->_config["dbo"]["namespace"]);
+                $this->generateDbo($dboName, $columns, $dbo_dir . $dboName . ".php");
                 $this->generateModel($modelName, $modelUserName, $dboName, $columns, $model_dir . $modelName . ".php",
-                    $model_dir . $modelUserName . ".php", $this->_config["models"]["namespace"]);
-                $this->generateDataAccess($dataAccessName, $modelName, $dboName,
-                    $manager_dir . $dataAccessName . ".php", $this->_config["dataaccess"]["namespace"]);
+                    $model_dir . $modelUserName . ".php");
+                $this->generateDataAccess($dataAccessName, $modelName, $modelUserName, $dboName,
+                    $manager_dir . $dataAccessName . ".php");
                 $this->generateBusiness($businessName, $dataAccessName, $dboName,
-                    $business_dir . $businessName . ".php", $this->_config["business"]["namespace"]);
+                    $business_dir . $businessName . ".php");
             }
         }
         $sps = $this->getStoredProcedures();
@@ -343,7 +344,7 @@ ORDER BY parameters.ordinal_position;");
                 $args["in"] = $this->sqlTypesToPhpTypes($args["in"]);
                 $args["out"] = $this->sqlTypesToPhpTypes($args["out"]);
                 $sp_model_name = $this->snakeToCamelCase($sp_name, true);
-                $this->generateSp($sp, $args, $sp_dir . $sp_model_name . ".php", $this->_config["sp"]["namespace"]);
+                $this->generateSp($sp, $args, $sp_dir . $sp_model_name . ".php");
             }
         }
     }

src/Generator/business.php.twig

@@ -1,10 +1,10 @@
 {{ "<?php" }}
 
-namespace {{ namespace.as_it }};
+namespace {{ business_namespace.as_it }};
 
 use Luticate\Utils\LuBusiness;
-use App\Http\DataAccess\{{ data_access_name.as_it }};
-use App\Http\DBO\{{ dbo_name.as_it }};
+use {{ dataaccess_namespace.as_it }}\{{ data_access_name.as_it }};
+use {{ dbo_namespace.as_it }}\{{ dbo_name.as_it }};
 
 class {{ business_name.as_it }} extends LuBusiness {
     public function __construct()

src/Generator/dataaccess.php.twig

@@ -1,15 +1,15 @@
 {{ "<?php" }}
 
-namespace {{ namespace.as_it }};
+namespace {{ dataaccess_namespace.as_it }};
 
 use Luticate\Utils\LuDataAccess;
-use App\Http\DataAccess\Models\{{ model_name.as_it }};
-use App\Http\DBO\{{ dbo_name.as_it }};
+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 {
     public function __construct()
     {
         parent::__construct();
-        $this->model = new {{ model_name.as_it }}();
+        $this->model = new {{ model_user_name.as_it }}();
     }
 }

src/Generator/dbo.php.twig

@@ -5,7 +5,7 @@
  * ANY CHANGES WILL BE OVERWRITTEN
  */
 
-namespace {{ namespace.as_it }};
+namespace {{ dbo_namespace.as_it }};
 
 use Luticate\Utils\LuDbo;
 

src/Generator/model.php.twig

@@ -8,10 +8,10 @@
  * TO MAKE YOUR CHANGES AND DATABASE ACCESS
 */
 
-namespace {{ namespace.as_it }};
+namespace {{ models_namespace.as_it }};
 
 use Luticate\Utils\LuModel;
-use App\Http\DBO\{{ dbo_name.camel_upper }};
+use {{ dbo_namespace.as_it }}\{{ dbo_name.camel_upper }};
 
 class {{ model_name.camel_upper }} extends LuModel
 {
@@ -33,7 +33,7 @@ class {{ model_name.camel_upper }} extends LuModel
     }
 
     /**
-     * @param $dbo \App\Http\DBO\{{ dbo_name.camel_upper }}
+     * @param $dbo {{ dbo_name.camel_upper }}
      * @param $model LuModel|null
      * @return {{ model_user_name.camel_upper }}
      */

src/Generator/model_user.php.twig

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

src/Generator/sp.php.twig

@@ -5,7 +5,7 @@
  * ANY CHANGES WILL BE OVERWRITTEN
  */
 
-namespace {{ namespace.as_it }};
+namespace {{ sp_namespace.as_it }};
 
 use Luticate\Utils\LuSpModel;
 use Illuminate\Support\Facades\DB;