codificar / scaffolder

stubs/Controller.php

Indentation +12 added lines, -12 removed lines

@@ -43,19 +43,19 @@ 
     }
 
     public function show($id)
-	{
-		return 'Not implemented';
-	}
+    {
+        return 'Not implemented';
+    }
 
     public function edit($id)
-	{
-		$model = {{class_name}}::find($id);
+    {
+        $model = {{class_name}}::find($id);
 
         return view('{{class_name_lw}}.edit')->with('model', $model);
-	}
+    }
 
     public function update($id, Request $request)
-	{
+    {
         $this->validate($request, [
 
             {{validations}}
@@ -63,13 +63,13 @@ 
 
         {{class_name}}::find($id)->fill($request->all())->save();
 
-		return response()->json(['message' => 'ok']);
-	}
+        return response()->json(['message' => 'ok']);
+    }
 
     public function destroy($id)
-	{
+    {
         {{class_name}}::destroy($id);
 
-		return response()->json(['message' => 'ok']);
-	}
+        return response()->json(['message' => 'ok']);
+    }
 }

src/Scaffolder/Commands/ServeCommand.php

Doc Comments +6 added lines

@@ -116,6 +116,9 @@ 
 	}
 
 
+	/**
+	 * @param boolean $overwrite
+	 */
 	public function copyApiFiles($overwrite) {
 
 		$command = sprintf('cp -r %s "%s/." "%s"', 
@@ -128,6 +131,9 @@ 
 		$this->info('- Api files copied');	
 	}
 
+	/**
+	 * @param boolean $overwrite
+	 */
 	public function copyAngularjsFiles($overwrite) {
 
 		// resource angular js path

Indentation +104 added lines, -104 removed lines

@@ -17,143 +17,143 @@
 
 class ServeCommand extends Command
 {
-	protected $signature = 'scaffolder:serve {app=webapp} {--o|overwrite : Overwrite generated files} {--g|generate : Generate files }';
+    protected $signature = 'scaffolder:serve {app=webapp} {--o|overwrite : Overwrite generated files} {--g|generate : Generate files }';
 
-	protected $description = 'Serve code for development purpose';
+    protected $description = 'Serve code for development purpose';
 
-	// app config var
-	private $scaffolderConfig ;
+    // app config var
+    private $scaffolderConfig ;
 
-	/**
-	 * Execute the Command.
-	 */
-	public function handle()
-	{
-		// Get app config
-		$this->getScaffolderConfig();
+    /**
+     * Execute the Command.
+     */
+    public function handle()
+    {
+        // Get app config
+        $this->getScaffolderConfig();
 
-		$overwrite = false;
+        $overwrite = false;
 
-		if($this->option('overwrite'))
-			$overwrite = true;
+        if($this->option('overwrite'))
+            $overwrite = true;
 
-		$generate = false;
+        $generate = false;
 
-		if($this->option('generate'))
-			$generate = true;
+        if($this->option('generate'))
+            $generate = true;
 
 
-		switch ($this->argument('app')) {
-			case 'webapp':
+        switch ($this->argument('app')) {
+            case 'webapp':
 				
-				// gera código somente se houver a opcao
-				if($generate) {
-					// Gera codigo da api
-					$this->call('scaffolder:generate', array('app' => 'api', '-c' => 'clear-all'));
+                // gera código somente se houver a opcao
+                if($generate) {
+                    // Gera codigo da api
+                    $this->call('scaffolder:generate', array('app' => 'api', '-c' => 'clear-all'));
 					
-					// Se parametro --overwrite selecionado, copia arquivos para seu respectivo destino
-					$this->copyApiFiles($overwrite);
+                    // Se parametro --overwrite selecionado, copia arquivos para seu respectivo destino
+                    $this->copyApiFiles($overwrite);
 					
-					// Gera codigo da pasta webapp
-					$this->call('scaffolder:generate', array('app' => 'angularjs', '-c' => 'clear-all'));
+                    // Gera codigo da pasta webapp
+                    $this->call('scaffolder:generate', array('app' => 'angularjs', '-c' => 'clear-all'));
 					
-					// Se parametro --overwrite selecionado, copia arquivos para seu respectivo destino
-					$this->copyAngularjsFiles($overwrite);
-				}
+                    // Se parametro --overwrite selecionado, copia arquivos para seu respectivo destino
+                    $this->copyAngularjsFiles($overwrite);
+                }
 				
-				$gulpCommand = sprintf('gulp serve --cwd "%s/codificar/scaffolder-theme-material/" > null', base_path('vendor'));
+                $gulpCommand = sprintf('gulp serve --cwd "%s/codificar/scaffolder-theme-material/" > null', base_path('vendor'));
 
-				$this->info('Running gulp in serve mode, wait your browser open...');	
-				//$handle = popen($gulpCommand, 'r');
+                $this->info('Running gulp in serve mode, wait your browser open...');	
+                //$handle = popen($gulpCommand, 'r');
 
-				$this->launchBackgroundProcess($gulpCommand);
+                $this->launchBackgroundProcess($gulpCommand);
 				
-				// php artisan serve
-				$this->call('serve');
+                // php artisan serve
+                $this->call('serve');
 
-				break;
+                break;
 
-			default:
-				$this->info('Invalid arguments');
-				break;
-		}
+            default:
+                $this->info('Invalid arguments');
+                break;
+        }
 		
-	}
-
-	/**
-	* Launch Background Process
-	*
-	* Launches a background process (note, provides no security itself, $call must be sanitized prior to use)
-	* @param string $call the system call to make
-	* @author raccettura
-	*/
-	private function launchBackgroundProcess($call) {
+    }
+
+    /**
+     * Launch Background Process
+     *
+     * Launches a background process (note, provides no security itself, $call must be sanitized prior to use)
+     * @param string $call the system call to make
+     * @author raccettura
+     */
+    private function launchBackgroundProcess($call) {
 	 
-		// Windows
-		if($this->is_windows()){
-			pclose(popen('start /b '.$call, 'r'));
-		}
+        // Windows
+        if($this->is_windows()){
+            pclose(popen('start /b '.$call, 'r'));
+        }
 	 
-		// Some sort of UNIX
-		else {
-			pclose(popen($call.' /dev/null &', 'r'));
-		}
-		return true;
-	}
+        // Some sort of UNIX
+        else {
+            pclose(popen($call.' /dev/null &', 'r'));
+        }
+        return true;
+    }
 	 
 	 
-	/**
-	* Is Windows
-	*
-	* Tells if we are running on Windows Platform
-	* @author raccettura
-	*/
-	private function is_windows(){
-		if(PHP_OS == 'WINNT' || PHP_OS == 'WIN32'){
-			return true;
-		}
-		return false;
-	}
-
-
-	public function copyApiFiles($overwrite) {
-
-		$command = sprintf('cp -r %s "%s/." "%s"', 
-			(!$overwrite ? ' -u' : null) , 
-			PathParser::parse($this->scaffolderConfig->generators->api->paths->base),
-			base_path());
+    /**
+     * Is Windows
+     *
+     * Tells if we are running on Windows Platform
+     * @author raccettura
+     */
+    private function is_windows(){
+        if(PHP_OS == 'WINNT' || PHP_OS == 'WIN32'){
+            return true;
+        }
+        return false;
+    }
+
+
+    public function copyApiFiles($overwrite) {
+
+        $command = sprintf('cp -r %s "%s/." "%s"', 
+            (!$overwrite ? ' -u' : null) , 
+            PathParser::parse($this->scaffolderConfig->generators->api->paths->base),
+            base_path());
 		
-		shell_exec($command);
+        shell_exec($command);
 
-		$this->info('- Api files copied');	
-	}
+        $this->info('- Api files copied');	
+    }
 
-	public function copyAngularjsFiles($overwrite) {
+    public function copyAngularjsFiles($overwrite) {
 
-		// resource angular js path
-		Directory::createIfNotExists(PathParser::parse($this->scaffolderConfig->generators->angularjs->paths->resources), 0755, true);
+        // resource angular js path
+        Directory::createIfNotExists(PathParser::parse($this->scaffolderConfig->generators->angularjs->paths->resources), 0755, true);
 
-		// copying page files
-		$command = sprintf('cp -r %s "%s/." "%s/"', 
-			(!$overwrite ? ' -u' : null) , 
-			PathParser::parse($this->scaffolderConfig->generators->angularjs->paths->index),
-			PathParser::parse($this->scaffolderConfig->generators->angularjs->paths->resources));
+        // copying page files
+        $command = sprintf('cp -r %s "%s/." "%s/"', 
+            (!$overwrite ? ' -u' : null) , 
+            PathParser::parse($this->scaffolderConfig->generators->angularjs->paths->index),
+            PathParser::parse($this->scaffolderConfig->generators->angularjs->paths->resources));
 
-		shell_exec($command);
+        shell_exec($command);
 		
-		$this->info('- Angularjs files copied');	
-	}
+        $this->info('- Angularjs files copied');	
+    }
 
 
-	/**
-	 * Get the app.json configuration and parse to an object
-	 *
-	 * @return void
-	 */
-	private function getScaffolderConfig(){
-		// Get app config
-		$this->scaffolderConfig = Json::decodeFile(base_path('scaffolder-config/app.json'));
+    /**
+     * Get the app.json configuration and parse to an object
+     *
+     * @return void
+     */
+    private function getScaffolderConfig(){
+        // Get app config
+        $this->scaffolderConfig = Json::decodeFile(base_path('scaffolder-config/app.json'));
 
-	}
+    }
 
 }
\ No newline at end of file

src/Scaffolder/Compilers/AngularJs/IndexApiCompiler.php

Doc Comments +3 added lines, -3 removed lines

@@ -22,7 +22,7 @@ 
 	/**
 	 * Replace and store the Stub.
 	 *
-	 * @return string
+	 * @return IndexApiCompiler
 	 */
 	public function replaceAndStore()
 	{
@@ -34,7 +34,7 @@ 
 	 *
 	 * @param null $extra
 	 *
-	 * @return string
+	 * @return IndexApiCompiler
 	 */
 	public function compile($extra = null)
 	{
@@ -53,7 +53,7 @@ 
 	 * Get output filename
 	 *
 	 *
-	 * @return $this
+	 * @return string
 	 */
 	protected function getOutputFilename()
 	{

Indentation +45 added lines, -45 removed lines

@@ -10,56 +10,56 @@
 
 class IndexApiCompiler extends AbstractCompiler
 {
-	protected $cachePrefix 	= 'index_api_';
-	protected $stubFilename = 'IndexApi.js' ;
+    protected $cachePrefix 	= 'index_api_';
+    protected $stubFilename = 'IndexApi.js' ;
 
-	public function __construct($scaffolderConfig, $modelData = null)
-	{
-		$this->stubsDirectory = __DIR__ . '/../../../../stubs/AngularJs/';
-		parent::__construct($scaffolderConfig, $modelData);
-	}
+    public function __construct($scaffolderConfig, $modelData = null)
+    {
+        $this->stubsDirectory = __DIR__ . '/../../../../stubs/AngularJs/';
+        parent::__construct($scaffolderConfig, $modelData);
+    }
 
-	/**
-	 * Replace and store the Stub.
-	 *
-	 * @return string
-	 */
-	public function replaceAndStore()
-	{
-		return $this->store(new FileToCompile(false, $this->cachePrefix));
-	}
+    /**
+     * Replace and store the Stub.
+     *
+     * @return string
+     */
+    public function replaceAndStore()
+    {
+        return $this->store(new FileToCompile(false, $this->cachePrefix));
+    }
 
-	/**
-	 * Compiles .
-	 *
-	 * @param null $extra
-	 *
-	 * @return string
-	 */
-	public function compile($extra = null)
-	{
-		if (File::exists(base_path('scaffolder-config/cache/' . $this->cachePrefix  . self::CACHE_EXT)))
-		{
-			return $this->store(new FileToCompile(true, $this->cachePrefix));
-		}
-		else
-		{
+    /**
+     * Compiles .
+     *
+     * @param null $extra
+     *
+     * @return string
+     */
+    public function compile($extra = null)
+    {
+        if (File::exists(base_path('scaffolder-config/cache/' . $this->cachePrefix  . self::CACHE_EXT)))
+        {
+            return $this->store(new FileToCompile(true, $this->cachePrefix));
+        }
+        else
+        {
 
-			return $this->replaceAndStore();
-		}
-	}
+            return $this->replaceAndStore();
+        }
+    }
 	
-	/**
-	 * Get output filename
-	 *
-	 *
-	 * @return $this
-	 */
-	protected function getOutputFilename()
-	{
-		$folder = PathParser::parse($this->scaffolderConfig->generator->paths->index);
+    /**
+     * Get output filename
+     *
+     *
+     * @return $this
+     */
+    protected function getOutputFilename()
+    {
+        $folder = PathParser::parse($this->scaffolderConfig->generator->paths->index);
 
-		return $folder  . 'index.api.js';
-	}
+        return $folder  . 'index.api.js';
+    }
 
 }
\ No newline at end of file

src/Scaffolder/Compilers/AngularJs/IndexModuleCompiler.php

Doc Comments +2 added lines, -2 removed lines

@@ -45,7 +45,7 @@ 
 	 * Compiles a group of routes.
 	 *
 	 * @param      $hash
-	 * @param null $extra
+	 * @param string $compiledIndexes
 	 *
 	 * @return mixed
 	 */
@@ -63,7 +63,7 @@ 
 	 * Get output filename
 	 *
 	 *
-	 * @return $this
+	 * @return string
 	 */
 	protected function getOutputFilename()
 	{

Indentation +86 added lines, -86 removed lines

@@ -10,98 +10,98 @@
 
 class IndexModuleCompiler extends AbstractCompiler
 {
-	protected $stubFilename = 'IndexModule.js' ;
+    protected $stubFilename = 'IndexModule.js' ;
 
-	protected $stubResourceFilename = 'IndexModuleModel.js' ;
-	protected $stubResource  ;
+    protected $stubResourceFilename = 'IndexModuleModel.js' ;
+    protected $stubResource  ;
 
 
-	public function __construct($scaffolderConfig, $modelData = null)
-	{
-		$this->stubsDirectory = __DIR__ . '/../../../../stubs/AngularJs/';
-		parent::__construct($scaffolderConfig, null);
+    public function __construct($scaffolderConfig, $modelData = null)
+    {
+        $this->stubsDirectory = __DIR__ . '/../../../../stubs/AngularJs/';
+        parent::__construct($scaffolderConfig, null);
 		
-		$this->stubResource = File::get($this->stubsDirectory . $this->stubResourceFilename );
-	}
-
-	/**
-	 * Replace and store the Stub.
-	 *
-	 * @return string
-	 */
-	public function replaceAndStore(){}
-
-	/**
-	 * Compiles a resource.
-	 *
-	 * @param      $hash
-	 * @param null $extra
-	 *
-	 * @return string
-	 */
-	public function compile($extra = null) {}
-
-	/**
-	 * Compiles a group of routes.
-	 *
-	 * @param      $hash
-	 * @param null $extra
-	 *
-	 * @return mixed
-	 */
-	public function compileGroup($compiledIndexes)
-	{
-
-		$this->replaceIndexes($compiledIndexes)
-			->store(new FileToCompile(null, null));
-
-		return $this->stub;
-	}
-
-
-	/**
-	 * Get output filename
-	 *
-	 *
-	 * @return $this
-	 */
-	protected function getOutputFilename()
-	{
-		$folder = PathParser::parse($this->scaffolderConfig->generator->paths->index);
-
-		return $folder  . 'index.module.js';
-	}
-
-
-	/**
-	 * Replace the resource.
-	 *
-	 * @param $this->modelName
-	 *
-	 * @return string routeStub
-	 */
-	public function replaceResource($modelData)
-	{
+        $this->stubResource = File::get($this->stubsDirectory . $this->stubResourceFilename );
+    }
+
+    /**
+     * Replace and store the Stub.
+     *
+     * @return string
+     */
+    public function replaceAndStore(){}
+
+    /**
+     * Compiles a resource.
+     *
+     * @param      $hash
+     * @param null $extra
+     *
+     * @return string
+     */
+    public function compile($extra = null) {}
+
+    /**
+     * Compiles a group of routes.
+     *
+     * @param      $hash
+     * @param null $extra
+     *
+     * @return mixed
+     */
+    public function compileGroup($compiledIndexes)
+    {
+
+        $this->replaceIndexes($compiledIndexes)
+            ->store(new FileToCompile(null, null));
+
+        return $this->stub;
+    }
+
+
+    /**
+     * Get output filename
+     *
+     *
+     * @return $this
+     */
+    protected function getOutputFilename()
+    {
+        $folder = PathParser::parse($this->scaffolderConfig->generator->paths->index);
+
+        return $folder  . 'index.module.js';
+    }
+
+
+    /**
+     * Replace the resource.
+     *
+     * @param $this->modelName
+     *
+     * @return string routeStub
+     */
+    public function replaceResource($modelData)
+    {
 		
-		$indexStub = str_replace('{{table_name_uc}}', $modelData->modelName, $this->stubResource);
-		$indexStub = str_replace('{{table_name}}', $modelData->tableName, $indexStub);
+        $indexStub = str_replace('{{table_name_uc}}', $modelData->modelName, $this->stubResource);
+        $indexStub = str_replace('{{table_name}}', $modelData->tableName, $indexStub);
 		
-		return $indexStub;
-	}
-
-	/**
-	 * Replace compiled routes.
-	 *
-	 * @param $compiledRoutes
-	 *
-	 * @return $this
-	 */
-	private function replaceIndexes($compiledIndexes)
-	{
-		$this->stub = str_replace('{{tables}}', $compiledIndexes, $this->stub);
-
-		return $this;
-	}
+        return $indexStub;
+    }
+
+    /**
+     * Replace compiled routes.
+     *
+     * @param $compiledRoutes
+     *
+     * @return $this
+     */
+    private function replaceIndexes($compiledIndexes)
+    {
+        $this->stub = str_replace('{{tables}}', $compiledIndexes, $this->stub);
+
+        return $this;
+    }
 
 	
 }
\ No newline at end of file

src/Scaffolder/Compilers/AngularJs/ListChooseColumnsCompiler.php

Doc Comments +2 added lines, -2 removed lines

@@ -22,7 +22,7 @@ 
 	/**
 	 * Replace and store the Stub.
 	 *
-	 * @return string
+	 * @return ListChooseColumnsCompiler
 	 */
 	public function replaceAndStore()
 	{
@@ -35,7 +35,7 @@ 
 	 * Get output filename
 	 *
 	 *
-	 * @return $this
+	 * @return string
 	 */
 	protected function getOutputFilename()
 	{

Indentation +32 added lines, -32 removed lines

@@ -10,40 +10,40 @@
 
 class ListChooseColumnsCompiler extends AbstractCompiler
 {
-	protected $cachePrefix 	= 'list_choose_column_';
-	protected $stubFilename = 'ChooseColumnsDialog.html' ;
-
-	public function __construct($scaffolderConfig, $modelData = null)
-	{
-		$this->stubsDirectory = __DIR__ . '/../../../../stubs/AngularJs/';
-		parent::__construct($scaffolderConfig, $modelData);
-	}
-
-	/**
-	 * Replace and store the Stub.
-	 *
-	 * @return string
-	 */
-	public function replaceAndStore()
-	{
+    protected $cachePrefix 	= 'list_choose_column_';
+    protected $stubFilename = 'ChooseColumnsDialog.html' ;
+
+    public function __construct($scaffolderConfig, $modelData = null)
+    {
+        $this->stubsDirectory = __DIR__ . '/../../../../stubs/AngularJs/';
+        parent::__construct($scaffolderConfig, $modelData);
+    }
+
+    /**
+     * Replace and store the Stub.
+     *
+     * @return string
+     */
+    public function replaceAndStore()
+    {
 		
-		return $this->store(new FileToCompile(false, $this->modelData->modelHash));
+        return $this->store(new FileToCompile(false, $this->modelData->modelHash));
 		
-	}
+    }
 	
-	/**
-	 * Get output filename
-	 *
-	 *
-	 * @return $this
-	 */
-	protected function getOutputFilename()
-	{
-		$folder = PathParser::parse($this->scaffolderConfig->generator->paths->pages).$this->modelData->tableName.'/list/' ;
-
-		Directory::createIfNotExists($folder, 0755, true);
-
-		return $folder .$this->modelData->tableName . '_columns.dialog.html';
-	}
+    /**
+     * Get output filename
+     *
+     *
+     * @return $this
+     */
+    protected function getOutputFilename()
+    {
+        $folder = PathParser::parse($this->scaffolderConfig->generator->paths->pages).$this->modelData->tableName.'/list/' ;
+
+        Directory::createIfNotExists($folder, 0755, true);
+
+        return $folder .$this->modelData->tableName . '_columns.dialog.html';
+    }
 
 }
\ No newline at end of file

src/Scaffolder/Compilers/AngularJs/ListControllerCompiler.php

Doc Comments +2 added lines, -2 removed lines

@@ -22,7 +22,7 @@ 
 	/**
 	 * Replace and store the Stub.
 	 *
-	 * @return string
+	 * @return ListControllerCompiler
 	 */
 	public function replaceAndStore()
 	{
@@ -77,7 +77,7 @@ 
 	 * Get output filename
 	 *
 	 *
-	 * @return $this
+	 * @return string
 	 */
 	protected function getOutputFilename()
 	{

Indentation +61 added lines, -61 removed lines

@@ -10,82 +10,82 @@
 
 class ListControllerCompiler extends AbstractCompiler
 {
-	protected $cachePrefix 	= 'list_controller_';
-	protected $stubFilename = 'ListController.js' ;
-
-	public function __construct($scaffolderConfig, $modelData = null)
-	{
-		$this->stubsDirectory = __DIR__ . '/../../../../stubs/AngularJs/';
-		parent::__construct($scaffolderConfig, $modelData);
-	}
-
-	/**
-	 * Replace and store the Stub.
-	 *
-	 * @return string
-	 */
-	public function replaceAndStore()
-	{
+    protected $cachePrefix 	= 'list_controller_';
+    protected $stubFilename = 'ListController.js' ;
+
+    public function __construct($scaffolderConfig, $modelData = null)
+    {
+        $this->stubsDirectory = __DIR__ . '/../../../../stubs/AngularJs/';
+        parent::__construct($scaffolderConfig, $modelData);
+    }
+
+    /**
+     * Replace and store the Stub.
+     *
+     * @return string
+     */
+    public function replaceAndStore()
+    {
 		
-		return $this->replaceColumns()
-					->store(new FileToCompile(false, $this->modelData->modelHash));
+        return $this->replaceColumns()
+                    ->store(new FileToCompile(false, $this->modelData->modelHash));
 		
-	}
+    }
 
-	/**
-	 * replace columns
-	 *
-	 * @return $this
-	 */
-	public function replaceColumns(){
+    /**
+     * replace columns
+     *
+     * @return $this
+     */
+    public function replaceColumns(){
 
-		$columns = $this->getGridColumns();
+        $columns = $this->getGridColumns();
 
-		$this->stub = str_replace('{{grid_columns}}',  join(",\n ", $columns) , $this->stub); 
+        $this->stub = str_replace('{{grid_columns}}',  join(",\n ", $columns) , $this->stub); 
 
-		return $this ;
+        return $this ;
 
-	}
+    }
 
-	public function getGridColumns(){
+    public function getGridColumns(){
 
-		$columns = [];
+        $columns = [];
 
-		foreach ($this->modelData->fields as $field)
-		{
-			array_push($columns,  "\t\t\t".sprintf('{ name: vm. $t("%s.columns.%s"), field: "%s%s" }',  $this->modelData->tableName, $field->name, $this->eagerTable, $field->name ) );
+        foreach ($this->modelData->fields as $field)
+        {
+            array_push($columns,  "\t\t\t".sprintf('{ name: vm. $t("%s.columns.%s"), field: "%s%s" }',  $this->modelData->tableName, $field->name, $this->eagerTable, $field->name ) );
 
-			// Check foreign key
-			if ($field->foreignKey && isset($field->foreignKey->eager) && $field->foreignKey->eager)
-			{
-				// search eager fields
-				$foreignModelData = $this->getModelData($field->foreignKey->table);
-				$foreignControllerCompiler = new ListControllerCompiler($this->scaffolderConfig, $foreignModelData);
-				$foreignControllerCompiler->setEagerTable($field->foreignKey->table);
-				$eagerColumns 	= $foreignControllerCompiler->getGridColumns();
+            // Check foreign key
+            if ($field->foreignKey && isset($field->foreignKey->eager) && $field->foreignKey->eager)
+            {
+                // search eager fields
+                $foreignModelData = $this->getModelData($field->foreignKey->table);
+                $foreignControllerCompiler = new ListControllerCompiler($this->scaffolderConfig, $foreignModelData);
+                $foreignControllerCompiler->setEagerTable($field->foreignKey->table);
+                $eagerColumns 	= $foreignControllerCompiler->getGridColumns();
 
-				$columns = array_merge($columns, $eagerColumns);
-			}
-		}
+                $columns = array_merge($columns, $eagerColumns);
+            }
+        }
 
-		return $columns; 
+        return $columns; 
 
-	}
+    }
 	
 	
-	/**
-	 * Get output filename
-	 *
-	 *
-	 * @return $this
-	 */
-	protected function getOutputFilename()
-	{
-		$folder = PathParser::parse($this->scaffolderConfig->generator->paths->pages).$this->modelData->tableName.'/list/' ;
-
-		Directory::createIfNotExists($folder, 0755, true);
-
-		return $folder .$this->modelData->tableName . '_list.controller.js';
-	}
+    /**
+     * Get output filename
+     *
+     *
+     * @return $this
+     */
+    protected function getOutputFilename()
+    {
+        $folder = PathParser::parse($this->scaffolderConfig->generator->paths->pages).$this->modelData->tableName.'/list/' ;
+
+        Directory::createIfNotExists($folder, 0755, true);
+
+        return $folder .$this->modelData->tableName . '_list.controller.js';
+    }
 
 }
\ No newline at end of file

src/Scaffolder/Compilers/AngularJs/ListDetailCompiler.php

Doc Comments +2 added lines, -2 removed lines

@@ -22,7 +22,7 @@ 
 	/**
 	 * Replace and store the Stub.
 	 *
-	 * @return string
+	 * @return ListDetailCompiler
 	 */
 	public function replaceAndStore()
 	{
@@ -35,7 +35,7 @@ 
 	 * Get output filename
 	 *
 	 *
-	 * @return $this
+	 * @return string
 	 */
 	protected function getOutputFilename()
 	{

Indentation +32 added lines, -32 removed lines

@@ -10,40 +10,40 @@
 
 class ListDetailCompiler extends AbstractCompiler
 {
-	protected $cachePrefix 	= 'list_detail_';
-	protected $stubFilename = 'DetailDialog.html' ;
-
-	public function __construct($scaffolderConfig, $modelData = null)
-	{
-		$this->stubsDirectory = __DIR__ . '/../../../../stubs/AngularJs/';
-		parent::__construct($scaffolderConfig, $modelData);
-	}
-
-	/**
-	 * Replace and store the Stub.
-	 *
-	 * @return string
-	 */
-	public function replaceAndStore()
-	{
+    protected $cachePrefix 	= 'list_detail_';
+    protected $stubFilename = 'DetailDialog.html' ;
+
+    public function __construct($scaffolderConfig, $modelData = null)
+    {
+        $this->stubsDirectory = __DIR__ . '/../../../../stubs/AngularJs/';
+        parent::__construct($scaffolderConfig, $modelData);
+    }
+
+    /**
+     * Replace and store the Stub.
+     *
+     * @return string
+     */
+    public function replaceAndStore()
+    {
 		
-		return $this->store(new FileToCompile(false, $this->modelData->modelHash));
+        return $this->store(new FileToCompile(false, $this->modelData->modelHash));
 		
-	}
+    }
 	
-	/**
-	 * Get output filename
-	 *
-	 *
-	 * @return $this
-	 */
-	protected function getOutputFilename()
-	{
-		$folder = PathParser::parse($this->scaffolderConfig->generator->paths->pages).$this->modelData->tableName.'/list/' ;
-
-		Directory::createIfNotExists($folder, 0755, true);
-
-		return $folder .$this->modelData->tableName . '_details.dialog.html';
-	}
+    /**
+     * Get output filename
+     *
+     *
+     * @return $this
+     */
+    protected function getOutputFilename()
+    {
+        $folder = PathParser::parse($this->scaffolderConfig->generator->paths->pages).$this->modelData->tableName.'/list/' ;
+
+        Directory::createIfNotExists($folder, 0755, true);
+
+        return $folder .$this->modelData->tableName . '_details.dialog.html';
+    }
 
 }
\ No newline at end of file

src/Scaffolder/Compilers/AngularJs/ListModuleCompiler.php

Doc Comments +2 added lines, -2 removed lines

@@ -22,7 +22,7 @@ 
 	/**
 	 * Replace and store the Stub.
 	 *
-	 * @return string
+	 * @return ListModuleCompiler
 	 */
 	public function replaceAndStore()
 	{
@@ -35,7 +35,7 @@ 
 	 * Get output filename
 	 *
 	 *
-	 * @return $this
+	 * @return string
 	 */
 	protected function getOutputFilename()
 	{

Indentation +32 added lines, -32 removed lines

@@ -10,40 +10,40 @@
 
 class ListModuleCompiler extends AbstractCompiler
 {
-	protected $cachePrefix 	= 'list_module_';
-	protected $stubFilename = 'ListModule.js' ;
-
-	public function __construct($scaffolderConfig, $modelData = null)
-	{
-		$this->stubsDirectory = __DIR__ . '/../../../../stubs/AngularJs/';
-		parent::__construct($scaffolderConfig, $modelData);
-	}
-
-	/**
-	 * Replace and store the Stub.
-	 *
-	 * @return string
-	 */
-	public function replaceAndStore()
-	{
+    protected $cachePrefix 	= 'list_module_';
+    protected $stubFilename = 'ListModule.js' ;
+
+    public function __construct($scaffolderConfig, $modelData = null)
+    {
+        $this->stubsDirectory = __DIR__ . '/../../../../stubs/AngularJs/';
+        parent::__construct($scaffolderConfig, $modelData);
+    }
+
+    /**
+     * Replace and store the Stub.
+     *
+     * @return string
+     */
+    public function replaceAndStore()
+    {
 		
-		return $this->store(new FileToCompile(false, $this->modelData->modelHash));
+        return $this->store(new FileToCompile(false, $this->modelData->modelHash));
 		
-	}
+    }
 	
-	/**
-	 * Get output filename
-	 *
-	 *
-	 * @return $this
-	 */
-	protected function getOutputFilename()
-	{
-		$folder = PathParser::parse($this->scaffolderConfig->generator->paths->pages).$this->modelData->tableName.'/list/' ;
-
-		Directory::createIfNotExists($folder, 0755, true);
-
-		return $folder .$this->modelData->tableName . '_list.module.js';
-	}
+    /**
+     * Get output filename
+     *
+     *
+     * @return $this
+     */
+    protected function getOutputFilename()
+    {
+        $folder = PathParser::parse($this->scaffolderConfig->generator->paths->pages).$this->modelData->tableName.'/list/' ;
+
+        Directory::createIfNotExists($folder, 0755, true);
+
+        return $folder .$this->modelData->tableName . '_list.module.js';
+    }
 
 }
\ No newline at end of file

src/Scaffolder/Compilers/AngularJs/ListTemplateCompiler.php

Doc Comments +5 added lines, -5 removed lines

@@ -25,7 +25,7 @@ 
 	/**
 	 * Replace and store the Stub.
 	 *
-	 * @return string
+	 * @return ListTemplateCompiler
 	 */
 	public function replaceAndStore()
 	{
@@ -53,7 +53,7 @@ 
 	/**
 	 * get search conditions
 	 *
-	 * @return $this
+	 * @return string
 	 */
 	public function getInputFields(){
 
@@ -97,7 +97,7 @@ 
 	 * @param string $field
 	 * @param string $fieldStub
 	 *
-	 * @return $this
+	 * @return string
 	 */
 	protected function replaceFieldInput($field, $fieldStub){
 		$fieldStub = $this->replaceFieldStrings($field, $fieldStub) ;
@@ -112,7 +112,7 @@ 
 	 * @param string $field
 	 * @param string $fieldStub
 	 *
-	 * @return $this
+	 * @return string
 	 */
 	protected function replaceFieldValidations($field, $fieldStub){
 		$fieldStub = $this->replaceFieldStrings($field, $fieldStub) ;
@@ -199,7 +199,7 @@ 
 	 * Get output filename
 	 *
 	 *
-	 * @return $this
+	 * @return string
 	 */
 	protected function getOutputFilename()
 	{

Indentation +166 added lines, -166 removed lines

@@ -13,201 +13,201 @@
 
 class ListTemplateCompiler extends AbstractCompiler
 {
-	protected $cachePrefix 	= 'list_template_';
-	protected $stubFilename = 'ListTemplate.html' ;
-
-	public function __construct($scaffolderConfig, $modelData = null)
-	{
-		$this->stubsDirectory = __DIR__ . '/../../../../stubs/AngularJs/';
-		parent::__construct($scaffolderConfig, $modelData);
-	}
-
-	/**
-	 * Replace and store the Stub.
-	 *
-	 * @return string
-	 */
-	public function replaceAndStore()
-	{
+    protected $cachePrefix 	= 'list_template_';
+    protected $stubFilename = 'ListTemplate.html' ;
+
+    public function __construct($scaffolderConfig, $modelData = null)
+    {
+        $this->stubsDirectory = __DIR__ . '/../../../../stubs/AngularJs/';
+        parent::__construct($scaffolderConfig, $modelData);
+    }
+
+    /**
+     * Replace and store the Stub.
+     *
+     * @return string
+     */
+    public function replaceAndStore()
+    {
 		
-		return $this->replaceInputFields()
-					->replaceBelongsToManyFields()
-					->store(new FileToCompile(false, $this->modelData->modelHash));
+        return $this->replaceInputFields()
+                    ->replaceBelongsToManyFields()
+                    ->store(new FileToCompile(false, $this->modelData->modelHash));
 		
-	}
+    }
 
-	/**
-	 * Replace input fields
-	 *
-	 * @return $this
-	 */
-	private function replaceInputFields(){
+    /**
+     * Replace input fields
+     *
+     * @return $this
+     */
+    private function replaceInputFields(){
 
-		$inputFields = $this->getInputFields();
+        $inputFields = $this->getInputFields();
 
-		$this->stub = str_replace('{{columns_inputs}}', $inputFields, $this->stub);
+        $this->stub = str_replace('{{columns_inputs}}', $inputFields, $this->stub);
 
-		return $this;
-	}
+        return $this;
+    }
 
-	/**
-	 * get search conditions
-	 *
-	 * @return $this
-	 */
-	public function getInputFields(){
+    /**
+     * get search conditions
+     *
+     * @return $this
+     */
+    public function getInputFields(){
 
-		$inputFields = $eagerFields = '';
+        $inputFields = $eagerFields = '';
 
-		foreach ($this->modelData->fields as $field)
-		{
-			$fieldStub = $this->getInputStubByField($field);
+        foreach ($this->modelData->fields as $field)
+        {
+            $fieldStub = $this->getInputStubByField($field);
 
-			if($field->foreignKey){
-				$fieldStub 	= $this->replaceForeingStrings($field, $fieldStub) ;
-				$fieldStub = str_replace('{{foreign_model_name}}', strtolower(CamelCase::convertToCamelCase($field->foreignKey->table)), $fieldStub);
-			}
+            if($field->foreignKey){
+                $fieldStub 	= $this->replaceForeingStrings($field, $fieldStub) ;
+                $fieldStub = str_replace('{{foreign_model_name}}', strtolower(CamelCase::convertToCamelCase($field->foreignKey->table)), $fieldStub);
+            }
 
-			$inputFields .= $this->replaceFieldInput($field, $fieldStub) ;
+            $inputFields .= $this->replaceFieldInput($field, $fieldStub) ;
 
-			// Check foreign key
-			if ($field->foreignKey && isset($field->foreignKey->eager) && $field->foreignKey->eager)
-			{
-				// search eager fields
-				$foreignModelData = $this->getModelData($field->foreignKey->table);
-				$foreignControllerCompiler = new ListTemplateCompiler($this->scaffolderConfig, $foreignModelData);
-				$foreignControllerCompiler->setEagerTable($this->modelData->tableName);
-				$eagerFields 	.= $foreignControllerCompiler->getInputFields();
-			}
+            // Check foreign key
+            if ($field->foreignKey && isset($field->foreignKey->eager) && $field->foreignKey->eager)
+            {
+                // search eager fields
+                $foreignModelData = $this->getModelData($field->foreignKey->table);
+                $foreignControllerCompiler = new ListTemplateCompiler($this->scaffolderConfig, $foreignModelData);
+                $foreignControllerCompiler->setEagerTable($this->modelData->tableName);
+                $eagerFields 	.= $foreignControllerCompiler->getInputFields();
+            }
 
-		}
+        }
 
-		// replace table name
-		$inputFields = str_replace('{{table_name}}', $this->modelData->tableName, $inputFields);
+        // replace table name
+        $inputFields = str_replace('{{table_name}}', $this->modelData->tableName, $inputFields);
 		
-		$this->stub = str_replace('{{eager_objects_inputs}}', $eagerFields, $this->stub); 
-
-		return $inputFields ;
-
-	}
-
-	/**
-	 * replace field stub with fields and validations
-	 *
-	 * @param string $field
-	 * @param string $fieldStub
-	 *
-	 * @return $this
-	 */
-	protected function replaceFieldInput($field, $fieldStub){
-		$fieldStub = $this->replaceFieldStrings($field, $fieldStub) ;
-		$fieldStub = $this->replaceFieldValidations($field, $fieldStub) ;
-
-		return $fieldStub ;
-	}
-
-	/**
-	 * replace field stub with fields and validations
-	 *
-	 * @param string $field
-	 * @param string $fieldStub
-	 *
-	 * @return $this
-	 */
-	protected function replaceFieldValidations($field, $fieldStub){
-		$fieldStub = $this->replaceFieldStrings($field, $fieldStub) ;
+        $this->stub = str_replace('{{eager_objects_inputs}}', $eagerFields, $this->stub); 
+
+        return $inputFields ;
+
+    }
+
+    /**
+     * replace field stub with fields and validations
+     *
+     * @param string $field
+     * @param string $fieldStub
+     *
+     * @return $this
+     */
+    protected function replaceFieldInput($field, $fieldStub){
+        $fieldStub = $this->replaceFieldStrings($field, $fieldStub) ;
+        $fieldStub = $this->replaceFieldValidations($field, $fieldStub) ;
+
+        return $fieldStub ;
+    }
+
+    /**
+     * replace field stub with fields and validations
+     *
+     * @param string $field
+     * @param string $fieldStub
+     *
+     * @return $this
+     */
+    protected function replaceFieldValidations($field, $fieldStub){
+        $fieldStub = $this->replaceFieldStrings($field, $fieldStub) ;
 		
-		$validationsConverted = Validator::convertValidations($field->validations, true);
+        $validationsConverted = Validator::convertValidations($field->validations, true);
 
-		$inputValidations = '' ; 
+        $inputValidations = '' ; 
 
-		foreach ($validationsConverted as $attribute => $value) {
-			if($value)
-				$inputValidations .=  ' '.$attribute.'="'. $value.'"' ;
-			else
-				$inputValidations .=  ' '.$attribute  ; 
-		}
+        foreach ($validationsConverted as $attribute => $value) {
+            if($value)
+                $inputValidations .=  ' '.$attribute.'="'. $value.'"' ;
+            else
+                $inputValidations .=  ' '.$attribute  ; 
+        }
 
-		$fieldStub = str_replace('{{field_validation}}', $inputValidations, $fieldStub);
+        $fieldStub = str_replace('{{field_validation}}', $inputValidations, $fieldStub);
 
-		return $fieldStub ;
-	}
+        return $fieldStub ;
+    }
 
-	/**
-	 * Replace belongs to many fields
-	 *
-	 * @return $this
-	 */
-	protected function replaceBelongsToManyFields() {
+    /**
+     * Replace belongs to many fields
+     *
+     * @return $this
+     */
+    protected function replaceBelongsToManyFields() {
 		
-		$belongToManyFields = '';
+        $belongToManyFields = '';
 		
-		foreach ($this->modelData->reverseRelationships as $relationship)
-		{
-			if ($relationship->type == "belongsToMany") {
-				$fieldStub = File::get($this->stubsDirectory . 'List/'. CamelCase::convertToCamelCase($relationship->ui). '.html');
-
-				$fieldStub = str_replace('{{related_table}}',CamelCase::convertToCamelCase($relationship->relatedTable), $fieldStub);
-				$fieldStub = str_replace('{{related_table_lw}}', strtolower(CamelCase::convertToCamelCase($relationship->relatedTable)), $fieldStub);
-				$fieldStub = str_replace('{{table_name}}', $this->modelData->tableName, $fieldStub);
-				$fieldStub = str_replace('{{related_table_lw_pl}}', CamelCase::pluralize(strtolower($relationship->relatedTable)), $fieldStub);
+        foreach ($this->modelData->reverseRelationships as $relationship)
+        {
+            if ($relationship->type == "belongsToMany") {
+                $fieldStub = File::get($this->stubsDirectory . 'List/'. CamelCase::convertToCamelCase($relationship->ui). '.html');
+
+                $fieldStub = str_replace('{{related_table}}',CamelCase::convertToCamelCase($relationship->relatedTable), $fieldStub);
+                $fieldStub = str_replace('{{related_table_lw}}', strtolower(CamelCase::convertToCamelCase($relationship->relatedTable)), $fieldStub);
+                $fieldStub = str_replace('{{table_name}}', $this->modelData->tableName, $fieldStub);
+                $fieldStub = str_replace('{{related_table_lw_pl}}', CamelCase::pluralize(strtolower($relationship->relatedTable)), $fieldStub);
 				
-				$belongToManyFields .= $fieldStub;	
-			}
-		}
+                $belongToManyFields .= $fieldStub;	
+            }
+        }
 
-		$this->stub = str_replace('{{belongs_to_many_inputs}}', $belongToManyFields, $this->stub); 
+        $this->stub = str_replace('{{belongs_to_many_inputs}}', $belongToManyFields, $this->stub); 
 
-		return $this;
-	}
+        return $this;
+    }
 
 	
-	/**
-	 * get input field stub by ui type
-	 *
-	 * @param string $field
-	 *
-	 * @return $this
-	 */
-	private $inputStub = [];
-	private function getInputStubByField($field){
+    /**
+     * get input field stub by ui type
+     *
+     * @param string $field
+     *
+     * @return $this
+     */
+    private $inputStub = [];
+    private function getInputStubByField($field){
 		
-		if($field->index == 'primary'){
-			$uiType = 'primary' ;
-		}
-		elseif(isset($field->foreignKey) && $field->foreignKey){
-			if(isset($field->foreignKey->eager) && $field->foreignKey->eager)
-				$uiType = 'foreign_eager' ;
-			else 
-				$uiType = $field->type->ui ;
-		}
-		else {
-			$uiType = $field->type->ui ;
-		}
-
-		if(array_key_exists($uiType, $this->inputStub)){
-			return $this->inputStub[$uiType];
-		}
-		else {
-			$this->inputStub[$uiType] = File::get($this->stubsDirectory . 'List/'. CamelCase::convertToCamelCase($uiType). '.html');
-
-			return $this->inputStub[$uiType];
-		}
-	}
+        if($field->index == 'primary'){
+            $uiType = 'primary' ;
+        }
+        elseif(isset($field->foreignKey) && $field->foreignKey){
+            if(isset($field->foreignKey->eager) && $field->foreignKey->eager)
+                $uiType = 'foreign_eager' ;
+            else 
+                $uiType = $field->type->ui ;
+        }
+        else {
+            $uiType = $field->type->ui ;
+        }
+
+        if(array_key_exists($uiType, $this->inputStub)){
+            return $this->inputStub[$uiType];
+        }
+        else {
+            $this->inputStub[$uiType] = File::get($this->stubsDirectory . 'List/'. CamelCase::convertToCamelCase($uiType). '.html');
+
+            return $this->inputStub[$uiType];
+        }
+    }
 	
-	/**
-	 * Get output filename
-	 *
-	 *
-	 * @return $this
-	 */
-	protected function getOutputFilename()
-	{
-		$folder = PathParser::parse($this->scaffolderConfig->generator->paths->pages).$this->modelData->tableName.'/list/' ;
-
-		Directory::createIfNotExists($folder, 0755, true);
-
-		return $folder .$this->modelData->tableName . '_list.html';
-	}
+    /**
+     * Get output filename
+     *
+     *
+     * @return $this
+     */
+    protected function getOutputFilename()
+    {
+        $folder = PathParser::parse($this->scaffolderConfig->generator->paths->pages).$this->modelData->tableName.'/list/' ;
+
+        Directory::createIfNotExists($folder, 0755, true);
+
+        return $folder .$this->modelData->tableName . '_list.html';
+    }
 
 }
\ No newline at end of file