fix namespace pb with scaffolding

Author: jcheron

src/Ubiquity/scaffolding/creators/AuthControllerCreator.php

@@ -35,7 +35,6 @@ public function create(ScaffoldController $scaffoldController) {
 		} else {
 			$controllerTemplate = "authController_.tpl";
 		}
-		$controllerNS = $this->controllerNS;
 
 		$messages = [];
 		if (isset($this->views)) {
@@ -53,7 +52,7 @@ public function create(ScaffoldController $scaffoldController) {
 			"%routePath%" => $routePath,
 			"%route%" => $routeAnnot,
 			"%uses%" => $this->getUsesStr(),
-			"%namespace%" => $controllerNS,
+			"%namespace%" => $this->getNamespaceStr(),
 			"%baseClass%" => $this->baseClass,
 			"%content%" => $classContent
 		], $controllerTemplate);

src/Ubiquity/scaffolding/creators/BaseControllerCreator.php

@@ -46,6 +46,13 @@ public function __construct($controllerName, $routePath, $views,$useViewInherita
 		$this->controllerNS = Startup::getNS("controllers");
 		$this->useViewInheritance=$useViewInheritance;
 	}
+	
+	protected function getNamespaceStr(){
+		if($this->controllerNS==null){
+			return '';
+		}
+		return 'namespace '. \trim($this->controllerNS,'\\').';';
+	}
 
 	protected function getRouteAnnotation($path) {
 		return CacheManager::getAnnotationsEngineInstance()->getAnnotation($this, 'route', [

src/Ubiquity/scaffolding/creators/CrudControllerCreator.php

@@ -35,8 +35,7 @@ public function create(ScaffoldController $scaffoldController) {
 		$resource = $this->resource;
 		$crudControllerName = $this->controllerName;
 		$classContent = '';
-		$controllerNS = $this->controllerNS;
-		$nsc=\trim($controllerNS,'\\');
+		$nsc=\trim($this->controllerNS,'\\');
 		$messages = [ ];
 
 		$scaffoldController->_createMethod ( 'public', '__construct', '', '', "\n\t\tparent::__construct();\n\$this->model=\"{$resource}\";" );
@@ -72,7 +71,7 @@ public function create(ScaffoldController $scaffoldController) {
 		}
 
 		$uses = $this->getUsesStr();
-		$messages [] = $scaffoldController->_createController ( $crudControllerName, [ '%routePath%' => $routePath,'%route%' => $routeAnnot,'%resource%' => $resource,'%uses%' => $uses,'%namespace%' => $controllerNS,'%baseClass%' => "\\Ubiquity\\controllers\\crud\\CRUDController",'%content%' => $classContent ], $this->templateName );
+		$messages [] = $scaffoldController->_createController ( $crudControllerName, [ '%routePath%' => $routePath,'%route%' => $routeAnnot,'%resource%' => $resource,'%uses%' => $uses,'%namespace%' => $this->getNamespaceStr(),'%baseClass%' => "\\Ubiquity\\controllers\\crud\\CRUDController",'%content%' => $classContent ], $this->templateName );
 		echo implode ( "\n", $messages );
 	}