codificar / scaffolder

src/Scaffolder/ScaffolderServiceProvider.php

Indentation +56 added lines, -56 removed lines

@@ -10,68 +10,68 @@
 
 class ScaffolderServiceProvider extends ServiceProvider
 {
-	/**
-	 * Bootstrap the application services.
-	 */
-	public function boot()
-	{
-		// Scaffolder config
-		$this->publishes([
-			__DIR__ . '/../../config/' => base_path('scaffolder-config/')
-		], 'config');
+    /**
+     * Bootstrap the application services.
+     */
+    public function boot()
+    {
+        // Scaffolder config
+        $this->publishes([
+            __DIR__ . '/../../config/' => base_path('scaffolder-config/')
+        ], 'config');
 
-		// Generator views
-		//$this->loadViewsFrom(__DIR__ . '/../../views', 'scaffolder');
+        // Generator views
+        //$this->loadViewsFrom(__DIR__ . '/../../views', 'scaffolder');
 
-		// Generator routes
-		if (!$this->app->routesAreCached())
-		{
-			require __DIR__ . '/../../routes/generator.php';
-		}
-	}
+        // Generator routes
+        if (!$this->app->routesAreCached())
+        {
+            require __DIR__ . '/../../routes/generator.php';
+        }
+    }
 
-	/**
-	 * Register the service provider.
-	 *
-	 * @return void
-	 */
-	public function register()
-	{
-		$this->app->singleton('scaffolder.command.generate', function ($app)
-		{
-			return new GeneratorCommand();
-		});
+    /**
+     * Register the service provider.
+     *
+     * @return void
+     */
+    public function register()
+    {
+        $this->app->singleton('scaffolder.command.generate', function ($app)
+        {
+            return new GeneratorCommand();
+        });
 
-		$this->app->singleton('scaffolder.command.cache.clear', function ()
-		{
-			return new ClearCacheCommand();
-		});
+        $this->app->singleton('scaffolder.command.cache.clear', function ()
+        {
+            return new ClearCacheCommand();
+        });
 
-		$this->app->singleton('scaffolder.command.build', function ()
-		{
-			return new BuildCommand();
-		});
+        $this->app->singleton('scaffolder.command.build', function ()
+        {
+            return new BuildCommand();
+        });
 
-		$this->app->singleton('scaffolder.command.serve', function ()
-		{
-			return new ServeCommand();
-		});
+        $this->app->singleton('scaffolder.command.serve', function ()
+        {
+            return new ServeCommand();
+        });
 
-		$this->commands([
-			'scaffolder.command.generate',
-			'scaffolder.command.cache.clear',
-			'scaffolder.command.build',
-			'scaffolder.command.serve'
-		]);
-	}
+        $this->commands([
+            'scaffolder.command.generate',
+            'scaffolder.command.cache.clear',
+            'scaffolder.command.build',
+            'scaffolder.command.serve'
+        ]);
+    }
 
-	/**
-	 * Get the services provided by the provider.
-	 *
-	 * @return array
-	 */
-	public function provides()
-	{
-		return ['scaffolder.command.generate', 'scaffolder.command.cache.clear', 'scaffolder.command.serve', 'scaffolder.command.build'];
-	}
+    /**
+     * Get the services provided by the provider.
+     *
+     * @return array
+     */
+    public function provides()
+    {
+        return ['scaffolder.command.generate', 'scaffolder.command.cache.clear', 'scaffolder.command.serve', 'scaffolder.command.build'];
+    }
 }
\ No newline at end of file

Spacing +6 added lines, -6 removed lines

@@ -17,7 +17,7 @@ 
 	{
 		// Scaffolder config
 		$this->publishes([
-			__DIR__ . '/../../config/' => base_path('scaffolder-config/')
+			__DIR__.'/../../config/' => base_path('scaffolder-config/')
 		], 'config');
 
 		// Generator views
@@ -26,7 +26,7 @@ 
 		// Generator routes
 		if (!$this->app->routesAreCached())
 		{
-			require __DIR__ . '/../../routes/generator.php';
+			require __DIR__.'/../../routes/generator.php';
 		}
 	}
 
