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/GeneratorCommand.php

Unused Use Statements +1 added lines, -4 removed lines

@@ -39,11 +39,8 @@
 use Scaffolder\Support\Json;
 use Scaffolder\Support\Arrays;
 use Scaffolder\Support\CamelCase;
-use Scaffolder\Themes\IScaffolderThemeLayouts;
-use Scaffolder\Themes\IScaffolderThemeViews;
 use Scaffolder\Compilers\Support\PathParser;
-
-use stdClass ;
+use stdClass;
 
 class GeneratorCommand extends Command
 {

Indentation +564 added lines, -564 removed lines

@@ -47,334 +47,334 @@ 
 
 class GeneratorCommand extends Command
 {
-	protected $signature = 'scaffolder:generate {app=laravel} {--c|clear-all : Clears cache and drafts before generate}';
+    protected $signature = 'scaffolder:generate {app=laravel} {--c|clear-all : Clears cache and drafts before generate}';
 
-	protected $description = 'Scaffold an application';
+    protected $description = 'Scaffold an application';
 
-	protected $stubsDirectory;
+    protected $stubsDirectory;
 
-	public function __construct()
-	{
-		parent::__construct();
+    public function __construct()
+    {
+        parent::__construct();
 
-		$this->stubsDirectory = __DIR__ . '/../../../stubs/';
-	}
+        $this->stubsDirectory = __DIR__ . '/../../../stubs/';
+    }
 
-	/**
-	 * Execute the Command.
-	 * @return void
-	 */
-	public function handle()
-	{
-		// check if is to clear cache
-		if($this->option('clear-all')){
-			$this->call('scaffolder:clear');
-		}
+    /**
+     * Execute the Command.
+     * @return void
+     */
+    public function handle()
+    {
+        // check if is to clear cache
+        if($this->option('clear-all')){
+            $this->call('scaffolder:clear');
+        }
 
-		// Create drafs directory
-		Directory::createIfNotExists(base_path('drafts'));
+        // Create drafs directory
+        Directory::createIfNotExists(base_path('drafts'));
 
-		switch ($this->argument('app')) {
-			case 'api':
-				$this->handleApi();
-				break;
+        switch ($this->argument('app')) {
+            case 'api':
+                $this->handleApi();
+                break;
 
-			case 'angularjs':
-				$this->handleAngularJs();
-				break;
+            case 'angularjs':
+                $this->handleAngularJs();
+                break;
 
-			case 'ionic':
-				# code...
-				break;
+            case 'ionic':
+                # code...
+                break;
 
-			case 'android':
-				#TODO implement code...
-				break;
+            case 'android':
+                #TODO implement code...
+                break;
 
-			case 'ios':
-				#TODO implement code...
-				break;
+            case 'ios':
+                #TODO implement code...
+                break;
 			
-			case 'blade':
-				$this->handleBlade();
-				break;
+            case 'blade':
+                $this->handleBlade();
+                break;
 				
-			default:
-				$this->handleLaravel();
-				break;
-		}
+            default:
+                $this->handleLaravel();
+                break;
+        }
 
 		
-	}
-
-	/**
-	 * API Generation command for API files.  
-	 * @return void
-	 */
-	private function handleApi(){
-		// Get all the models
-		$modelsData = $this->getAllModelsData();
-
-		// Start progress bar
-		$this->output->progressStart(count($modelsData));
-
-		// Get app config
-		$scaffolderConfig = $this->getScaffolderConfig();
-
-		// Compiler output
-		$modelCompilerOutput = [];
-		$controllerCompilerOutput = [];
-		$migrationCompilerOutput = [];
-
-		// Sidenav links
-		$sidenavLinks = [];
-
-		// Compiled routes
-		$compiledRoutes = '';
-
-		// Create route compiler
-		$routeCompiler = new RouteCompiler($scaffolderConfig);
-
-		// Create models directory
-		Directory::createIfNotExists(app_path('Models'));
-
-		// Create drafts directory
-		// migrations
-		Directory::createIfNotExists(PathParser::parse($scaffolderConfig->generator->paths->migrations), 0755, true);
-		// models
-		Directory::createIfNotExists(PathParser::parse($scaffolderConfig->generator->paths->models), 0755, true);
-		// repositories
-		Directory::createIfNotExists(PathParser::parse($scaffolderConfig->generator->paths->repositories), 0755, true);
-		// controllers
-		Directory::createIfNotExists(PathParser::parse($scaffolderConfig->generator->paths->controllers), 0755, true);
-		// routes
-		Directory::createIfNotExists(PathParser::parse($scaffolderConfig->generator->paths->routes), 0755, true);
+    }
+
+    /**
+     * API Generation command for API files.  
+     * @return void
+     */
+    private function handleApi(){
+        // Get all the models
+        $modelsData = $this->getAllModelsData();
+
+        // Start progress bar
+        $this->output->progressStart(count($modelsData));
+
+        // Get app config
+        $scaffolderConfig = $this->getScaffolderConfig();
+
+        // Compiler output
+        $modelCompilerOutput = [];
+        $controllerCompilerOutput = [];
+        $migrationCompilerOutput = [];
+
+        // Sidenav links
+        $sidenavLinks = [];
+
+        // Compiled routes
+        $compiledRoutes = '';
+
+        // Create route compiler
+        $routeCompiler = new RouteCompiler($scaffolderConfig);
+
+        // Create models directory
+        Directory::createIfNotExists(app_path('Models'));
+
+        // Create drafts directory
+        // migrations
+        Directory::createIfNotExists(PathParser::parse($scaffolderConfig->generator->paths->migrations), 0755, true);
+        // models
+        Directory::createIfNotExists(PathParser::parse($scaffolderConfig->generator->paths->models), 0755, true);
+        // repositories
+        Directory::createIfNotExists(PathParser::parse($scaffolderConfig->generator->paths->repositories), 0755, true);
+        // controllers
+        Directory::createIfNotExists(PathParser::parse($scaffolderConfig->generator->paths->controllers), 0755, true);
+        // routes
+        Directory::createIfNotExists(PathParser::parse($scaffolderConfig->generator->paths->routes), 0755, true);
 		
-		// Iterate over models data
-		foreach ($modelsData as $modelData)
-		{
+        // Iterate over models data
+        foreach ($modelsData as $modelData)
+        {
 			
-			// Create Compilers
-			$stubModel = null;
-			$stubController = null;
+            // Create Compilers
+            $stubModel = null;
+            $stubController = null;
 			
-			if ($modelData->tableName == "file") {
-				$stubModel = 'Model/FileModel.php';
-				$stubController = 'Controller/FileController.php';
-			}
-
-			$modelCompiler = new ModelCompiler($scaffolderConfig, $modelData, $stubModel);
-			$migrationCompiler = new MigrationCompiler($scaffolderConfig, $modelData);
-			$controllerCompiler = new ControllerCompiler($scaffolderConfig, $modelData, $stubController);
-
-			// Compile stubs
-			array_push($modelCompilerOutput, $modelCompiler->compile());
-			array_push($controllerCompilerOutput, $controllerCompiler->compile());
-			array_push($migrationCompilerOutput, $migrationCompiler->compile());
+            if ($modelData->tableName == "file") {
+                $stubModel = 'Model/FileModel.php';
+                $stubController = 'Controller/FileController.php';
+            }
+
+            $modelCompiler = new ModelCompiler($scaffolderConfig, $modelData, $stubModel);
+            $migrationCompiler = new MigrationCompiler($scaffolderConfig, $modelData);
+            $controllerCompiler = new ControllerCompiler($scaffolderConfig, $modelData, $stubController);
+
+            // Compile stubs
+            array_push($modelCompilerOutput, $modelCompiler->compile());
+            array_push($controllerCompilerOutput, $controllerCompiler->compile());
+            array_push($migrationCompilerOutput, $migrationCompiler->compile());
 			
-			$compiledRoutes .= $routeCompiler->replaceResource($modelData);
-			//
-
-			// Add entity link
-			array_push($sidenavLinks, $modelData->modelName);
-
-			// Advance progress
-			$this->output->progressAdvance();
-		}
-
-		// Store compiled routes
-		$routeCompiler->compileGroup($compiledRoutes);
-
-		// Finish progress
-		$this->output->progressFinish();
-
-		// Summary
-		$this->comment('- Files created');
-
-		$this->comment('- - Controllers');
-		foreach ($controllerCompilerOutput as $controllerFile)
-		{
-			$this->info('- - - ' . $controllerFile);
-		}
-
-		$this->comment('- - Migrations');
-		foreach ($migrationCompilerOutput as $migrationFile)
-		{
-			$this->info('- - - ' . $migrationFile);
-		}
-
-		$this->comment('- - Models');
-		foreach ($modelCompilerOutput as $modelFile)
-		{
-			$this->info('- - - ' . $modelFile);
-		}
-	}
-
-	/**
-	 * Code Generation command for AngularJs Material design files.  
-	 * @return void
-	 */
-	private function handleAngularJs(){
-		// Get all the models
-		$modelsData = $this->getAllModelsData();
-
-		// Start progress bar
-		$this->output->progressStart((count($modelsData) * 2) + (count($modelsData) * 2 * 4) + 1);
-
-		// Get app config
-		$scaffolderConfig = $this->getScaffolderConfig();
-
-		// Compiler output
-		$resourceCompilerOutput = [];
-		$moduleCompilerOutput = [];
-		$translateCompilerOutput = [];
-		// register
-		$registerModuleCompilerOutput = [];
-		$registerControllerCompilerOutput = [];
-		$registerTemplateCompilerOutput = [];
+            $compiledRoutes .= $routeCompiler->replaceResource($modelData);
+            //
+
+            // Add entity link
+            array_push($sidenavLinks, $modelData->modelName);
+
+            // Advance progress
+            $this->output->progressAdvance();
+        }
+
+        // Store compiled routes
+        $routeCompiler->compileGroup($compiledRoutes);
+
+        // Finish progress
+        $this->output->progressFinish();
+
+        // Summary
+        $this->comment('- Files created');
+
+        $this->comment('- - Controllers');
+        foreach ($controllerCompilerOutput as $controllerFile)
+        {
+            $this->info('- - - ' . $controllerFile);
+        }
+
+        $this->comment('- - Migrations');
+        foreach ($migrationCompilerOutput as $migrationFile)
+        {
+            $this->info('- - - ' . $migrationFile);
+        }
+
+        $this->comment('- - Models');
+        foreach ($modelCompilerOutput as $modelFile)
+        {
+            $this->info('- - - ' . $modelFile);
+        }
+    }
+
+    /**
+     * Code Generation command for AngularJs Material design files.  
+     * @return void
+     */
+    private function handleAngularJs(){
+        // Get all the models
+        $modelsData = $this->getAllModelsData();
+
+        // Start progress bar
+        $this->output->progressStart((count($modelsData) * 2) + (count($modelsData) * 2 * 4) + 1);
+
+        // Get app config
+        $scaffolderConfig = $this->getScaffolderConfig();
+
+        // Compiler output
+        $resourceCompilerOutput = [];
+        $moduleCompilerOutput = [];
+        $translateCompilerOutput = [];
+        // register
+        $registerModuleCompilerOutput = [];
+        $registerControllerCompilerOutput = [];
+        $registerTemplateCompilerOutput = [];
 		
-		// list
-		$listModuleCompilerOutput = [];
-		$listControllerCompilerOutput = [];
-		$listTemplateCompilerOutput = [];
-		//$listDetailCompilerOutput = [];
-		//$listChooseColumnsCompilerOutput = [];
-
-		// Compiled indexes
-		$compiledIndexes = '';
+        // list
+        $listModuleCompilerOutput = [];
+        $listControllerCompilerOutput = [];
+        $listTemplateCompilerOutput = [];
+        //$listDetailCompilerOutput = [];
+        //$listChooseColumnsCompilerOutput = [];
+
+        // Compiled indexes
+        $compiledIndexes = '';
 	
-		// Create index compiler
-		$indexModuleCompiler = new IndexModuleCompiler($scaffolderConfig);
+        // Create index compiler
+        $indexModuleCompiler = new IndexModuleCompiler($scaffolderConfig);
 
-		$indexApiCompiler = new IndexApiCompiler($scaffolderConfig);
+        $indexApiCompiler = new IndexApiCompiler($scaffolderConfig);
 
-		// Create drafts directory
-		// pages
-		Directory::createIfNotExists(PathParser::parse($scaffolderConfig->generator->paths->pages), 0755, true);
+        // Create drafts directory
+        // pages
+        Directory::createIfNotExists(PathParser::parse($scaffolderConfig->generator->paths->pages), 0755, true);
 		
-		$intKey = 1;
-		// Iterate over models data
-		foreach ($modelsData as $modelData)
-		{
+        $intKey = 1;
+        // Iterate over models data
+        foreach ($modelsData as $modelData)
+        {
 			
-			// Create Compilers
-			$resourceCompiler = new ResourceCompiler($scaffolderConfig, $modelData);
-			$moduleCompiler = new ModuleCompiler($scaffolderConfig, $modelData);
-			// register
-			$registerModuleCompiler = new RegisterModuleCompiler($scaffolderConfig, $modelData);
-			$registerControllerCompiler = new RegisterControllerCompiler($scaffolderConfig, $modelData);
-			$registerTemplateCompiler = new RegisterTemplateCompiler($scaffolderConfig, $modelData);
-			// translate
-			$translateCompiler = new TranslateCompiler($scaffolderConfig, $modelData);
-			// list
-			$listModuleCompiler = new ListModuleCompiler($scaffolderConfig, $modelData);
-			$listControllerCompiler = new ListControllerCompiler($scaffolderConfig, $modelData);
-			$listTemplateCompiler = new ListTemplateCompiler($scaffolderConfig, $modelData);
-			//$listDetailCompiler = new ListDetailCompiler($scaffolderConfig, $modelData);
-			//$listChooseColumnsCompiler = new ListChooseColumnsCompiler($scaffolderConfig, $modelData);
+            // Create Compilers
+            $resourceCompiler = new ResourceCompiler($scaffolderConfig, $modelData);
+            $moduleCompiler = new ModuleCompiler($scaffolderConfig, $modelData);
+            // register
+            $registerModuleCompiler = new RegisterModuleCompiler($scaffolderConfig, $modelData);
+            $registerControllerCompiler = new RegisterControllerCompiler($scaffolderConfig, $modelData);
+            $registerTemplateCompiler = new RegisterTemplateCompiler($scaffolderConfig, $modelData);
+            // translate
+            $translateCompiler = new TranslateCompiler($scaffolderConfig, $modelData);
+            // list
+            $listModuleCompiler = new ListModuleCompiler($scaffolderConfig, $modelData);
+            $listControllerCompiler = new ListControllerCompiler($scaffolderConfig, $modelData);
+            $listTemplateCompiler = new ListTemplateCompiler($scaffolderConfig, $modelData);
+            //$listDetailCompiler = new ListDetailCompiler($scaffolderConfig, $modelData);
+            //$listChooseColumnsCompiler = new ListChooseColumnsCompiler($scaffolderConfig, $modelData);
 			
-			// Compile stubs
-			array_push($resourceCompilerOutput, $resourceCompiler->compile());
-			array_push($moduleCompilerOutput, $moduleCompiler->compile());
-			array_push($translateCompilerOutput, $translateCompiler->compile());
-			// register
-			array_push($registerModuleCompilerOutput, $registerModuleCompiler->compile());
-			array_push($registerControllerCompilerOutput, $registerControllerCompiler->compile());
-			array_push($registerTemplateCompilerOutput, $registerTemplateCompiler->compile());
-			// list
-			array_push($listModuleCompilerOutput, $listModuleCompiler->compile());
-			array_push($listControllerCompilerOutput, $listControllerCompiler->compile());
-			array_push($listTemplateCompilerOutput, $listTemplateCompiler->compile());
-			//array_push($listDetailCompilerOutput, $listDetailCompiler->compile());
-			//array_push($listChooseColumnsCompilerOutput, $listChooseColumnsCompiler->compile());
-
-			$compiledIndexes .= $indexModuleCompiler->replaceResource($modelData);
-			if ($intKey < count($modelsData))
-				$compiledIndexes .= ",";
-
-			$intKey++;
-			// Advance progress
-			$this->output->progressAdvance();
-		}
-
-		// Store compiled indexes
-		$indexModuleCompiler->compileGroup($compiledIndexes);
+            // Compile stubs
+            array_push($resourceCompilerOutput, $resourceCompiler->compile());
+            array_push($moduleCompilerOutput, $moduleCompiler->compile());
+            array_push($translateCompilerOutput, $translateCompiler->compile());
+            // register
+            array_push($registerModuleCompilerOutput, $registerModuleCompiler->compile());
+            array_push($registerControllerCompilerOutput, $registerControllerCompiler->compile());
+            array_push($registerTemplateCompilerOutput, $registerTemplateCompiler->compile());
+            // list
+            array_push($listModuleCompilerOutput, $listModuleCompiler->compile());
+            array_push($listControllerCompilerOutput, $listControllerCompiler->compile());
+            array_push($listTemplateCompilerOutput, $listTemplateCompiler->compile());
+            //array_push($listDetailCompilerOutput, $listDetailCompiler->compile());
+            //array_push($listChooseColumnsCompilerOutput, $listChooseColumnsCompiler->compile());
+
+            $compiledIndexes .= $indexModuleCompiler->replaceResource($modelData);
+            if ($intKey < count($modelsData))
+                $compiledIndexes .= ",";
+
+            $intKey++;
+            // Advance progress
+            $this->output->progressAdvance();
+        }
+
+        // Store compiled indexes
+        $indexModuleCompiler->compileGroup($compiledIndexes);
 		
-		// store compiled api
-		$fileApi = $indexApiCompiler->compile();
+        // store compiled api
+        $fileApi = $indexApiCompiler->compile();
 
-		// Advance progress
-		$this->output->progressAdvance();
+        // Advance progress
+        $this->output->progressAdvance();
 	
-		// Finish progress
-		$this->output->progressFinish();
-
-		// Summary
-		$this->comment('- Files created');
-
-		$this->comment('- - Index Api');
-
-		$this->info('- - - ' . $fileApi);
-
-		$this->comment('- - Resources');
-		foreach ($resourceCompilerOutput as $file)
-		{
-			$this->info('- - - ' . $file);
-		}
-
-		$this->comment('- - Modules');
-		foreach ($moduleCompilerOutput as $file)
-		{
-			$this->info('- - - ' . $file);
-		}
-
-		$this->comment('- - Translate');
-		foreach ($translateCompilerOutput as $file)
-		{
-			$this->info('- - - ' . $file);
-		}
-
-		$this->comment('- - Register');
-
-		$this->comment('- - - Modules');
-		foreach ($registerModuleCompilerOutput as $file)
-		{
-			$this->info('- - - - ' . $file);
-		}
-
-		$this->comment('- - - Controllers');
-		foreach ($registerControllerCompilerOutput as $file)
-		{
-			$this->info('- - - - ' . $file);
-		}
-
-		$this->comment('- - - Templates');
-		foreach ($registerTemplateCompilerOutput as $file)
-		{
-			$this->info('- - - - ' . $file);
-		}
-
-		$this->comment('- - List');
-
-		$this->comment('- - - Modules');
-		foreach ($listModuleCompilerOutput as $file)
-		{
-			$this->info('- - - - ' . $file);
-		}
-
-
-		$this->comment('- - - Controllers');
-		foreach ($listControllerCompilerOutput as $file)
-		{
-			$this->info('- - - - ' . $file);
-		}
-
-		$this->comment('- - - Templates');
-		foreach ($listTemplateCompilerOutput as $file)
-		{
-			$this->info('- - - - ' . $file);
-		}
-		/*
+        // Finish progress
+        $this->output->progressFinish();
+
+        // Summary
+        $this->comment('- Files created');
+
+        $this->comment('- - Index Api');
+
+        $this->info('- - - ' . $fileApi);
+
+        $this->comment('- - Resources');
+        foreach ($resourceCompilerOutput as $file)
+        {
+            $this->info('- - - ' . $file);
+        }
+
+        $this->comment('- - Modules');
+        foreach ($moduleCompilerOutput as $file)
+        {
+            $this->info('- - - ' . $file);
+        }
+
+        $this->comment('- - Translate');
+        foreach ($translateCompilerOutput as $file)
+        {
+            $this->info('- - - ' . $file);
+        }
+
+        $this->comment('- - Register');
+
+        $this->comment('- - - Modules');
+        foreach ($registerModuleCompilerOutput as $file)
+        {
+            $this->info('- - - - ' . $file);
+        }
+
+        $this->comment('- - - Controllers');
+        foreach ($registerControllerCompilerOutput as $file)
+        {
+            $this->info('- - - - ' . $file);
+        }
+
+        $this->comment('- - - Templates');
+        foreach ($registerTemplateCompilerOutput as $file)
+        {
+            $this->info('- - - - ' . $file);
+        }
+
+        $this->comment('- - List');
+
+        $this->comment('- - - Modules');
+        foreach ($listModuleCompilerOutput as $file)
+        {
+            $this->info('- - - - ' . $file);
+        }
+
+
+        $this->comment('- - - Controllers');
+        foreach ($listControllerCompilerOutput as $file)
+        {
+            $this->info('- - - - ' . $file);
+        }
+
+        $this->comment('- - - Templates');
+        foreach ($listTemplateCompilerOutput as $file)
+        {
+            $this->info('- - - - ' . $file);
+        }
+        /*
 		$this->comment('- - - Detail Dialog');
 		foreach ($listDetailCompilerOutput as $file)
 		{
@@ -388,296 +388,296 @@ 
 		}
 		*/
 		
-	}
-
-	/**
-	 * Generation command for Blade. 
-	 * Generates Blade templates
-	 * @return void
-	 */
-	private function handleBlade(){
-		// Get all the models
-		$modelsData = $this->getAllModelsData();
-
-		// Start progress bar
-		$this->output->progressStart(count($modelsData));
-
-		// Get app config
-		$scaffolderConfig = $this->getScaffolderConfig();
-
-		// Compilers
-		$indexViewCompiler = new IndexViewCompiler();
-		$createViewCompiler = new CreateViewCompiler();
-		$editViewCompiler = new EditViewCompiler();
-		$pageLayoutViewCompiler = new PageLayoutCompiler();
-
-		// Compiler output
-		$viewCompilerOutput = [];
+    }
+
+    /**
+     * Generation command for Blade. 
+     * Generates Blade templates
+     * @return void
+     */
+    private function handleBlade(){
+        // Get all the models
+        $modelsData = $this->getAllModelsData();
+
+        // Start progress bar
+        $this->output->progressStart(count($modelsData));
+
+        // Get app config
+        $scaffolderConfig = $this->getScaffolderConfig();
+
+        // Compilers
+        $indexViewCompiler = new IndexViewCompiler();
+        $createViewCompiler = new CreateViewCompiler();
+        $editViewCompiler = new EditViewCompiler();
+        $pageLayoutViewCompiler = new PageLayoutCompiler();
+
+        // Compiler output
+        $viewCompilerOutput = [];
 		
-		// Sidenav links
-		$sidenavLinks = [];
+        // Sidenav links
+        $sidenavLinks = [];
 
-		// Compiled routes
-		$compiledRoutes = '';
+        // Compiled routes
+        $compiledRoutes = '';
 
-		// Get stubs
-		$indexViewStub = File::get($this->themeViews->getIndexPath());
-		$createViewStub = File::get($this->themeViews->getCreatePath());
-		$editViewStub = File::get($this->themeViews->getEditPath());
+        // Get stubs
+        $indexViewStub = File::get($this->themeViews->getIndexPath());
+        $createViewStub = File::get($this->themeViews->getCreatePath());
+        $editViewStub = File::get($this->themeViews->getEditPath());
 	
-		// views
-		Directory::createIfNotExists(PathParser::parse($scaffolderConfig->generator->paths->views), 0755, true);
-		// layouts
-		Directory::createIfNotExists(PathParser::parse($scaffolderConfig->generator->paths->layouts), 0755, true);
-		// assets
-		Directory::createIfNotExists(PathParser::parse($scaffolderConfig->generator->paths->assets), 0755, true);
+        // views
+        Directory::createIfNotExists(PathParser::parse($scaffolderConfig->generator->paths->views), 0755, true);
+        // layouts
+        Directory::createIfNotExists(PathParser::parse($scaffolderConfig->generator->paths->layouts), 0755, true);
+        // assets
+        Directory::createIfNotExists(PathParser::parse($scaffolderConfig->generator->paths->assets), 0755, true);
 	
 		
-		// Iterate over model files
-		foreach ($modelsData as $modelData)
-		{
-			// Get model name
-			$modelName = $modelData->modelName;
-
-			// Create views directory
-			Directory::createIfNotExists(base_path('resources/views/' . strtolower($modelName)));
-
-			//set hash
-			$modelHash = $modelData->modelHash;
-
-
-			// Compile stubs
-			array_push($viewCompilerOutput, $indexViewCompiler->compile($indexViewStub, $modelName, $modelData, $scaffolderConfig, $modelHash));
-			array_push($viewCompilerOutput, $createViewCompiler->compile($createViewStub, $modelName, $modelData, $scaffolderConfig, $modelHash));
-			array_push($viewCompilerOutput, $editViewCompiler->compile($editViewStub, $modelName, $modelData, $scaffolderConfig, $modelHash));
-			// Add entity link
-			array_push($sidenavLinks, $modelName);
-
-			// Advance progress
-			$this->output->progressAdvance();
-		}
-
-		// Create layouts directory
-		Directory::createIfNotExists(base_path('resources/views/layouts'), 0755, true);
-
-		// Store compiled page layout
-		array_push($viewCompilerOutput, $pageLayoutViewCompiler->compile(File::get($this->themeLayouts->getPagePath()), null, null, $scaffolderConfig, null, ['links' => $sidenavLinks]));
-
-		// Store create layout
-		$createLayout = PathParser::parse($scaffolderConfig->generator->paths->views). 'layouts/create.blade.php' ;
-		File::copy($this->themeLayouts->getCreatePath(), $createLayout);
-		array_push($viewCompilerOutput, $createLayout);
-
-		// Store edit layout
-		$editLayout = PathParser::parse($scaffolderConfig->generator->paths->views). 'layouts/edit.blade.php' ;
-		File::copy($this->themeLayouts->getCreatePath(), $editLayout);
-		array_push($viewCompilerOutput, $editLayout);
-
-		// Store dashboard
-		$dashboardLayout = PathParser::parse($scaffolderConfig->generator->paths->views). 'layouts/dashboard.blade.php' ;
-		File::copy($this->themeLayouts->getCreatePath(), $dashboardLayout);
-		array_push($viewCompilerOutput, $dashboardLayout);
-
-		// Finish progress
-		$this->output->progressFinish();
-
-		// Summary
-		$this->comment('- Files created');
-
-		$this->comment('- - Views');
-		foreach ($viewCompilerOutput as $viewFile)
-		{
-			$this->info('- - - ' . $viewFile);
-		}
-
-	}
-
-	/**
-	 * Generation command for laravel. 
-	 * Generates API Code 
-	 * Generates Blade templates
-	 * @return void
-	 */
-	private function handleLaravel(){
-		// generate API
-		$this->handleApi();
-
-		// generate BLADE
-		$this->handleApi();
-
-	}
-
-	/**
-	 * Get the app.json configuration and parse to an object
-	 *
-	 * @return void
-	 */
-	private function getScaffolderConfig(){
-		// Get app config
-		$scaffolderConfig = Json::decodeFile(base_path('scaffolder-config/app.json'));
-
-		$scaffolderConfig->generator = $scaffolderConfig->generators->{$this->argument('app')};
-
-		return $scaffolderConfig ;
-	}
-
-	/**
-	 * Get all model files and ordenates by
-	 *
-	 * @return object
-	 */
-	private function getAllModelsData(){
-
-		$modelFiles = File::allFiles(base_path('scaffolder-config/models/'));
-
-		$modelsData = [];
-		$orderedModelsData = [];
-
-		// set indexes
-		//$firstKey = 
-		foreach ($modelFiles as $modelFile)
-		{
+        // Iterate over model files
+        foreach ($modelsData as $modelData)
+        {
+            // Get model name
+            $modelName = $modelData->modelName;
+
+            // Create views directory
+            Directory::createIfNotExists(base_path('resources/views/' . strtolower($modelName)));
 
-			// Get model data
-			$modelData = Json::decodeFile($modelFile->getRealPath());
+            //set hash
+            $modelHash = $modelData->modelHash;
 
 
-			// Get model name
-			$modelName = CamelCase::convertToCamelCase(($modelFile->getBasename('.' . $modelFile->getExtension())));
+            // Compile stubs
+            array_push($viewCompilerOutput, $indexViewCompiler->compile($indexViewStub, $modelName, $modelData, $scaffolderConfig, $modelHash));
+            array_push($viewCompilerOutput, $createViewCompiler->compile($createViewStub, $modelName, $modelData, $scaffolderConfig, $modelHash));
+            array_push($viewCompilerOutput, $editViewCompiler->compile($editViewStub, $modelName, $modelData, $scaffolderConfig, $modelHash));
+            // Add entity link
+            array_push($sidenavLinks, $modelName);
 
-			// Get model hash
-			$modelHash = md5_file($modelFile->getRealPath());
+            // Advance progress
+            $this->output->progressAdvance();
+        }
 
-			// Set model name
-			$modelData->modelName = $modelName ;
+        // Create layouts directory
+        Directory::createIfNotExists(base_path('resources/views/layouts'), 0755, true);
 
-			// Set model name
-			$modelData->modelHash = $modelHash ;
+        // Store compiled page layout
+        array_push($viewCompilerOutput, $pageLayoutViewCompiler->compile(File::get($this->themeLayouts->getPagePath()), null, null, $scaffolderConfig, null, ['links' => $sidenavLinks]));
 
-			// get primary field or create 
-			$primaryField = $this->getPrimaryKeyField($modelData);
+        // Store create layout
+        $createLayout = PathParser::parse($scaffolderConfig->generator->paths->views). 'layouts/create.blade.php' ;
+        File::copy($this->themeLayouts->getCreatePath(), $createLayout);
+        array_push($viewCompilerOutput, $createLayout);
 
-			// put primary key at first position
-			if(isset($primaryField->declared) && !$primaryField->declared){
-				$modelData->fields = array_pad($modelData->fields, -(count($modelData->fields)+1), $primaryField);
-			}
-
-			// set timestamps
-			if($modelData->timeStamps){
-				$createdAtField = new stdClass;
-				$createdAtField->name = "created_at" ;
-				$createdAtField->index = "none" ;
-				$createdAtField->declared =  false ;
-				$createdAtField->type = new stdClass ;
-				$createdAtField->type->ui = 'timestamp' ;
-				$createdAtField->type->db = 'datetime' ;
-				$createdAtField->foreignKey = [];
-				$createdAtField->validations = "required" ;
-				$updatedAtField = clone($createdAtField);
-				$updatedAtField->name = "updated_at" ;
-
-				array_push($modelData->fields, $createdAtField);
-				array_push($modelData->fields, $updatedAtField);
-			}
-
-			$modelsData[$modelData->tableName] = $modelData ;
-
-			// put all migrations pre-requisites in top of generation hieraquical
-			if(count($modelData->migrationPreRequisites) == 0){
-				$modelsData = Arrays::moveElement($modelsData, $modelData->tableName, 0);
-			}
-
-		}
-
-		// let put all pre-requisites in order
-		$actualTablePosition = 0 ;
-		foreach ($modelsData as $key => $modelData)
-		{
-			// set migration order
-			$modelData->migrationOrder = isset($modelData->migrationOrder) ? $modelData->migrationOrder : $actualTablePosition ;
-
-			$positions = array_keys($modelsData);
-
-			foreach($modelData->migrationPreRequisites as $preRequiste){
-				$preRequisitePosition = array_search($preRequiste, $positions);
-				// change positions
-				if( $preRequisitePosition >  $actualTablePosition){
-					$modelData->migrationOrder = $preRequisitePosition ;
-					$modelsData[$preRequiste]->migrationOrder = $actualTablePosition ;
-					$modelsData = Arrays::moveElement($modelsData, $preRequiste, $actualTablePosition);
+        // Store edit layout
+        $editLayout = PathParser::parse($scaffolderConfig->generator->paths->views). 'layouts/edit.blade.php' ;
+        File::copy($this->themeLayouts->getCreatePath(), $editLayout);
+        array_push($viewCompilerOutput, $editLayout);
+
+        // Store dashboard
+        $dashboardLayout = PathParser::parse($scaffolderConfig->generator->paths->views). 'layouts/dashboard.blade.php' ;
+        File::copy($this->themeLayouts->getCreatePath(), $dashboardLayout);
+        array_push($viewCompilerOutput, $dashboardLayout);
+
+        // Finish progress
+        $this->output->progressFinish();
+
+        // Summary
+        $this->comment('- Files created');
+
+        $this->comment('- - Views');
+        foreach ($viewCompilerOutput as $viewFile)
+        {
+            $this->info('- - - ' . $viewFile);
+        }
+
+    }
+
+    /**
+     * Generation command for laravel. 
+     * Generates API Code 
+     * Generates Blade templates
+     * @return void
+     */
+    private function handleLaravel(){
+        // generate API
+        $this->handleApi();
+
+        // generate BLADE
+        $this->handleApi();
+
+    }
+
+    /**
+     * Get the app.json configuration and parse to an object
+     *
+     * @return void
+     */
+    private function getScaffolderConfig(){
+        // Get app config
+        $scaffolderConfig = Json::decodeFile(base_path('scaffolder-config/app.json'));
+
+        $scaffolderConfig->generator = $scaffolderConfig->generators->{$this->argument('app')};
+
+        return $scaffolderConfig ;
+    }
+
+    /**
+     * Get all model files and ordenates by
+     *
+     * @return object
+     */
+    private function getAllModelsData(){
+
+        $modelFiles = File::allFiles(base_path('scaffolder-config/models/'));
+
+        $modelsData = [];
+        $orderedModelsData = [];
+
+        // set indexes
+        //$firstKey = 
+        foreach ($modelFiles as $modelFile)
+        {
+
+            // Get model data
+            $modelData = Json::decodeFile($modelFile->getRealPath());
+
+
+            // Get model name
+            $modelName = CamelCase::convertToCamelCase(($modelFile->getBasename('.' . $modelFile->getExtension())));
+
+            // Get model hash
+            $modelHash = md5_file($modelFile->getRealPath());
+
+            // Set model name
+            $modelData->modelName = $modelName ;
+
+            // Set model name
+            $modelData->modelHash = $modelHash ;
+
+            // get primary field or create 
+            $primaryField = $this->getPrimaryKeyField($modelData);
+
+            // put primary key at first position
+            if(isset($primaryField->declared) && !$primaryField->declared){
+                $modelData->fields = array_pad($modelData->fields, -(count($modelData->fields)+1), $primaryField);
+            }
+
+            // set timestamps
+            if($modelData->timeStamps){
+                $createdAtField = new stdClass;
+                $createdAtField->name = "created_at" ;
+                $createdAtField->index = "none" ;
+                $createdAtField->declared =  false ;
+                $createdAtField->type = new stdClass ;
+                $createdAtField->type->ui = 'timestamp' ;
+                $createdAtField->type->db = 'datetime' ;
+                $createdAtField->foreignKey = [];
+                $createdAtField->validations = "required" ;
+                $updatedAtField = clone($createdAtField);
+                $updatedAtField->name = "updated_at" ;
+
+                array_push($modelData->fields, $createdAtField);
+                array_push($modelData->fields, $updatedAtField);
+            }
+
+            $modelsData[$modelData->tableName] = $modelData ;
+
+            // put all migrations pre-requisites in top of generation hieraquical
+            if(count($modelData->migrationPreRequisites) == 0){
+                $modelsData = Arrays::moveElement($modelsData, $modelData->tableName, 0);
+            }
+
+        }
+
+        // let put all pre-requisites in order
+        $actualTablePosition = 0 ;
+        foreach ($modelsData as $key => $modelData)
+        {
+            // set migration order
+            $modelData->migrationOrder = isset($modelData->migrationOrder) ? $modelData->migrationOrder : $actualTablePosition ;
+
+            $positions = array_keys($modelsData);
+
+            foreach($modelData->migrationPreRequisites as $preRequiste){
+                $preRequisitePosition = array_search($preRequiste, $positions);
+                // change positions
+                if( $preRequisitePosition >  $actualTablePosition){
+                    $modelData->migrationOrder = $preRequisitePosition ;
+                    $modelsData[$preRequiste]->migrationOrder = $actualTablePosition ;
+                    $modelsData = Arrays::moveElement($modelsData, $preRequiste, $actualTablePosition);
 					
-				}
-			}
+                }
+            }
 
 
-			// search for other fields relationships
-			foreach($modelData->fields as $field){
+            // search for other fields relationships
+            foreach($modelData->fields as $field){
 				
 
-				if(isset($field->foreignKey->relationship)){
-					switch ($field->foreignKey->relationship) {
-						case 'belongsTo':
-							// hasOne or hasMay are the inverse relationship for belongsTo
-							$relationship = new stdClass ;
-							$relationship->type  = $field->foreignKey->reverse ;
-							$relationship->foreignKey = $field->name ;
-							$relationship->localKey = $field->foreignKey->field ;
-							$relationship->modelName = $modelData->modelName ;
-							array_push($modelsData[$field->foreignKey->table]->reverseRelationships, $relationship);
-							break;
-						case 'belongsToMany':
-							// belongsToMany is the inverse relationship for belongsTo
-							$relationship = new stdClass ;
-							$relationship->type  = $field->foreignKey->reverse ;
-							$relationship->foreignKey = $field->name ;
-							$relationship->relatedTable = isset($field->relatedTable) ? $field->relatedTable : '';
-							$relationship->relatedField = isset($field->relatedField) ? $field->relatedField : '';
-							$relationship->ui = $field->type->ui;
-							$relationship->localKey = $field->foreignKey->field ;
-							$relationship->modelName = $modelData->modelName ;
-							$relationship->tableName = $modelData->tableName ;
-							array_push($modelsData[$field->foreignKey->table]->reverseRelationships, $relationship);
-							break;
-						default:
-							# code...
-							break;
-					}
+                if(isset($field->foreignKey->relationship)){
+                    switch ($field->foreignKey->relationship) {
+                        case 'belongsTo':
+                            // hasOne or hasMay are the inverse relationship for belongsTo
+                            $relationship = new stdClass ;
+                            $relationship->type  = $field->foreignKey->reverse ;
+                            $relationship->foreignKey = $field->name ;
+                            $relationship->localKey = $field->foreignKey->field ;
+                            $relationship->modelName = $modelData->modelName ;
+                            array_push($modelsData[$field->foreignKey->table]->reverseRelationships, $relationship);
+                            break;
+                        case 'belongsToMany':
+                            // belongsToMany is the inverse relationship for belongsTo
+                            $relationship = new stdClass ;
+                            $relationship->type  = $field->foreignKey->reverse ;
+                            $relationship->foreignKey = $field->name ;
+                            $relationship->relatedTable = isset($field->relatedTable) ? $field->relatedTable : '';
+                            $relationship->relatedField = isset($field->relatedField) ? $field->relatedField : '';
+                            $relationship->ui = $field->type->ui;
+                            $relationship->localKey = $field->foreignKey->field ;
+                            $relationship->modelName = $modelData->modelName ;
+                            $relationship->tableName = $modelData->tableName ;
+                            array_push($modelsData[$field->foreignKey->table]->reverseRelationships, $relationship);
+                            break;
+                        default:
+                            # code...
+                            break;
+                    }
 				
-				}
+                }
 				
-			}
+            }
 			
 
-			$actualTablePosition++ ;
-		}
+            $actualTablePosition++ ;
+        }
 	
-		// $this->info(print_r($modelsData, 1));
+        // $this->info(print_r($modelsData, 1));
 	
-		return $modelsData ;
+        return $modelsData ;
 	
-	}
-
-	protected function getPrimaryKeyField($modelData){
-		$primaryKey = new stdClass;
-		$primaryKey->name = "id" ;
-		$primaryKey->index = "primary" ;
-		$primaryKey->declared =  false ;
-		$primaryKey->type = new stdClass ;
-		$primaryKey->type->ui = 'label' ;
-		$primaryKey->type->db = 'integer' ;
-		$primaryKey->foreignKey = [];
-		$primaryKey->validations = "required" ;
-
-		foreach ($modelData->fields as $field)
-		{
-			if ($field->index == 'primary')
-			{
-				$primaryKey = $field ;
-				break;
-			}
-		}
-
-		return $primaryKey ;
-	}
+    }
+
+    protected function getPrimaryKeyField($modelData){
+        $primaryKey = new stdClass;
+        $primaryKey->name = "id" ;
+        $primaryKey->index = "primary" ;
+        $primaryKey->declared =  false ;
+        $primaryKey->type = new stdClass ;
+        $primaryKey->type->ui = 'label' ;
+        $primaryKey->type->db = 'integer' ;
+        $primaryKey->foreignKey = [];
+        $primaryKey->validations = "required" ;
+
+        foreach ($modelData->fields as $field)
+        {
+            if ($field->index == 'primary')
+            {
+                $primaryKey = $field ;
+                break;
+            }
+        }
+
+        return $primaryKey ;
+    }
 
 }
\ No newline at end of file

src/Scaffolder/Commands/ServeCommand.php

Unused Use Statements -5 removed lines

@@ -3,15 +3,10 @@
 namespace Scaffolder\Commands;
 
 use Illuminate\Console\Command;
-use Illuminate\Support\Facades\File;
-
-use stdClass ;
 
 // Support classes
 use Scaffolder\Support\Directory;
 use Scaffolder\Support\Json;
-use Scaffolder\Support\Arrays;
-use Scaffolder\Support\CamelCase;
 use Scaffolder\Compilers\Support\PathParser;
 
 

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

Unused Use Statements -1 removed lines

@@ -6,7 +6,6 @@
 use Scaffolder\Compilers\AbstractCompiler;
 use Scaffolder\Compilers\Support\FileToCompile;
 use Scaffolder\Compilers\Support\PathParser;
-use Scaffolder\Support\Directory;
 
 class IndexApiCompiler extends AbstractCompiler
 {

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

Unused Use Statements -1 removed lines

@@ -6,7 +6,6 @@
 use Scaffolder\Compilers\AbstractCompiler;
 use Scaffolder\Compilers\Support\FileToCompile;
 use Scaffolder\Compilers\Support\PathParser;
-use Scaffolder\Support\CamelCase;
 
 class IndexModuleCompiler extends AbstractCompiler
 {

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

Unused Use Statements -1 removed lines

@@ -2,7 +2,6 @@
 
 namespace Scaffolder\Compilers\AngularJs;
 
-use Illuminate\Support\Facades\File;
 use Scaffolder\Compilers\AbstractCompiler;
 use Scaffolder\Compilers\Support\FileToCompile;
 use Scaffolder\Compilers\Support\PathParser;

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

Unused Use Statements -1 removed lines

@@ -2,7 +2,6 @@
 
 namespace Scaffolder\Compilers\AngularJs;
 
-use Illuminate\Support\Facades\File;
 use Scaffolder\Compilers\AbstractCompiler;
 use Scaffolder\Compilers\Support\FileToCompile;
 use Scaffolder\Compilers\Support\PathParser;

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

Unused Use Statements -1 removed lines

@@ -2,7 +2,6 @@
 
 namespace Scaffolder\Compilers\AngularJs;
 
-use Illuminate\Support\Facades\File;
 use Scaffolder\Compilers\AbstractCompiler;
 use Scaffolder\Compilers\Support\FileToCompile;
 use Scaffolder\Compilers\Support\PathParser;

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

Unused Use Statements -1 removed lines

@@ -2,7 +2,6 @@
 
 namespace Scaffolder\Compilers\AngularJs;
 
-use Illuminate\Support\Facades\File;
 use Scaffolder\Compilers\AbstractCompiler;
 use Scaffolder\Compilers\Support\FileToCompile;
 use Scaffolder\Compilers\Support\PathParser;

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