added dynamic namespace

src/Generator/LuGenerator.php

@@ -13,33 +13,29 @@ class LuGenerator {
     private $_config = array("dbo" =>
         array(
             "namespace" => 'App\Http\DBO',
-            "folder" => '../app/Http/DBO',
-            "mode" => 0775
+            "folder" => '../app/Http/DBO'
         ),
         "models" =>
             array(
                 "namespace" => 'App\Http\DataAccess\Models',
-                "folder" => '../app/Http/DataAccess/Models',
-                "mode" => 0775
+                "folder" => '../app/Http/DataAccess/Models'
             ),
         "sp" =>
             array(
                 "namespace" => 'App\Http\DataAccess\SP',
-                "folder" => '../app/Http/DataAccess/SP',
-                "mode" => 0775
+                "folder" => '../app/Http/DataAccess/SP'
             ),
         "dataaccess" =>
             array(
                 "namespace" => 'App\Http\DataAccess',
-                "folder" => '../app/Http/DataAccess',
-                "mode" => 0775
+                "folder" => '../app/Http/DataAccess'
             ),
         "business" =>
             array(
                 "namespace" => 'App\Http\Business',
-                "folder" => '../app/Http/Business',
-                "mode" => 0775
-            )
+                "folder" => '../app/Http/Business'
+            ),
+        "mode" => 0755
     );
     /**
      * @return array
@@ -157,21 +153,23 @@ WHERE table_type = 'BASE TABLE' AND table_schema NOT IN ('pg_catalog', 'informat
         return $array;
     }
 
-    public function generateDbo($name, $columns, $file)
+    public function generateDbo($name, $columns, $file, $namespace)
     {
         $vars = array(
             "dbo_name" => $name,
-            "columns" => $columns
+            "columns" => $columns,
+            "namespace" => $namespace
         );
         $this->buildTwig('dbo.php', $file, $vars);
     }
 
-    public function generateModel($modelName, $dboName, $columns, $file)
+    public function generateModel($modelName, $dboName, $columns, $file, $namespace)
     {
         $vars = array(
             "model_name" => $modelName,
             "dbo_name" => $dboName,
-            "columns" => $columns
+            "columns" => $columns,
+            "namespace" => $namespace
         );
         $this->buildTwig('model.php', $file, $vars);
     }
@@ -233,26 +231,28 @@ ORDER BY parameters.ordinal_position;");
         $this->buildTwig('sp.php', $file, $vars);
     }
 
-    public function generateDataAccess($dataAccessName, $modelName, $dboName, $file)
+    public function generateDataAccess($dataAccessName, $modelName, $dboName, $file, $namespace)
     {
         if (file_exists($file))
             return;
         $vars = array(
             "data_access_name" => $dataAccessName,
             "model_name" => $modelName,
-            "dbo_name" => $dboName
+            "dbo_name" => $dboName,
+            "namespace" => $namespace
         );
         $this->buildTwig('dataaccess.php', $file, $vars);
     }
 
-    public function generateBusiness($businessName, $dataAccessName, $dboName, $file)
+    public function generateBusiness($businessName, $dataAccessName, $dboName, $file, $namespace)
     {
         if (file_exists($file))
             return;
         $vars = array(
             "business_name" => $businessName,
             "data_access_name" => $dataAccessName,
-            "dbo_name" => $dboName
+            "dbo_name" => $dboName,
+            "namespace" => $namespace
         );
         $this->buildTwig('business.php', $file, $vars);
     }
@@ -271,11 +271,13 @@ ORDER BY parameters.ordinal_position;");
         $manager_dir = $this->_config["dataaccess"]["folder"] . "/";
         $business_dir = $this->_config["business"]["folder"] . "/";
 
-        $this->mkdir($dbo_dir, $this->_config["dbo"]["mode"]);
-        $this->mkdir($model_dir, $this->_config["models"]["mode"]);
-        $this->mkdir($sp_dir, $this->_config["sp"]["mode"]);
-        $this->mkdir($manager_dir, $this->_config["dataaccess"]["mode"]);
-        $this->mkdir($business_dir, $this->_config["business"]["mode"]);
+        $mode = $this->_config["mode"];
+
+        $this->mkdir($dbo_dir, $mode);
+        $this->mkdir($model_dir, $mode);
+        $this->mkdir($sp_dir, $mode);
+        $this->mkdir($manager_dir, $mode);
+        $this->mkdir($business_dir, $mode);
 
         $tables = $this->getTables();
         if (!is_null($tables)) {
@@ -290,10 +292,14 @@ ORDER BY parameters.ordinal_position;");
                 $dboName = $baseName . "Dbo";
                 $dataAccessName = $baseName . "DataAccess";
                 $businessName = $baseName . "Business";
-                $this->generateDbo($dboName, $columns, $dbo_dir . $dboName . ".php");
-                $this->generateModel($modelName, $dboName, $columns, $model_dir . $modelName . ".php");
-                $this->generateDataAccess($dataAccessName, $modelName, $dboName, $manager_dir . $dataAccessName . ".php");
-                $this->generateBusiness($businessName, $dataAccessName, $dboName, $business_dir . $businessName . ".php");
+                $this->generateDbo($dboName, $columns, $dbo_dir . $dboName . ".php",
+                    $this->_config["dbo"]["namespace"]);
+                $this->generateModel($modelName, $dboName, $columns, $model_dir . $modelName . ".php",
+                    $this->_config["models"]["namespace"]);
+                $this->generateDataAccess($dataAccessName, $modelName, $dboName,
+                    $manager_dir . $dataAccessName . ".php", $this->_config["dataaccess"]["namespace"]);
+                $this->generateBusiness($businessName, $dataAccessName, $dboName,
+                    $business_dir . $businessName . ".php", $this->_config["business"]["namespace"]);
             }
         }
         $sps = $this->getStoredProcedures();

src/Generator/business.php.twig

@@ -1,6 +1,6 @@
 {{ "<?php" }}
 
-namespace App\Http\Business;
+namespace {{ namespace.as_it }};
 
 use Luticate\Utils\LuBusiness;
 use App\Http\DataAccess\{{ data_access_name.as_it }};

src/Generator/dataaccess.php.twig

@@ -1,6 +1,6 @@
 {{ "<?php" }}
 
-namespace App\Http\DataAccess;
+namespace {{ namespace.as_it }};
 
 use Luticate\Utils\LuDataAccess;
 use App\Http\DataAccess\Models\{{ model_name.as_it }};

src/Generator/dbo.php.twig

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

src/Generator/model.php.twig

@@ -5,7 +5,7 @@
 * ANY CHANGES WILL BE OVERWRITTEN
 */
 
-namespace App\Http\DataAccess\Models;
+namespace {{ namespace.as_it }};
 
 use Luticate\Utils\LuModel;
 use App\Http\DBO\{{ dbo_name.camel_upper }};

src/Generator/sp.php.twig

@@ -1,6 +1,6 @@
 {{ "<?php" }}
 
-namespace App\Http\DataAccess\SP;
+namespace {{ namespace.as_it }};
 
 use Luticate\Utils\LuSpModel;
 use Illuminate\Support\Facades\DB;