@@ -37,22 +37,22 @@ 
 	 */
 	public function register()
 	{
-		$this->app->singleton('scaffolder.command.generate', function ($app)
+		$this->app->singleton('scaffolder.command.generate', function($app)
 		{
 			return new GeneratorCommand();
 		});
 
-		$this->app->singleton('scaffolder.command.cache.clear', function ()
+		$this->app->singleton('scaffolder.command.cache.clear', function()
 		{
 			return new ClearCacheCommand();
 		});
 
-		$this->app->singleton('scaffolder.command.build', function ()
+		$this->app->singleton('scaffolder.command.build', function()
 		{
 			return new BuildCommand();
 		});
 
-		$this->app->singleton('scaffolder.command.serve', function ()
+		$this->app->singleton('scaffolder.command.serve', function()
 		{
 			return new ServeCommand();
 		});

src/Scaffolder/Support/Directory.php

Indentation +7 added lines, -7 removed lines

@@ -6,13 +6,13 @@
 
 class Directory
 {
-	public static function createIfNotExists($path, $mode = 0755, $recursive = false, $force = false)
-	{
-		if (!File::isDirectory($path))
-		{
-			File::makeDirectory($path, $mode, $recursive , $force );
-		}
-	}
+    public static function createIfNotExists($path, $mode = 0755, $recursive = false, $force = false)
+    {
+        if (!File::isDirectory($path))
+        {
+            File::makeDirectory($path, $mode, $recursive , $force );
+        }
+    }
 
 
 }

Spacing +1 added lines, -1 removed lines

@@ -10,7 +10,7 @@
 	{
 		if (!File::isDirectory($path))
 		{
-			File::makeDirectory($path, $mode, $recursive , $force );
+			File::makeDirectory($path, $mode, $recursive, $force);
 		}
 	}
 

src/Scaffolder/Support/Validator.php

Indentation +92 added lines, -92 removed lines

@@ -7,104 +7,104 @@
 
 class Validator
 {
-	/**
-	 * Parse a string based rule.
-	 *
-	 * @param  string  $rules
-	 * @return array
-	 */
-	public static function parseStringRule($rules)
-	{
-		$parameters = [];
-
-		// The format for specifying validation rules and parameters follows an
-		// easy {rule}:{parameters} formatting convention. For instance the
-		// rule "Max:3" states that the value may only be three letters.
-		if (strpos($rules, ':') !== false) {
-			list($rules, $parameter) = explode(':', $rules, 2);
-
-			$parameters = self::parseParameters($rules, $parameter);
-		}
-
-		return [(trim($rules)), $parameters];
-	}
-
-	/**
-	 * Parse a parameter list.
-	 *
-	 * @param  string  $rule
-	 * @param  string  $parameter
-	 * @return array
-	 */
-	public static function parseParameters($rule, $parameter)
-	{
-		if (strtolower($rule) == 'regex') {
-			return [$parameter];
-		}
-
-		return str_getcsv($parameter);
-	}
-
-	/**
-	 * Explode the rules into an array of rules.
-	 *
-	 * @param  string  $rules
-	 * @return array
-	 */
-	public static function explodeRule($rule)
-	{
-		return explode('|', $rule);
-	}
-
-	/**
-	 * Convert laravel validations to theme validation angular js.
-	 *
-	 * @param  string  $validations
-	 * @return array
-	 */
-	public static function convertValidations($validations, $blnSearch = false){
-		$validationsConverted = [];
-		foreach (self::explodeRule($validations) as $validation) {
-			$validation = self::parseStringRule($validation);
-
-			if(isset($validation[0])){	
-
-				$rule = $validation[0];
-				$values = $validation[1];
-
-				switch ($rule) {
-					case 'required':
-						if($blnSearch) {
-							$attribute = null ;
-							$attributeValue = null ;
-						}
-						else {
-							$attribute = "required" ;
-							$attributeValue = null ;
-						}
+    /**
+     * Parse a string based rule.
+     *
+     * @param  string  $rules
+     * @return array
+     */
+    public static function parseStringRule($rules)
+    {
+        $parameters = [];
+
+        // The format for specifying validation rules and parameters follows an
+        // easy {rule}:{parameters} formatting convention. For instance the
+        // rule "Max:3" states that the value may only be three letters.
+        if (strpos($rules, ':') !== false) {
+            list($rules, $parameter) = explode(':', $rules, 2);
+
+            $parameters = self::parseParameters($rules, $parameter);
+        }
+
+        return [(trim($rules)), $parameters];
+    }
+
+    /**
+     * Parse a parameter list.
+     *
+     * @param  string  $rule
+     * @param  string  $parameter
+     * @return array
+     */
+    public static function parseParameters($rule, $parameter)
+    {
+        if (strtolower($rule) == 'regex') {
+            return [$parameter];
+        }
+
+        return str_getcsv($parameter);
+    }
+
+    /**
+     * Explode the rules into an array of rules.
+     *
+     * @param  string  $rules
+     * @return array
+     */
+    public static function explodeRule($rule)
+    {
+        return explode('|', $rule);
+    }
+
+    /**
+     * Convert laravel validations to theme validation angular js.
+     *
+     * @param  string  $validations
+     * @return array
+     */
+    public static function convertValidations($validations, $blnSearch = false){
+        $validationsConverted = [];
+        foreach (self::explodeRule($validations) as $validation) {
+            $validation = self::parseStringRule($validation);
+
+            if(isset($validation[0])){	
+
+                $rule = $validation[0];
+                $values = $validation[1];
+
+                switch ($rule) {
+                    case 'required':
+                        if($blnSearch) {
+                            $attribute = null ;
+                            $attributeValue = null ;
+                        }
+                        else {
+                            $attribute = "required" ;
+                            $attributeValue = null ;
+                        }
 						
-						break;
+                        break;
 
-					case 'max':
-					case 'min':
-						$attribute = $rule.'length' ;
-						$attributeValue = $values[0] ;
-						break;
+                    case 'max':
+                    case 'min':
+                        $attribute = $rule.'length' ;
+                        $attributeValue = $values[0] ;
+                        break;
 					
-					default:
-						$attribute = null  ;
-						$attributeValue = null ;
-						break;
-				}
+                    default:
+                        $attribute = null  ;
+                        $attributeValue = null ;
+                        break;
+                }
 
-				if($attribute)
-					$validationsConverted[$attribute] = $attributeValue ;
+                if($attribute)
+                    $validationsConverted[$attribute] = $attributeValue ;
 
-			}
+            }
 			
-		}
+        }
 
-		return $validationsConverted ;
-	}
+        return $validationsConverted ;
+    }
 
 }
\ No newline at end of file

Spacing +14 added lines, -14 removed lines

@@ -62,49 +62,49 @@
 	 * @param  string  $validations
 	 * @return array
 	 */
-	public static function convertValidations($validations, $blnSearch = false){
+	public static function convertValidations($validations, $blnSearch = false) {
 		$validationsConverted = [];
 		foreach (self::explodeRule($validations) as $validation) {
 			$validation = self::parseStringRule($validation);
 
-			if(isset($validation[0])){	
+			if (isset($validation[0])) {	
 
 				$rule = $validation[0];
 				$values = $validation[1];
 
 				switch ($rule) {
 					case 'required':
-						if($blnSearch) {
-							$attribute = null ;
-							$attributeValue = null ;
+						if ($blnSearch) {
+							$attribute = null;
+							$attributeValue = null;
 						}
 						else {
-							$attribute = "required" ;
-							$attributeValue = null ;
+							$attribute = "required";
+							$attributeValue = null;
 						}
 						
 						break;
 
 					case 'max':
 					case 'min':
-						$attribute = $rule.'length' ;
-						$attributeValue = $values[0] ;
+						$attribute = $rule.'length';
+						$attributeValue = $values[0];
 						break;
 					
 					default:
-						$attribute = null  ;
-						$attributeValue = null ;
+						$attribute = null;
+						$attributeValue = null;
 						break;
 				}
 
-				if($attribute)
-					$validationsConverted[$attribute] = $attributeValue ;
+				if ($attribute)
+					$validationsConverted[$attribute] = $attributeValue;
 
 			}
 			
 		}
 
-		return $validationsConverted ;
+		return $validationsConverted;
 	}
 
 }
\ No newline at end of file

src/Scaffolder/Support/CamelCase.php

Indentation +56 added lines, -56 removed lines

@@ -4,70 +4,70 @@
 
 class CamelCase
 {
-	/**
-	 * Given an underscore_separated_string, this will convert the string
-	 * to CamelCaseNotation.  Note that this will ignore any casing in the
-	 * underscore separated string.
-	 * 
-	 * @param string $strString
-	 * @return string
-	 */
-	public static function convertToCamelCase($strString) {
-		return str_replace(' ', '', ucwords(str_replace('_', ' ', strtolower($strString))));
-	}
+    /**
+     * Given an underscore_separated_string, this will convert the string
+     * to CamelCaseNotation.  Note that this will ignore any casing in the
+     * underscore separated string.
+     * 
+     * @param string $strString
+     * @return string
+     */
+    public static function convertToCamelCase($strString) {
+        return str_replace(' ', '', ucwords(str_replace('_', ' ', strtolower($strString))));
+    }
     
-	public static function underscoreFromCamelCase($strName) {
-		if (strlen($strName) == 0) return '';
+    public static function underscoreFromCamelCase($strName) {
+        if (strlen($strName) == 0) return '';
 
-		$strToReturn = self::FirstCharacter($strName);
+        $strToReturn = self::FirstCharacter($strName);
 
-		for ($intIndex = 1; $intIndex < strlen($strName); $intIndex++) {
-			$strChar = substr($strName, $intIndex, 1);
-			if (strtoupper($strChar) == $strChar)
-				$strToReturn .= '_' . $strChar;
-			else
-				$strToReturn .= $strChar;
-		}
+        for ($intIndex = 1; $intIndex < strlen($strName); $intIndex++) {
+            $strChar = substr($strName, $intIndex, 1);
+            if (strtoupper($strChar) == $strChar)
+                $strToReturn .= '_' . $strChar;
+            else
+                $strToReturn .= $strChar;
+        }
 		
-		return strtolower($strToReturn);
-	}   
+        return strtolower($strToReturn);
+    }   
 
-	/**
-	 * Returns the first character of a given string, or null if the given
-	 * string is null.
-	 * @param string $strString 
-	 * @return string the first character, or null
-	 */
-	public final static function firstCharacter($strString) {
-		if (strlen($strString) > 0)
-			return substr($strString, 0 , 1);
-		else
-			return null;
-	}    
+    /**
+     * Returns the first character of a given string, or null if the given
+     * string is null.
+     * @param string $strString 
+     * @return string the first character, or null
+     */
+    public final static function firstCharacter($strString) {
+        if (strlen($strString) > 0)
+            return substr($strString, 0 , 1);
+        else
+            return null;
+    }    
 
 
-	public static function pluralize($strName) {
-			// Special Rules go Here
-			switch (true) {	
-				case (strtolower($strName) == 'play'):
-					return $strName . 's';
-			}
+    public static function pluralize($strName) {
+            // Special Rules go Here
+            switch (true) {	
+                case (strtolower($strName) == 'play'):
+                    return $strName . 's';
+            }
 
-			$intLength = strlen($strName);
-			if (substr($strName, $intLength - 1) == "y")
-				return substr($strName, 0, $intLength - 1) . "ies";
-			if (substr($strName, $intLength - 1) == "s")
-				return $strName . "es";
-			if (substr($strName, $intLength - 1) == "x")
-				return $strName . "es";
-			if (substr($strName, $intLength - 1) == "z")
-				return $strName . "zes";
-			if (substr($strName, $intLength - 2) == "sh")
-				return $strName . "es";
-			if (substr($strName, $intLength - 2) == "ch")
-				return $strName . "es";
+            $intLength = strlen($strName);
+            if (substr($strName, $intLength - 1) == "y")
+                return substr($strName, 0, $intLength - 1) . "ies";
+            if (substr($strName, $intLength - 1) == "s")
+                return $strName . "es";
+            if (substr($strName, $intLength - 1) == "x")
+                return $strName . "es";
+            if (substr($strName, $intLength - 1) == "z")
+                return $strName . "zes";
+            if (substr($strName, $intLength - 2) == "sh")
+                return $strName . "es";
+            if (substr($strName, $intLength - 2) == "ch")
+                return $strName . "es";
 
-			return $strName . "s";
-		}
+            return $strName . "s";
+        }
 	
 }
\ No newline at end of file

Spacing +10 added lines, -10 removed lines

@@ -24,7 +24,7 @@ 
 		for ($intIndex = 1; $intIndex < strlen($strName); $intIndex++) {
 			$strChar = substr($strName, $intIndex, 1);
 			if (strtoupper($strChar) == $strChar)
-				$strToReturn .= '_' . $strChar;
+				$strToReturn .= '_'.$strChar;
 			else
 				$strToReturn .= $strChar;
 		}
@@ -40,7 +40,7 @@ 
 	 */
 	public final static function firstCharacter($strString) {
 		if (strlen($strString) > 0)
-			return substr($strString, 0 , 1);
+			return substr($strString, 0, 1);
 		else
 			return null;
 	}    
@@ -50,24 +50,24 @@ 
 			// Special Rules go Here
 			switch (true) {	
 				case (strtolower($strName) == 'play'):
-					return $strName . 's';
+					return $strName.'s';
 			}
 
 			$intLength = strlen($strName);
 			if (substr($strName, $intLength - 1) == "y")
-				return substr($strName, 0, $intLength - 1) . "ies";
+				return substr($strName, 0, $intLength - 1)."ies";
 			if (substr($strName, $intLength - 1) == "s")
-				return $strName . "es";
+				return $strName."es";
 			if (substr($strName, $intLength - 1) == "x")
-				return $strName . "es";
+				return $strName."es";
 			if (substr($strName, $intLength - 1) == "z")
-				return $strName . "zes";
+				return $strName."zes";
 			if (substr($strName, $intLength - 2) == "sh")
-				return $strName . "es";
+				return $strName."es";
 			if (substr($strName, $intLength - 2) == "ch")
-				return $strName . "es";
+				return $strName."es";
 
-			return $strName . "s";
+			return $strName."s";
 		}
 	
 }
\ No newline at end of file

src/Scaffolder/Support/Arrays.php

Indentation +24 added lines, -24 removed lines

@@ -4,29 +4,29 @@
 
 class Arrays
 {
-	public static function moveElement($array, $toMove, $targetIndex) {
-		if (count($array) == 1)
-			return $array;
-		if (is_int($toMove)) {
-			$tmp = array_splice($array, $toMove, 1);
-			array_splice($array, $targetIndex, 0, $tmp);
-			$output = $array;
-		}
-		elseif (is_string($toMove)) {
-			$indexToMove = array_search($toMove, array_keys($array));
-			$itemToMove = $array[$toMove];
-			array_splice($array, $indexToMove, 1);
-			$i = 0;
-			$output = Array();
-			foreach($array as $key => $item) {
-				if ($i == $targetIndex) {
-					$output[$toMove] = $itemToMove;
-				}
-				$output[$key] = $item;
-				$i++;
-			}
-		}
-		return $output;
-	}
+    public static function moveElement($array, $toMove, $targetIndex) {
+        if (count($array) == 1)
+            return $array;
+        if (is_int($toMove)) {
+            $tmp = array_splice($array, $toMove, 1);
+            array_splice($array, $targetIndex, 0, $tmp);
+            $output = $array;
+        }
+        elseif (is_string($toMove)) {
+            $indexToMove = array_search($toMove, array_keys($array));
+            $itemToMove = $array[$toMove];
+            array_splice($array, $indexToMove, 1);
+            $i = 0;
+            $output = Array();
+            foreach($array as $key => $item) {
+                if ($i == $targetIndex) {
+                    $output[$toMove] = $itemToMove;
+                }
+                $output[$key] = $item;
+                $i++;
+            }
+        }
+        return $output;
+    }
 }
 

Spacing +1 added lines, -1 removed lines

@@ -18,7 +18,7 @@
 			array_splice($array, $indexToMove, 1);
 			$i = 0;
 			$output = Array();
-			foreach($array as $key => $item) {
+			foreach ($array as $key => $item) {
 				if ($i == $targetIndex) {
 					$output[$toMove] = $itemToMove;
 				}

src/Scaffolder/Commands/BuildCommand.php

Indentation +37 added lines, -37 removed lines

@@ -13,60 +13,60 @@
 
 class BuildCommand extends Command
 {
-	protected $signature = 'scaffolder:build {app=webapp}';
+    protected $signature = 'scaffolder:build {app=webapp}';
 
-	protected $description = 'Build the generated code to public folder';
+    protected $description = 'Build the generated code to public folder';
 
-	/**
-	 * Execute the Command.
-	 */
-	public function handle()
-	{
+    /**
+     * Execute the Command.
+     */
+    public function handle()
+    {
 
 
-		switch ($this->argument('app')) {
-			case 'webapp':
+        switch ($this->argument('app')) {
+            case 'webapp':
 				
-				$this->cleanPublicFolder();
+                $this->cleanPublicFolder();
 
-				$gulpCommand = sprintf('gulp build --cwd "%s/codificar/scaffolder-theme-material/"', base_path('vendor'));
+                $gulpCommand = sprintf('gulp build --cwd "%s/codificar/scaffolder-theme-material/"', base_path('vendor'));
 
-				//$this->info('- gulpCommand: '. $gulpCommand);	
+                //$this->info('- gulpCommand: '. $gulpCommand);	
 
-				$handle = popen($gulpCommand, 'r');
+                $handle = popen($gulpCommand, 'r');
 
-				while(!feof($handle)) 
-				{ 
-					// send the current file part to the browser 
-					$this->info(fread($handle, 1024)); 
-				} 
+                while(!feof($handle)) 
+                { 
+                    // send the current file part to the browser 
+                    $this->info(fread($handle, 1024)); 
+                } 
 
-				fclose($handle); 
+                fclose($handle); 
 				
-				// 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;
+        }
 		
-	}
+    }
 
-	private function cleanPublicFolder(){
-		$this->info('Cleaning public directory');
+    private function cleanPublicFolder(){
+        $this->info('Cleaning public directory');
 
-		File::deleteDirectory(sprintf("%s/app", base_path('public')));
-		File::deleteDirectory(sprintf("%s/assets", base_path('public')));
-		File::deleteDirectory(sprintf("%s/fonts", base_path('public')));
-		File::deleteDirectory(sprintf("%s/maps", base_path('public')));
-		File::deleteDirectory(sprintf("%s/scripts", base_path('public')));
-		File::deleteDirectory(sprintf("%s/styles", base_path('public')));
+        File::deleteDirectory(sprintf("%s/app", base_path('public')));
+        File::deleteDirectory(sprintf("%s/assets", base_path('public')));
+        File::deleteDirectory(sprintf("%s/fonts", base_path('public')));
+        File::deleteDirectory(sprintf("%s/maps", base_path('public')));
+        File::deleteDirectory(sprintf("%s/scripts", base_path('public')));
+        File::deleteDirectory(sprintf("%s/styles", base_path('public')));
 
-		File::delete(sprintf("%s/index.html", base_path('public')));
-	}
+        File::delete(sprintf("%s/index.html", base_path('public')));
+    }
 
 
 }
\ No newline at end of file

Spacing +3 added lines, -3 removed lines

@@ -5,7 +5,7 @@ 
 use Illuminate\Console\Command;
 use Illuminate\Support\Facades\File;
 
-use stdClass ;
+use stdClass;
 
 // Support classes
 use Scaffolder\Support\Directory;
@@ -35,7 +35,7 @@ 
 
 				$handle = popen($gulpCommand, 'r');
 
-				while(!feof($handle)) 
+				while (!feof($handle)) 
 				{ 
 					// send the current file part to the browser 
 					$this->info(fread($handle, 1024)); 
@@ -55,7 +55,7 @@ 
 		
 	}
 
-	private function cleanPublicFolder(){
+	private function cleanPublicFolder() {
 		$this->info('Cleaning public directory');
 
 		File::deleteDirectory(sprintf("%s/app", base_path('public')));

src/Scaffolder/Commands/ServeCommand.php

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

Spacing +11 added lines, -11 removed lines

@@ -5,7 +5,7 @@ 
 use Illuminate\Console\Command;
 use Illuminate\Support\Facades\File;
 
-use stdClass ;
+use stdClass;
 
 // Support classes
 use Scaffolder\Support\Directory;
@@ -22,7 +22,7 @@ 
 	protected $description = 'Serve code for development purpose';
 
 	// app config var
-	private $scaffolderConfig ;
+	private $scaffolderConfig;
 
 	/**
 	 * Execute the Command.
@@ -34,12 +34,12 @@ 
 
 		$overwrite = false;
 
-		if($this->option('overwrite'))
+		if ($this->option('overwrite'))
 			$overwrite = true;
 
 		$generate = false;
 
-		if($this->option('generate'))
+		if ($this->option('generate'))
 			$generate = true;
 
 
@@ -47,7 +47,7 @@ 
 			case 'webapp':
 				
 				// gera código somente se houver a opcao
-				if($generate) {
+				if ($generate) {
 					// Gera codigo da api
 					$this->call('scaffolder:generate', array('app' => 'api', '-c' => 'clear-all'));
 					
@@ -90,7 +90,7 @@ 
 	private function launchBackgroundProcess($call) {
 	 
 		// Windows
-		if($this->is_windows()){
+		if ($this->is_windows()) {
 			pclose(popen('start /b '.$call, 'r'));
 		}
 	 
@@ -108,8 +108,8 @@ 
 	* Tells if we are running on Windows Platform
 	* @author raccettura
 	*/
-	private function is_windows(){
-		if(PHP_OS == 'WINNT' || PHP_OS == 'WIN32'){
+	private function is_windows() {
+		if (PHP_OS == 'WINNT' || PHP_OS == 'WIN32') {
 			return true;
 		}
 		return false;
@@ -119,7 +119,7 @@ 
 	public function copyApiFiles($overwrite) {
 
 		$command = sprintf('cp -r %s "%s/." "%s"', 
-			(!$overwrite ? ' -u' : null) , 
+			(!$overwrite ? ' -u' : null), 
 			PathParser::parse($this->scaffolderConfig->generators->api->paths->base),
 			base_path());
 		
@@ -135,7 +135,7 @@ 
 
 		// copying page files
 		$command = sprintf('cp -r %s "%s/." "%s/"', 
-			(!$overwrite ? ' -u' : null) , 
+			(!$overwrite ? ' -u' : null), 
 			PathParser::parse($this->scaffolderConfig->generators->angularjs->paths->index),
 			PathParser::parse($this->scaffolderConfig->generators->angularjs->paths->resources));
 
@@ -150,7 +150,7 @@ 
 	 *
 	 * @return void
 	 */
-	private function getScaffolderConfig(){
+	private function getScaffolderConfig() {
 		// Get app config
 		$this->scaffolderConfig = Json::decodeFile(base_path('scaffolder-config/app.json'));
 

src/Scaffolder/Commands/GeneratorCommand.php

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

Spacing +75 added lines, -75 removed lines

@@ -43,7 +43,7 @@ 
 use Scaffolder\Themes\IScaffolderThemeViews;
 use Scaffolder\Compilers\Support\PathParser;
 
-use stdClass ;
+use stdClass;
 
 class GeneratorCommand extends Command
 {
@@ -57,7 +57,7 @@ 
 	{
 		parent::__construct();
 
-		$this->stubsDirectory = __DIR__ . '/../../../stubs/';
+		$this->stubsDirectory = __DIR__.'/../../../stubs/';
 	}
 
 	/**
@@ -67,7 +67,7 @@ 
 	public function handle()
 	{
 		// check if is to clear cache
-		if($this->option('clear-all')){
+		if ($this->option('clear-all')) {
 			$this->call('scaffolder:clear');
 		}
 
@@ -111,7 +111,7 @@ 
 	 * API Generation command for API files.  
 	 * @return void
 	 */
-	private function handleApi(){
+	private function handleApi() {
 		// Get all the models
 		$modelsData = $this->getAllModelsData();
 
@@ -194,19 +194,19 @@ 
 		$this->comment('- - Controllers');
 		foreach ($controllerCompilerOutput as $controllerFile)
 		{
-			$this->info('- - - ' . $controllerFile);
+			$this->info('- - - '.$controllerFile);
 		}
 
 		$this->comment('- - Migrations');
 		foreach ($migrationCompilerOutput as $migrationFile)
 		{
-			$this->info('- - - ' . $migrationFile);
+			$this->info('- - - '.$migrationFile);
 		}
 
 		$this->comment('- - Models');
 		foreach ($modelCompilerOutput as $modelFile)
 		{
-			$this->info('- - - ' . $modelFile);
+			$this->info('- - - '.$modelFile);
 		}
 	}
 
@@ -214,7 +214,7 @@ 
 	 * Code Generation command for AngularJs Material design files.  
 	 * @return void
 	 */
-	private function handleAngularJs(){
+	private function handleAngularJs() {
 		// Get all the models
 		$modelsData = $this->getAllModelsData();
 
@@ -314,24 +314,24 @@ 
 
 		$this->comment('- - Index Api');
 
-		$this->info('- - - ' . $fileApi);
+		$this->info('- - - '.$fileApi);
 
 		$this->comment('- - Resources');
 		foreach ($resourceCompilerOutput as $file)
 		{
-			$this->info('- - - ' . $file);
+			$this->info('- - - '.$file);
 		}
 
 		$this->comment('- - Modules');
 		foreach ($moduleCompilerOutput as $file)
 		{
-			$this->info('- - - ' . $file);
+			$this->info('- - - '.$file);
 		}
 
 		$this->comment('- - Translate');
 		foreach ($translateCompilerOutput as $file)
 		{
-			$this->info('- - - ' . $file);
+			$this->info('- - - '.$file);
 		}
 
 		$this->comment('- - Register');
@@ -339,19 +339,19 @@ 
 		$this->comment('- - - Modules');
 		foreach ($registerModuleCompilerOutput as $file)
 		{
-			$this->info('- - - - ' . $file);
+			$this->info('- - - - '.$file);
 		}
 
 		$this->comment('- - - Controllers');
 		foreach ($registerControllerCompilerOutput as $file)
 		{
-			$this->info('- - - - ' . $file);
+			$this->info('- - - - '.$file);
 		}
 
 		$this->comment('- - - Templates');
 		foreach ($registerTemplateCompilerOutput as $file)
 		{
-			$this->info('- - - - ' . $file);
+			$this->info('- - - - '.$file);
 		}
 
 		$this->comment('- - List');
@@ -359,20 +359,20 @@ 
 		$this->comment('- - - Modules');
 		foreach ($listModuleCompilerOutput as $file)
 		{
-			$this->info('- - - - ' . $file);
+			$this->info('- - - - '.$file);
 		}
 
 
 		$this->comment('- - - Controllers');
 		foreach ($listControllerCompilerOutput as $file)
 		{
-			$this->info('- - - - ' . $file);
+			$this->info('- - - - '.$file);
 		}
 
 		$this->comment('- - - Templates');
 		foreach ($listTemplateCompilerOutput as $file)
 		{
-			$this->info('- - - - ' . $file);
+			$this->info('- - - - '.$file);
 		}
 		/*
 		$this->comment('- - - Detail Dialog');
@@ -395,7 +395,7 @@ 
 	 * Generates Blade templates
 	 * @return void
 	 */
-	private function handleBlade(){
+	private function handleBlade() {
 		// Get all the models
 		$modelsData = $this->getAllModelsData();
 
@@ -440,7 +440,7 @@ 
 			$modelName = $modelData->modelName;
 
 			// Create views directory
-			Directory::createIfNotExists(base_path('resources/views/' . strtolower($modelName)));
+			Directory::createIfNotExists(base_path('resources/views/'.strtolower($modelName)));
 
 			//set hash
 			$modelHash = $modelData->modelHash;
@@ -464,17 +464,17 @@ 
 		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' ;
+		$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' ;
+		$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' ;
+		$dashboardLayout = PathParser::parse($scaffolderConfig->generator->paths->views).'layouts/dashboard.blade.php';
 		File::copy($this->themeLayouts->getCreatePath(), $dashboardLayout);
 		array_push($viewCompilerOutput, $dashboardLayout);
 
@@ -487,7 +487,7 @@ 
 		$this->comment('- - Views');
 		foreach ($viewCompilerOutput as $viewFile)
 		{
-			$this->info('- - - ' . $viewFile);
+			$this->info('- - - '.$viewFile);
 		}
 
 	}
@@ -498,7 +498,7 @@ 
 	 * Generates Blade templates
 	 * @return void
 	 */
-	private function handleLaravel(){
+	private function handleLaravel() {
 		// generate API
 		$this->handleApi();
 
@@ -512,13 +512,13 @@ 
 	 *
 	 * @return void
 	 */
-	private function getScaffolderConfig(){
+	private function getScaffolderConfig() {
 		// Get app config
 		$scaffolderConfig = Json::decodeFile(base_path('scaffolder-config/app.json'));
 
 		$scaffolderConfig->generator = $scaffolderConfig->generators->{$this->argument('app')};
 
-		return $scaffolderConfig ;
+		return $scaffolderConfig;
 	}
 
 	/**
@@ -526,7 +526,7 @@ 
 	 *
 	 * @return object
 	 */
-	private function getAllModelsData(){
+	private function getAllModelsData() {
 
 		$modelFiles = File::allFiles(base_path('scaffolder-config/models/'));
 
@@ -543,67 +543,67 @@ 
 
 
 			// Get model name
-			$modelName = CamelCase::convertToCamelCase(($modelFile->getBasename('.' . $modelFile->getExtension())));
+			$modelName = CamelCase::convertToCamelCase(($modelFile->getBasename('.'.$modelFile->getExtension())));
 
 			// Get model hash
 			$modelHash = md5_file($modelFile->getRealPath());
 
 			// Set model name
-			$modelData->modelName = $modelName ;
+			$modelData->modelName = $modelName;
 
 			// Set model name
-			$modelData->modelHash = $modelHash ;
+			$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);
+			if (isset($primaryField->declared) && !$primaryField->declared) {
+				$modelData->fields = array_pad($modelData->fields, -(count($modelData->fields) + 1), $primaryField);
 			}
 
 			// set timestamps
-			if($modelData->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->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" ;
+				$createdAtField->validations = "required";
 				$updatedAtField = clone($createdAtField);
-				$updatedAtField->name = "updated_at" ;
+				$updatedAtField->name = "updated_at";
 
 				array_push($modelData->fields, $createdAtField);
 				array_push($modelData->fields, $updatedAtField);
 			}
 
-			$modelsData[$modelData->tableName] = $modelData ;
+			$modelsData[$modelData->tableName] = $modelData;
 
 			// put all migrations pre-requisites in top of generation hieraquical
-			if(count($modelData->migrationPreRequisites) == 0){
+			if (count($modelData->migrationPreRequisites) == 0) {
 				$modelsData = Arrays::moveElement($modelsData, $modelData->tableName, 0);
 			}
 
 		}
 
 		// let put all pre-requisites in order
-		$actualTablePosition = 0 ;
+		$actualTablePosition = 0;
 		foreach ($modelsData as $key => $modelData)
 		{
 			// set migration order
-			$modelData->migrationOrder = isset($modelData->migrationOrder) ? $modelData->migrationOrder : $actualTablePosition ;
+			$modelData->migrationOrder = isset($modelData->migrationOrder) ? $modelData->migrationOrder : $actualTablePosition;
 
 			$positions = array_keys($modelsData);
 
-			foreach($modelData->migrationPreRequisites as $preRequiste){
+			foreach ($modelData->migrationPreRequisites as $preRequiste) {
 				$preRequisitePosition = array_search($preRequiste, $positions);
 				// change positions
-				if( $preRequisitePosition >  $actualTablePosition){
-					$modelData->migrationOrder = $preRequisitePosition ;
-					$modelsData[$preRequiste]->migrationOrder = $actualTablePosition ;
+				if ($preRequisitePosition > $actualTablePosition) {
+					$modelData->migrationOrder = $preRequisitePosition;
+					$modelsData[$preRequiste]->migrationOrder = $actualTablePosition;
 					$modelsData = Arrays::moveElement($modelsData, $preRequiste, $actualTablePosition);
 					
 				}
@@ -611,31 +611,31 @@ 
 
 
 			// search for other fields relationships
-			foreach($modelData->fields as $field){
+			foreach ($modelData->fields as $field) {
 				
 
-				if(isset($field->foreignKey->relationship)){
+				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 ;
+							$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 = 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 ;
+							$relationship->localKey = $field->foreignKey->field;
+							$relationship->modelName = $modelData->modelName;
+							$relationship->tableName = $modelData->tableName;
 							array_push($modelsData[$field->foreignKey->table]->reverseRelationships, $relationship);
 							break;
 						default:
@@ -648,36 +648,36 @@ 
 			}
 			
 
-			$actualTablePosition++ ;
+			$actualTablePosition++;
 		}
 	
 		// $this->info(print_r($modelsData, 1));
 	
-		return $modelsData ;
+		return $modelsData;
 	
 	}
 
-	protected function getPrimaryKeyField($modelData){
+	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->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" ;
+		$primaryKey->validations = "required";
 
 		foreach ($modelData->fields as $field)
 		{
 			if ($field->index == 'primary')
 			{
-				$primaryKey = $field ;
+				$primaryKey = $field;
 				break;
 			}
 		}
 
-		return $primaryKey ;
+		return $primaryKey;
 	}
 
 }
\ No newline at end of file

src/Scaffolder/Compilers/Blade/PageLayoutCompiler.php

Spacing +2 added lines, -2 removed lines

@@ -44,7 +44,7 @@ 
      */
     protected function store($modelName, $scaffolderConfig, $compiled, FileToCompile $fileToCompile)
     {
-        $path = PathParser::parse($scaffolderConfig->generator->paths->views) . 'layouts/page.blade.php';
+        $path = PathParser::parse($scaffolderConfig->generator->paths->views).'layouts/page.blade.php';
 
         File::put($path, $compiled);
 
@@ -98,7 +98,7 @@ 
                 <a href='/%s' class='waves-effect'>
                     %ss
                 </a>
-            </li>", $scaffolderConfig->generator->routing->prefix . '/' . strtolower($link), $link);
+            </li>", $scaffolderConfig->generator->routing->prefix.'/'.strtolower($link), $link);
         }
 
         $this->stub = str_replace('{{links}}', $navLinks, $this->stub);