codificar / scaffolder

src/Scaffolder/Compilers/AngularJs/ListChooseColumnsCompiler.php

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

Indentation +170 added lines, -170 removed lines

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

src/Scaffolder/Compilers/AngularJs/ListModuleCompiler.php

Indentation +32 added lines, -32 removed lines

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

src/Scaffolder/Compilers/AngularJs/IndexModuleCompiler.php

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

Indentation +32 added lines, -32 removed lines

@@ -10,40 +10,40 @@
 
 class ModuleCompiler extends AbstractCompiler
 {
-	protected $cachePrefix 	= 'module_';
-	protected $stubFilename = 'Module.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 	= 'module_';
+    protected $stubFilename = 'Module.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.'/' ;
-
-		Directory::createIfNotExists($folder, 0755, true);
-
-		return $folder .  $this->modelData->tableName . '.module.js';
-	}
+    /**
+     * Get output filename
+     *
+     *
+     * @return $this
+     */
+    protected function getOutputFilename()
+    {
+        $folder = PathParser::parse($this->scaffolderConfig->generator->paths->pages).$this->modelData->tableName.'/' ;
+
+        Directory::createIfNotExists($folder, 0755, true);
+
+        return $folder .  $this->modelData->tableName . '.module.js';
+    }
 
 }
\ No newline at end of file

src/Scaffolder/Compilers/AngularJs/RegisterModuleCompiler.php

Indentation +32 added lines, -32 removed lines

@@ -10,40 +10,40 @@
 
 class RegisterModuleCompiler extends AbstractCompiler
 {
-	protected $cachePrefix 	= 'register_module_';
-	protected $stubFilename = 'RegisterModule.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 	= 'register_module_';
+    protected $stubFilename = 'RegisterModule.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.'/register/' ;
-
-		Directory::createIfNotExists($folder, 0755, true);
-
-		return $folder .$this->modelData->tableName . '_register.module.js';
-	}
+    /**
+     * Get output filename
+     *
+     *
+     * @return $this
+     */
+    protected function getOutputFilename()
+    {
+        $folder = PathParser::parse($this->scaffolderConfig->generator->paths->pages).$this->modelData->tableName.'/register/' ;
+
+        Directory::createIfNotExists($folder, 0755, true);
+
+        return $folder .$this->modelData->tableName . '_register.module.js';
+    }
 
 }
\ No newline at end of file

src/Scaffolder/Compilers/AbstractCompiler.php

Indentation +247 added lines, -247 removed lines

@@ -9,266 +9,266 @@
 
 abstract class AbstractCompiler
 {
-	protected $cachePrefix ;
-	protected $stubFilename;
-
-	protected $stub;
-	protected $scaffolderConfig ;
-	protected $modelName ;
-	protected $modelData ;
-	protected $stubsDirectory ;
-
-	protected $eagerTable ;
-
-	const CACHE_EXT = '.scf';
-
-	public function __construct($scaffolderConfig, $modelData = null)
-	{
-		$this->modelName = isset($modelData->modelName) ? $modelData->modelName : null  ;
-		$this->modelData = $modelData ;
-		$this->scaffolderConfig = $scaffolderConfig ;
-
-		$this->stub = File::get($this->stubsDirectory . $this->stubFilename );
-	}
-
-	/**
-	 * Compiles .
-	 *
-	 * @param null $extra
-	 *
-	 * @return string
-	 */
-	public function compile($extra = null)
-	{
-		if (File::exists(base_path('scaffolder-config/cache/' . $this->cachePrefix  . $this->modelData->modelHash . self::CACHE_EXT)))
-		{
-			return $this->store(new FileToCompile(true, $this->modelData->modelHash));
-		}
-		else
-		{
-
-			return $this->replacePrimaryKey()
-						->replaceClassName()
-						->replaceTableName()
-						->replaceRoutePrefix()
-						->replaceAndStore();
-		}
-	}
-
-	/**
-	 * Replace and store the Stub.
-	 *
-	 * @return string
-	 */
-	abstract protected function replaceAndStore();
-
-	/**
-	 * Store the compiled stub.
-	 *
-	 * @param string $eagerTable
-	 *
-	 * @return string
-	 */
-	protected function setEagerTable($eagerTable){
-		$this->eagerTable = $eagerTable.'.';
-	}
-
-	/**
-	 * Store the compiled stub.
-	 *
-	 * @param FileToCompile $fileToCompile
-	 *
-	 * @return string
-	 */
-	protected function store(FileToCompile $fileToCompile)
-	{
-		$path = $this->getOutputFilename();
-
-		// Store in cache
-		if ($fileToCompile->cached)
-		{
-			File::copy(base_path('scaffolder-config/cache/' . $this->cachePrefix . $fileToCompile->hash . self::CACHE_EXT), $path);
-		}
-		else
-		{
-			File::put(base_path('scaffolder-config/cache/' . $this->cachePrefix . $fileToCompile->hash . self::CACHE_EXT), $this->stub);
-			File::copy(base_path('scaffolder-config/cache/' . $this->cachePrefix . $fileToCompile->hash . self::CACHE_EXT), $path);
-		}
-
-		return $path;
-	}
-
-	/**
-	 * Get output filename
-	 *
-	 *
-	 * @return $this
-	 */
-	abstract protected function getOutputFilename();
-
-	/**
-	 * Replace the primary key.
-	 *
-	 * @param $this->modelData
-	 */
-	protected function replacePrimaryKey()
-	{
+    protected $cachePrefix ;
+    protected $stubFilename;
+
+    protected $stub;
+    protected $scaffolderConfig ;
+    protected $modelName ;
+    protected $modelData ;
+    protected $stubsDirectory ;
+
+    protected $eagerTable ;
+
+    const CACHE_EXT = '.scf';
+
+    public function __construct($scaffolderConfig, $modelData = null)
+    {
+        $this->modelName = isset($modelData->modelName) ? $modelData->modelName : null  ;
+        $this->modelData = $modelData ;
+        $this->scaffolderConfig = $scaffolderConfig ;
+
+        $this->stub = File::get($this->stubsDirectory . $this->stubFilename );
+    }
+
+    /**
+     * Compiles .
+     *
+     * @param null $extra
+     *
+     * @return string
+     */
+    public function compile($extra = null)
+    {
+        if (File::exists(base_path('scaffolder-config/cache/' . $this->cachePrefix  . $this->modelData->modelHash . self::CACHE_EXT)))
+        {
+            return $this->store(new FileToCompile(true, $this->modelData->modelHash));
+        }
+        else
+        {
+
+            return $this->replacePrimaryKey()
+                        ->replaceClassName()
+                        ->replaceTableName()
+                        ->replaceRoutePrefix()
+                        ->replaceAndStore();
+        }
+    }
+
+    /**
+     * Replace and store the Stub.
+     *
+     * @return string
+     */
+    abstract protected function replaceAndStore();
+
+    /**
+     * Store the compiled stub.
+     *
+     * @param string $eagerTable
+     *
+     * @return string
+     */
+    protected function setEagerTable($eagerTable){
+        $this->eagerTable = $eagerTable.'.';
+    }
+
+    /**
+     * Store the compiled stub.
+     *
+     * @param FileToCompile $fileToCompile
+     *
+     * @return string
+     */
+    protected function store(FileToCompile $fileToCompile)
+    {
+        $path = $this->getOutputFilename();
+
+        // Store in cache
+        if ($fileToCompile->cached)
+        {
+            File::copy(base_path('scaffolder-config/cache/' . $this->cachePrefix . $fileToCompile->hash . self::CACHE_EXT), $path);
+        }
+        else
+        {
+            File::put(base_path('scaffolder-config/cache/' . $this->cachePrefix . $fileToCompile->hash . self::CACHE_EXT), $this->stub);
+            File::copy(base_path('scaffolder-config/cache/' . $this->cachePrefix . $fileToCompile->hash . self::CACHE_EXT), $path);
+        }
+
+        return $path;
+    }
+
+    /**
+     * Get output filename
+     *
+     *
+     * @return $this
+     */
+    abstract protected function getOutputFilename();
+
+    /**
+     * Replace the primary key.
+     *
+     * @param $this->modelData
+     */
+    protected function replacePrimaryKey()
+    {
 		
-		$primaryKey = $this->getPrimaryKeyField()->name;
-
-		$this->stub = str_replace('{{primary_key}}', $primaryKey, $this->stub);
-
-		return $this;
-	}
-
-	protected function getPrimaryKeyField(){
-		$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 ($this->modelData->fields as $field)
-		{
-			if ($field->index == 'primary')
-			{
-				$primaryKey = $field ;
-				break;
-			}
-		}
-
-		return $primaryKey ;
-	}
-
-	/**
-	 * Replace the class name.
-	 *
-	 *
-	 * @return $this
-	 */
-	protected function replaceClassName()
-	{
-		$this->stub = str_replace('{{class_name}}', $this->modelName, $this->stub);
-		$this->stub = str_replace('{{class_name_lw}}', strtolower($this->modelName), $this->stub);
-
-		return $this;
-	}
-
-	/**
-	 * Replace the table name.
-	 *
-	 * @return $this
-	 */
-	protected function replaceTableName()
-	{
-		$this->stub = str_replace('{{table_name}}', $this->modelData->tableName, $this->stub);
-
-		return $this;
-	}
-
-	/**
-	 * Replace the namespace.
-	 *
-	 * @return $this
-	 */
-	protected function replaceNamespace()
-	{
-		$this->stub = str_replace('{{namespace}}', $this->scaffolderConfig->generator->namespaces->models, $this->stub);
-
-		return $this;
-	}
-
-	/**
-	 * Replace the foreign strings by field.
-	 *
-	 * @param stdClass $field
-	 * @param string $originalStubPart
-	 *
-	 * @return $this
-	 */
-	protected function replaceForeingStrings($field,  $originalStubPart){
-		$replaceStub = str_replace('{{foreign_table}}', $field->foreignKey->table, $originalStubPart);
-		$replaceStub = str_replace('{{table_name}}', $this->modelData->tableName, $replaceStub);
-		$replaceStub = str_replace('{{foreign_field}}', $field->foreignKey->field, $replaceStub);
-		$replaceStub = str_replace('{{foreign_model}}', ucwords($field->foreignKey->table), $replaceStub);
-		$replaceStub = str_replace('{{field}}', $field->name, $replaceStub);
-
-		if(isset($this->scaffolderConfig->generator->namespaces))
-			$replaceStub = str_replace('{{model_namespace}}', $this->scaffolderConfig->generator->namespaces->models, $replaceStub);
-
-		return $replaceStub;
+        $primaryKey = $this->getPrimaryKeyField()->name;
+
+        $this->stub = str_replace('{{primary_key}}', $primaryKey, $this->stub);
+
+        return $this;
+    }
+
+    protected function getPrimaryKeyField(){
+        $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 ($this->modelData->fields as $field)
+        {
+            if ($field->index == 'primary')
+            {
+                $primaryKey = $field ;
+                break;
+            }
+        }
+
+        return $primaryKey ;
+    }
+
+    /**
+     * Replace the class name.
+     *
+     *
+     * @return $this
+     */
+    protected function replaceClassName()
+    {
+        $this->stub = str_replace('{{class_name}}', $this->modelName, $this->stub);
+        $this->stub = str_replace('{{class_name_lw}}', strtolower($this->modelName), $this->stub);
+
+        return $this;
+    }
+
+    /**
+     * Replace the table name.
+     *
+     * @return $this
+     */
+    protected function replaceTableName()
+    {
+        $this->stub = str_replace('{{table_name}}', $this->modelData->tableName, $this->stub);
+
+        return $this;
+    }
+
+    /**
+     * Replace the namespace.
+     *
+     * @return $this
+     */
+    protected function replaceNamespace()
+    {
+        $this->stub = str_replace('{{namespace}}', $this->scaffolderConfig->generator->namespaces->models, $this->stub);
+
+        return $this;
+    }
+
+    /**
+     * Replace the foreign strings by field.
+     *
+     * @param stdClass $field
+     * @param string $originalStubPart
+     *
+     * @return $this
+     */
+    protected function replaceForeingStrings($field,  $originalStubPart){
+        $replaceStub = str_replace('{{foreign_table}}', $field->foreignKey->table, $originalStubPart);
+        $replaceStub = str_replace('{{table_name}}', $this->modelData->tableName, $replaceStub);
+        $replaceStub = str_replace('{{foreign_field}}', $field->foreignKey->field, $replaceStub);
+        $replaceStub = str_replace('{{foreign_model}}', ucwords($field->foreignKey->table), $replaceStub);
+        $replaceStub = str_replace('{{field}}', $field->name, $replaceStub);
+
+        if(isset($this->scaffolderConfig->generator->namespaces))
+            $replaceStub = str_replace('{{model_namespace}}', $this->scaffolderConfig->generator->namespaces->models, $replaceStub);
+
+        return $replaceStub;
 		
-	}
-
-	/**
-	 * Replace the fields strings by field.
-	 *
-	 * @param stdClass $field
-	 * @param string $originalStubPart
-	 *
-	 * @return $this
-	 */
-	protected function replaceFieldStrings($field,  $originalStubPart){
-		$replaceStub = str_replace('{{field}}', $field->name, $originalStubPart);
+    }
+
+    /**
+     * Replace the fields strings by field.
+     *
+     * @param stdClass $field
+     * @param string $originalStubPart
+     *
+     * @return $this
+     */
+    protected function replaceFieldStrings($field,  $originalStubPart){
+        $replaceStub = str_replace('{{field}}', $field->name, $originalStubPart);
 		
-		if($this->eagerTable) $this->eagerTable.'.' ;
+        if($this->eagerTable) $this->eagerTable.'.' ;
 
-		$replaceStub = str_replace('{{eager_table}}', $this->eagerTable, $replaceStub);
+        $replaceStub = str_replace('{{eager_table}}', $this->eagerTable, $replaceStub);
 
-		return $replaceStub;
+        return $replaceStub;
 		
-	}
-
-	/**
-	 * Replace the prefix.
-	 *
-	 * @return $this
-	 */
-	protected function replaceRoutePrefix()
-	{
-		$this->stub = str_replace('{{route_prefix}}', $this->scaffolderConfig->generator->routing->prefix, $this->stub);
-
-		return $this;
-	}
-
-	/**
-	 * get anoter model data
-	 *
-	 * @param string $tableName
-	 *
-	 * @return $this
-	 */
-	protected $modelDataArray = [];
-	protected function getModelData($tableName){
+    }
+
+    /**
+     * Replace the prefix.
+     *
+     * @return $this
+     */
+    protected function replaceRoutePrefix()
+    {
+        $this->stub = str_replace('{{route_prefix}}', $this->scaffolderConfig->generator->routing->prefix, $this->stub);
+
+        return $this;
+    }
+
+    /**
+     * get anoter model data
+     *
+     * @param string $tableName
+     *
+     * @return $this
+     */
+    protected $modelDataArray = [];
+    protected function getModelData($tableName){
 		
-		if(array_key_exists($tableName, $this->modelDataArray)){
-			return $this->modelDataArray[$tableName];
-		}
-		else {
+        if(array_key_exists($tableName, $this->modelDataArray)){
+            return $this->modelDataArray[$tableName];
+        }
+        else {
 
-			$modelFilename = base_path('scaffolder-config/models/') . $tableName . '.json' ;
+            $modelFilename = base_path('scaffolder-config/models/') . $tableName . '.json' ;
 
-			$modelData = Json::decodeFile($modelFilename);
+            $modelData = Json::decodeFile($modelFilename);
 
-			// Get model name
-			$modelName = ucwords($tableName);
+            // Get model name
+            $modelName = ucwords($tableName);
 
-			// Get model hash
-			$modelHash = md5_file($modelFilename);
+            // Get model hash
+            $modelHash = md5_file($modelFilename);
 
-			// Set model name
-			$modelData->modelName = $modelName ;
+            // Set model name
+            $modelData->modelName = $modelName ;
 
-			// Set model name
-			$modelData->modelHash = $modelHash ;
+            // Set model name
+            $modelData->modelHash = $modelHash ;
 
-			$this->modelDataArray[$tableName] = $modelData;
+            $this->modelDataArray[$tableName] = $modelData;
 
-			return $this->modelDataArray[$tableName];
-		}
-	}
+            return $this->modelDataArray[$tableName];
+        }
+    }
 }
\ No newline at end of file

src/Scaffolder/Compilers/Core/ModelCompiler.php

Indentation +569 added lines, -569 removed lines

@@ -11,692 +11,692 @@
 
 class ModelCompiler extends AbstractCompiler
 {
-	protected $cachePrefix 	= 'model_';
-	protected $stubFilename = 'Model/Model.php' ;
-
-	public function __construct($scaffolderConfig, $modelData = null, $stubName = null)
-	{
-		if ($stubName)
-			$this->stubFilename = $stubName;
-		$this->stubsDirectory = __DIR__ . '/../../../../stubs/Api/';
-		parent::__construct($scaffolderConfig, $modelData);
-	}
-
-	/**
-	 * Replace and store the Stub.
-	 *
-	 * @return string
-	 */
-	public function replaceAndStore()
-	{
+    protected $cachePrefix 	= 'model_';
+    protected $stubFilename = 'Model/Model.php' ;
+
+    public function __construct($scaffolderConfig, $modelData = null, $stubName = null)
+    {
+        if ($stubName)
+            $this->stubFilename = $stubName;
+        $this->stubsDirectory = __DIR__ . '/../../../../stubs/Api/';
+        parent::__construct($scaffolderConfig, $modelData);
+    }
+
+    /**
+     * Replace and store the Stub.
+     *
+     * @return string
+     */
+    public function replaceAndStore()
+    {
 		
-		return $this->replaceNamespace()
-				->replaceNamespaceModelExtend()
-				->setPrimaryKey()
-				->setTimeStamps()
-				->addFillable()
-				->addEnumFields()
-				->addRules()
-				->addBelongsTo()
-				->addReverseRelationship()
-				->replaceEagerCode()
-				->replaceRelationshipTables()
-				->replaceSearchConditions()
-				->replaceSimpleFilter()
-				->replaceSortConditions()
-				->replaceReverseRelationshipsFunctions()
-				->replaceCheckbox()
-				->store(new FileToCompile(false, $this->modelData->modelHash));
+        return $this->replaceNamespace()
+                ->replaceNamespaceModelExtend()
+                ->setPrimaryKey()
+                ->setTimeStamps()
+                ->addFillable()
+                ->addEnumFields()
+                ->addRules()
+                ->addBelongsTo()
+                ->addReverseRelationship()
+                ->replaceEagerCode()
+                ->replaceRelationshipTables()
+                ->replaceSearchConditions()
+                ->replaceSimpleFilter()
+                ->replaceSortConditions()
+                ->replaceReverseRelationshipsFunctions()
+                ->replaceCheckbox()
+                ->store(new FileToCompile(false, $this->modelData->modelHash));
 		
-	}
+    }
 	
-	/**
-	 * Get output filename
-	 *
-	 *
-	 * @return $this
-	 */
-	protected function getOutputFilename()
-	{
-		$folder = PathParser::parse($this->scaffolderConfig->generator->paths->models) ;
-
-		return $folder .  $this->modelName . '.php';
-	}
+    /**
+     * Get output filename
+     *
+     *
+     * @return $this
+     */
+    protected function getOutputFilename()
+    {
+        $folder = PathParser::parse($this->scaffolderConfig->generator->paths->models) ;
+
+        return $folder .  $this->modelName . '.php';
+    }
 
 	
 
-	/**
-	 * Replace the namespace which the model extends
-	 *
-	 * @param $this->scaffolderConfig
-	 *
-	 * @return $this
-	 */
-	private function replaceNamespaceModelExtend()
-	{
-		$this->stub = str_replace('{{namespace_model_extend}}', $this->scaffolderConfig->generator->inheritance->model, $this->stub);
-
-		return $this;
-	}
-
-	/**
-	 * Add fillable.
-	 *
-	 * @return $this
-	 */
-	private function addFillable()
-	{
-		$fields = '';
-		$firstIteration = true;
-
-		foreach ($this->modelData->fields as $field)
-		{
-			if($field->index == "primary")
-				continue ;
-			if($this->modelData->timeStamps && $field->name == "created_at")
-				continue ;
-			if($this->modelData->timeStamps && $field->name == "updated_at")
-				continue ;
-
-			if ($firstIteration)
-			{
-				$fields .= sprintf("'%s'," . PHP_EOL, $field->name);
-				$firstIteration = false;
-			}
-			else
-			{
-				$fields .= sprintf("\t\t'%s'," . PHP_EOL, $field->name);
-			}
-		}
-
-		$this->stub = str_replace('{{fillable}}', $fields, $this->stub);
-
-		return $this;
-	}
-
-	private function addEnumFields() {
-
-		$items = '';
-		$arrays = '';
+    /**
+     * Replace the namespace which the model extends
+     *
+     * @param $this->scaffolderConfig
+     *
+     * @return $this
+     */
+    private function replaceNamespaceModelExtend()
+    {
+        $this->stub = str_replace('{{namespace_model_extend}}', $this->scaffolderConfig->generator->inheritance->model, $this->stub);
+
+        return $this;
+    }
+
+    /**
+     * Add fillable.
+     *
+     * @return $this
+     */
+    private function addFillable()
+    {
+        $fields = '';
+        $firstIteration = true;
+
+        foreach ($this->modelData->fields as $field)
+        {
+            if($field->index == "primary")
+                continue ;
+            if($this->modelData->timeStamps && $field->name == "created_at")
+                continue ;
+            if($this->modelData->timeStamps && $field->name == "updated_at")
+                continue ;
+
+            if ($firstIteration)
+            {
+                $fields .= sprintf("'%s'," . PHP_EOL, $field->name);
+                $firstIteration = false;
+            }
+            else
+            {
+                $fields .= sprintf("\t\t'%s'," . PHP_EOL, $field->name);
+            }
+        }
+
+        $this->stub = str_replace('{{fillable}}', $fields, $this->stub);
+
+        return $this;
+    }
+
+    private function addEnumFields() {
+
+        $items = '';
+        $arrays = '';
 		
-		foreach ($this->modelData->fields as $field) {
-			$enumStub = File::get($this->stubsDirectory . '/Model/ModelEnum.php');
+        foreach ($this->modelData->fields as $field) {
+            $enumStub = File::get($this->stubsDirectory . '/Model/ModelEnum.php');
 
-			if ($field->type->db == "enum") {
-				$items = '';
+            if ($field->type->db == "enum") {
+                $items = '';
 				
-				foreach ($field->options as $key => $option) {
-					$items .= "'" . $option . "'";
-					if ($key < (count($field->options) - 1))
-						$items .= ", ";
+                foreach ($field->options as $key => $option) {
+                    $items .= "'" . $option . "'";
+                    if ($key < (count($field->options) - 1))
+                        $items .= ", ";
 
-				}
+                }
 
 
-				$enumStub = str_replace('{{field_options}}', $items, $enumStub);
-				$enumStub = str_replace('{{field_name}}', $field->name, $enumStub);	
+                $enumStub = str_replace('{{field_options}}', $items, $enumStub);
+                $enumStub = str_replace('{{field_name}}', $field->name, $enumStub);	
 					
-				$arrays .= $enumStub;
+                $arrays .= $enumStub;
 
 				
-			}
-		}
-
-		$this->stub = str_replace('{{enum}}', $arrays, $this->stub);
-
-		return $this;
-	}
-
-	/**
-	 * Set validations.
-	 *
-	 *
-	 * @return $this
-	 */
-	private function addRules()
-	{
-		$fields = '';
-		$firstIteration = true;
-
-		foreach ($this->modelData->fields as $field)
-		{
-			if($field->index == "primary")
-				continue ;
-			if($this->modelData->timeStamps && $field->name == "created_at")
-				continue ;
-			if($this->modelData->timeStamps && $field->name == "updated_at")
-				continue ;
-
-			if ($firstIteration)
-			{
-				$fields .= sprintf("'%s' => '%s'," . PHP_EOL, $field->name, $field->validations);
-				$firstIteration = false;
-			}
-			else
-			{
-				$fields .= sprintf("\t\t\t'%s' => '%s'," . PHP_EOL, $field->name, $field->validations);
-			}
-		}
-
-		$fields = str_replace('unique','unique:'.$this->modelData->tableName,$fields);
-		//var_dump($fields);
-
-		$this->stub = str_replace('{{validations}}', $fields, $this->stub);
-
-		return $this;
-	}
-
-	/**
-	 * Set the timestamps value.
-	 *
-	 */
-	private function setTimeStamps()
-	{
-		if($this->modelData->timeStamps)
-		{
-			$this->stub = str_replace('{{timestamps}}', ' ', $this->stub);
-		} else {
-			$this->stub = str_replace('{{timestamps}}', 'public $timestamps = false;', $this->stub);
-		}
-
-		return $this;
-	}
-
-	/**
-	 *  Set the primary key.
-	 *
-	 */
-	private function setPrimaryKey()
-	{
-		$primaryKey = '// Using default primary key' . PHP_EOL;
-
-		$field = $this->getPrimaryKeyField() ;
-
-		$primaryKey = 'protected $primaryKey = \'' . $field->name . '\';' . PHP_EOL;
-
-		$this->stub = str_replace('{{primaryAttribute}}', $primaryKey, $this->stub);
-
-		return $this;
-	}
-
-	/**
-	 * Add belongsTo Relationships.
-	 *
-	 *
-	 * @return $this
-	 */
-	private function addBelongsTo()
-	{
-		$functions = '';
-
-		$eagerArray = [];
+            }
+        }
+
+        $this->stub = str_replace('{{enum}}', $arrays, $this->stub);
+
+        return $this;
+    }
+
+    /**
+     * Set validations.
+     *
+     *
+     * @return $this
+     */
+    private function addRules()
+    {
+        $fields = '';
+        $firstIteration = true;
+
+        foreach ($this->modelData->fields as $field)
+        {
+            if($field->index == "primary")
+                continue ;
+            if($this->modelData->timeStamps && $field->name == "created_at")
+                continue ;
+            if($this->modelData->timeStamps && $field->name == "updated_at")
+                continue ;
+
+            if ($firstIteration)
+            {
+                $fields .= sprintf("'%s' => '%s'," . PHP_EOL, $field->name, $field->validations);
+                $firstIteration = false;
+            }
+            else
+            {
+                $fields .= sprintf("\t\t\t'%s' => '%s'," . PHP_EOL, $field->name, $field->validations);
+            }
+        }
+
+        $fields = str_replace('unique','unique:'.$this->modelData->tableName,$fields);
+        //var_dump($fields);
+
+        $this->stub = str_replace('{{validations}}', $fields, $this->stub);
+
+        return $this;
+    }
+
+    /**
+     * Set the timestamps value.
+     *
+     */
+    private function setTimeStamps()
+    {
+        if($this->modelData->timeStamps)
+        {
+            $this->stub = str_replace('{{timestamps}}', ' ', $this->stub);
+        } else {
+            $this->stub = str_replace('{{timestamps}}', 'public $timestamps = false;', $this->stub);
+        }
+
+        return $this;
+    }
+
+    /**
+     *  Set the primary key.
+     *
+     */
+    private function setPrimaryKey()
+    {
+        $primaryKey = '// Using default primary key' . PHP_EOL;
+
+        $field = $this->getPrimaryKeyField() ;
+
+        $primaryKey = 'protected $primaryKey = \'' . $field->name . '\';' . PHP_EOL;
+
+        $this->stub = str_replace('{{primaryAttribute}}', $primaryKey, $this->stub);
+
+        return $this;
+    }
+
+    /**
+     * Add belongsTo Relationships.
+     *
+     *
+     * @return $this
+     */
+    private function addBelongsTo()
+    {
+        $functions = '';
+
+        $eagerArray = [];
 		
-		foreach ($this->modelData->fields as $field)
-		{
+        foreach ($this->modelData->fields as $field)
+        {
 			
-			// Check foreign key
-			if (isset($field->foreignKey->relationship))
-			{
-				$belongsToStub = "";
-				$functionName = $field->foreignKey->table;
-
-				if ($field->foreignKey->relationship == "belongsTo") {
-					$belongsToOriginalStub = File::get($this->stubsDirectory . '/Model/ModelBelongsTo.php');
-					$belongsToStub = str_replace('{{foreign_model}}', CamelCase::convertToCamelCase($field->foreignKey->table), $belongsToOriginalStub);
-					$belongsToStub = str_replace('{{field}}', $field->name, $belongsToStub);
-					$belongsToStub = str_replace('{{foreign_field}}', $field->foreignKey->field, $belongsToStub);
-				}
-				elseif ($field->foreignKey->relationship == "belongsToMany") {
-					$belongsToOriginalStub = File::get($this->stubsDirectory . '/Model/ModelBelongsToMany.php');
-					$functionName = CamelCase::pluralize($field->foreignKey->table);
-					$belongsToStub = str_replace('{{foreign_model}}', CamelCase::convertToCamelCase($field->foreignKey->table), $belongsToOriginalStub);
-					$belongsToStub = str_replace('{{foreign_key}}', $field->name, $belongsToStub);
-					$belongsToStub = str_replace('{{related_field}}', $field->foreignKey->field, $belongsToStub);
-					$belongsToStub = str_replace('{{table_name}}', $field->foreignKey->table, $belongsToStub);
-				}
+            // Check foreign key
+            if (isset($field->foreignKey->relationship))
+            {
+                $belongsToStub = "";
+                $functionName = $field->foreignKey->table;
+
+                if ($field->foreignKey->relationship == "belongsTo") {
+                    $belongsToOriginalStub = File::get($this->stubsDirectory . '/Model/ModelBelongsTo.php');
+                    $belongsToStub = str_replace('{{foreign_model}}', CamelCase::convertToCamelCase($field->foreignKey->table), $belongsToOriginalStub);
+                    $belongsToStub = str_replace('{{field}}', $field->name, $belongsToStub);
+                    $belongsToStub = str_replace('{{foreign_field}}', $field->foreignKey->field, $belongsToStub);
+                }
+                elseif ($field->foreignKey->relationship == "belongsToMany") {
+                    $belongsToOriginalStub = File::get($this->stubsDirectory . '/Model/ModelBelongsToMany.php');
+                    $functionName = CamelCase::pluralize($field->foreignKey->table);
+                    $belongsToStub = str_replace('{{foreign_model}}', CamelCase::convertToCamelCase($field->foreignKey->table), $belongsToOriginalStub);
+                    $belongsToStub = str_replace('{{foreign_key}}', $field->name, $belongsToStub);
+                    $belongsToStub = str_replace('{{related_field}}', $field->foreignKey->field, $belongsToStub);
+                    $belongsToStub = str_replace('{{table_name}}', $field->foreignKey->table, $belongsToStub);
+                }
 				
-				$belongsToStub = str_replace('{{foreign_table}}', $functionName, $belongsToStub);
-				$belongsToStub = str_replace('{{model_namespace}}', $this->scaffolderConfig->generator->namespaces->models, $belongsToStub);
+                $belongsToStub = str_replace('{{foreign_table}}', $functionName, $belongsToStub);
+                $belongsToStub = str_replace('{{model_namespace}}', $this->scaffolderConfig->generator->namespaces->models, $belongsToStub);
 				
-				$functions .= $belongsToStub ;
+                $functions .= $belongsToStub ;
 
-				if(isset($field->foreignKey->eager) && $field->foreignKey->eager){
-					array_push($eagerArray, "'".$field->foreignKey->table."'");
-				}
-			}
+                if(isset($field->foreignKey->eager) && $field->foreignKey->eager){
+                    array_push($eagerArray, "'".$field->foreignKey->table."'");
+                }
+            }
 
 			
-		}
+        }
 
-		$this->stub = str_replace('{{belongsTo}}', $functions, $this->stub);
+        $this->stub = str_replace('{{belongsTo}}', $functions, $this->stub);
 
-		$this->stub = str_replace('{{eager}}', join("," , $eagerArray) , $this->stub);
+        $this->stub = str_replace('{{eager}}', join("," , $eagerArray) , $this->stub);
 
-		return $this;
-	}
+        return $this;
+    }
 
-	private function addReverseRelationship()
-	{
-		$functions = '';
+    private function addReverseRelationship()
+    {
+        $functions = '';
 
-		$eagerArray = [];
+        $eagerArray = [];
 
-		foreach ($this->modelData->reverseRelationships as $relationship)
-		{
+        foreach ($this->modelData->reverseRelationships as $relationship)
+        {
 			
-			// Check foreign key
-			if ($relationship->foreignKey)
-			{
-				$reverseRelationshipStub = "";
-				$functionName = '';
-				if ($relationship->type == "hasOne")
-					$functionName = strtolower($relationship->modelName);
-				else 
-					$functionName = CamelCase::pluralize(strtolower($relationship->modelName));
+            // Check foreign key
+            if ($relationship->foreignKey)
+            {
+                $reverseRelationshipStub = "";
+                $functionName = '';
+                if ($relationship->type == "hasOne")
+                    $functionName = strtolower($relationship->modelName);
+                else 
+                    $functionName = CamelCase::pluralize(strtolower($relationship->modelName));
 				
-				if ($relationship->type == "belongsToMany") {
-					$reverseRelationshipOriginalStub = File::get($this->stubsDirectory . '/Model/ModelBelongsToMany.php');
-					$reverseRelationshipStub = str_replace('{{foreign_model}}', CamelCase::convertToCamelCase($relationship->relatedTable), $reverseRelationshipOriginalStub);
-					$reverseRelationshipStub = str_replace('{{foreign_key}}', $relationship->foreignKey, $reverseRelationshipStub);
-					$reverseRelationshipStub = str_replace('{{table_name}}', $relationship->tableName, $reverseRelationshipStub);
-					$reverseRelationshipStub = str_replace('{{related_field}}', $relationship->relatedField, $reverseRelationshipStub);
-					$reverseRelationshipStub = str_replace('{{foreign_table}}', CamelCase::pluralize(strtolower($relationship->relatedTable)), $reverseRelationshipStub);
-				}
-				else {
-					$reverseRelationshipOriginalStub = File::get($this->stubsDirectory . '/Model/ModelReverseRelationship.php');
-					$reverseRelationshipStub = str_replace('{{foreign_model}}', $relationship->modelName, $reverseRelationshipOriginalStub);
-					$reverseRelationshipStub = str_replace('{{field}}', $relationship->foreignKey, $reverseRelationshipStub);
-					$reverseRelationshipStub = str_replace('{{foreign_field}}', $relationship->localKey, $reverseRelationshipStub);
-					$reverseRelationshipStub = str_replace('{{type}}', $relationship->type, $reverseRelationshipStub);
-					$reverseRelationshipStub = str_replace('{{foreign_table}}', $functionName, $reverseRelationshipStub);
-				}
+                if ($relationship->type == "belongsToMany") {
+                    $reverseRelationshipOriginalStub = File::get($this->stubsDirectory . '/Model/ModelBelongsToMany.php');
+                    $reverseRelationshipStub = str_replace('{{foreign_model}}', CamelCase::convertToCamelCase($relationship->relatedTable), $reverseRelationshipOriginalStub);
+                    $reverseRelationshipStub = str_replace('{{foreign_key}}', $relationship->foreignKey, $reverseRelationshipStub);
+                    $reverseRelationshipStub = str_replace('{{table_name}}', $relationship->tableName, $reverseRelationshipStub);
+                    $reverseRelationshipStub = str_replace('{{related_field}}', $relationship->relatedField, $reverseRelationshipStub);
+                    $reverseRelationshipStub = str_replace('{{foreign_table}}', CamelCase::pluralize(strtolower($relationship->relatedTable)), $reverseRelationshipStub);
+                }
+                else {
+                    $reverseRelationshipOriginalStub = File::get($this->stubsDirectory . '/Model/ModelReverseRelationship.php');
+                    $reverseRelationshipStub = str_replace('{{foreign_model}}', $relationship->modelName, $reverseRelationshipOriginalStub);
+                    $reverseRelationshipStub = str_replace('{{field}}', $relationship->foreignKey, $reverseRelationshipStub);
+                    $reverseRelationshipStub = str_replace('{{foreign_field}}', $relationship->localKey, $reverseRelationshipStub);
+                    $reverseRelationshipStub = str_replace('{{type}}', $relationship->type, $reverseRelationshipStub);
+                    $reverseRelationshipStub = str_replace('{{foreign_table}}', $functionName, $reverseRelationshipStub);
+                }
 					
-				$reverseRelationshipStub = str_replace('{{model_namespace}}', $this->scaffolderConfig->generator->namespaces->models, $reverseRelationshipStub);
+                $reverseRelationshipStub = str_replace('{{model_namespace}}', $this->scaffolderConfig->generator->namespaces->models, $reverseRelationshipStub);
 				
-				$functions .= $reverseRelationshipStub ;
+                $functions .= $reverseRelationshipStub ;
 
-				if(isset($relationship->foreignKey->eager) && $relationship->foreignKey->eager){
-					array_push($eagerArray, "'".$relationship->foreignKey->table."'");
-				}
-			}
+                if(isset($relationship->foreignKey->eager) && $relationship->foreignKey->eager){
+                    array_push($eagerArray, "'".$relationship->foreignKey->table."'");
+                }
+            }
 
 			
-		}
+        }
 
-		$this->stub = str_replace('{{reverseRelationship}}', $functions, $this->stub);
+        $this->stub = str_replace('{{reverseRelationship}}', $functions, $this->stub);
 
 
-		return $this;
-	}
+        return $this;
+    }
 
 
-	/**
-	 * Replace eager code for each foreing key with eager = true 
-	 *
-	 * @return $this
-	 */
-	private function replaceEagerCode()
-	{
-		$storeCommands = $updateCommands = $ruleCommands = $useCommands = '';
-		$eagerConditions = $eagerJoins = '';
+    /**
+     * Replace eager code for each foreing key with eager = true 
+     *
+     * @return $this
+     */
+    private function replaceEagerCode()
+    {
+        $storeCommands = $updateCommands = $ruleCommands = $useCommands = '';
+        $eagerConditions = $eagerJoins = '';
 
-		$storeEagerStubOriginal = File::get($this->stubsDirectory . 'StoreEager.php');
-		$updateEagerStubOriginal = File::get($this->stubsDirectory . 'UpdateEager.php');
-		$rulesEagerStubOriginal = File::get($this->stubsDirectory . 'RulesEager.php');
-		$useEagerStubOriginal = File::get($this->stubsDirectory . 'UseEager.php');
-		$joinEagerStubOriginal = File::get($this->stubsDirectory . 'SearchConditions/JoinEager.php');
+        $storeEagerStubOriginal = File::get($this->stubsDirectory . 'StoreEager.php');
+        $updateEagerStubOriginal = File::get($this->stubsDirectory . 'UpdateEager.php');
+        $rulesEagerStubOriginal = File::get($this->stubsDirectory . 'RulesEager.php');
+        $useEagerStubOriginal = File::get($this->stubsDirectory . 'UseEager.php');
+        $joinEagerStubOriginal = File::get($this->stubsDirectory . 'SearchConditions/JoinEager.php');
 
-		foreach ($this->modelData->fields as $field)
-		{
+        foreach ($this->modelData->fields as $field)
+        {
 			
-			// Check foreign key
-			if ($field->foreignKey && isset($field->foreignKey->eager) && $field->foreignKey->eager)
-			{
-
-				$storeCommands 	.= str_replace('{{foreign_model_name}}', CamelCase::convertToCamelCase($field->foreignKey->table), $this->replaceForeingStrings($field, $storeEagerStubOriginal));
-				$updateCommands	.= str_replace('{{foreign_model_name}}', CamelCase::convertToCamelCase($field->foreignKey->table), $this->replaceForeingStrings($field, $updateEagerStubOriginal)) ;
-				$ruleCommands	.= str_replace('{{foreign_model_name}}', CamelCase::convertToCamelCase($field->foreignKey->table), $this->replaceForeingStrings($field, $rulesEagerStubOriginal)) ;
-				$useCommands	.= str_replace('{{foreign_model_name}}', CamelCase::convertToCamelCase($field->foreignKey->table), $this->replaceForeingStrings($field, $useEagerStubOriginal)) ;
-				$eagerJoins		.= $this->replaceForeingStrings($field, $joinEagerStubOriginal) ;
-
-				// search eager fields
-				$foreignModelData = $this->getModelData($field->foreignKey->table);
-				$foreignControllerCompiler = new ControllerCompiler($this->scaffolderConfig, $foreignModelData);
-				$foreignControllerCompiler->setEagerTable($this->modelData->tableName);
-				$eagerConditions 	.= $foreignControllerCompiler->getSearchConditions();
-				$eagerUniqueRules = $foreignControllerCompiler->getEagerUniqueRules();
-				$eagerUniqueRules = str_replace("{{class_name_lw}}", strtolower($this->modelName), $eagerUniqueRules);
-				$eagerUniqueRules = str_replace("{{field}}", $field->name, $eagerUniqueRules);
-				$ruleCommands = str_replace('{{unique_eager_rules}}', $eagerUniqueRules, $ruleCommands) ;
-			}
-
-		}
-
-		$this->stub = str_replace('{{store_eager_objects}}', $storeCommands, $this->stub);
-		$this->stub = str_replace('{{update_eager_objects}}', $updateCommands, $this->stub);
-		$this->stub = str_replace('{{rules_eager}}', $ruleCommands, $this->stub);
-		$this->stub = str_replace('{{eager_use_classes}}', $useCommands, $this->stub);
-		$this->stub = str_replace('{{eager_joins}}', $eagerJoins, $this->stub);
-		$this->stub = str_replace('{{eager_conditions}}', $eagerConditions, $this->stub);
-		$this->stub = str_replace('{{eager_table}}', $this->eagerTable, $this->stub);
+            // Check foreign key
+            if ($field->foreignKey && isset($field->foreignKey->eager) && $field->foreignKey->eager)
+            {
+
+                $storeCommands 	.= str_replace('{{foreign_model_name}}', CamelCase::convertToCamelCase($field->foreignKey->table), $this->replaceForeingStrings($field, $storeEagerStubOriginal));
+                $updateCommands	.= str_replace('{{foreign_model_name}}', CamelCase::convertToCamelCase($field->foreignKey->table), $this->replaceForeingStrings($field, $updateEagerStubOriginal)) ;
+                $ruleCommands	.= str_replace('{{foreign_model_name}}', CamelCase::convertToCamelCase($field->foreignKey->table), $this->replaceForeingStrings($field, $rulesEagerStubOriginal)) ;
+                $useCommands	.= str_replace('{{foreign_model_name}}', CamelCase::convertToCamelCase($field->foreignKey->table), $this->replaceForeingStrings($field, $useEagerStubOriginal)) ;
+                $eagerJoins		.= $this->replaceForeingStrings($field, $joinEagerStubOriginal) ;
+
+                // search eager fields
+                $foreignModelData = $this->getModelData($field->foreignKey->table);
+                $foreignControllerCompiler = new ControllerCompiler($this->scaffolderConfig, $foreignModelData);
+                $foreignControllerCompiler->setEagerTable($this->modelData->tableName);
+                $eagerConditions 	.= $foreignControllerCompiler->getSearchConditions();
+                $eagerUniqueRules = $foreignControllerCompiler->getEagerUniqueRules();
+                $eagerUniqueRules = str_replace("{{class_name_lw}}", strtolower($this->modelName), $eagerUniqueRules);
+                $eagerUniqueRules = str_replace("{{field}}", $field->name, $eagerUniqueRules);
+                $ruleCommands = str_replace('{{unique_eager_rules}}', $eagerUniqueRules, $ruleCommands) ;
+            }
+
+        }
+
+        $this->stub = str_replace('{{store_eager_objects}}', $storeCommands, $this->stub);
+        $this->stub = str_replace('{{update_eager_objects}}', $updateCommands, $this->stub);
+        $this->stub = str_replace('{{rules_eager}}', $ruleCommands, $this->stub);
+        $this->stub = str_replace('{{eager_use_classes}}', $useCommands, $this->stub);
+        $this->stub = str_replace('{{eager_joins}}', $eagerJoins, $this->stub);
+        $this->stub = str_replace('{{eager_conditions}}', $eagerConditions, $this->stub);
+        $this->stub = str_replace('{{eager_table}}', $this->eagerTable, $this->stub);
 		
 
 
-		return $this;
-	}
+        return $this;
+    }
 
-	/**
-	 * replace relationship tables
-	 *
-	 * @return $this
-	 */
-	public function replaceRelationshipTables() {
+    /**
+     * replace relationship tables
+     *
+     * @return $this
+     */
+    public function replaceRelationshipTables() {
 
-		$functions = "";
-		$functionsCall = "";
-		$removeAll = "";
-		$removeAllCall = "";
-		$includes = "";
-		$joins = "";
-		$joinSorts = "";
+        $functions = "";
+        $functionsCall = "";
+        $removeAll = "";
+        $removeAllCall = "";
+        $includes = "";
+        $joins = "";
+        $joinSorts = "";
 
-		$method = File::get($this->stubsDirectory . '/Model/ModelRelationshipTable.php');
+        $method = File::get($this->stubsDirectory . '/Model/ModelRelationshipTable.php');
 
-		foreach ($this->modelData->reverseRelationships as $relationship) {
+        foreach ($this->modelData->reverseRelationships as $relationship) {
 
-			if ($relationship->type == "belongsToMany") {
-				$relatedTablePluralized = CamelCase::pluralize($relationship->relatedTable);
-				$relatedTablePluralizedUc = CamelCase::pluralize(CamelCase::convertToCamelCase($relationship->relatedTable));
+            if ($relationship->type == "belongsToMany") {
+                $relatedTablePluralized = CamelCase::pluralize($relationship->relatedTable);
+                $relatedTablePluralizedUc = CamelCase::pluralize(CamelCase::convertToCamelCase($relationship->relatedTable));
 
-				$replacedMethod = '';
-				$replacedMethod = str_replace('{{related_table_pl_uc}}', $relatedTablePluralizedUc, $method);
-				$replacedMethod = str_replace('{{class_name_lw}}', $this->modelData->tableName, $replacedMethod);
-				$replacedMethod = str_replace('{{related_table_pl}}', $relatedTablePluralized, $replacedMethod);
-				$replacedMethod = str_replace('{{foreign_key}}', $relationship->foreignKey, $replacedMethod);
-				$replacedMethod = str_replace('{{related_field}}', $relationship->relatedField, $replacedMethod);
-				$replacedMethod = str_replace('{{foreign_table_lw}}', strtolower($relationship->modelName), $replacedMethod);
-				$replacedMethod = str_replace('{{foreign_table}}', $relationship->modelName, $replacedMethod);
+                $replacedMethod = '';
+                $replacedMethod = str_replace('{{related_table_pl_uc}}', $relatedTablePluralizedUc, $method);
+                $replacedMethod = str_replace('{{class_name_lw}}', $this->modelData->tableName, $replacedMethod);
+                $replacedMethod = str_replace('{{related_table_pl}}', $relatedTablePluralized, $replacedMethod);
+                $replacedMethod = str_replace('{{foreign_key}}', $relationship->foreignKey, $replacedMethod);
+                $replacedMethod = str_replace('{{related_field}}', $relationship->relatedField, $replacedMethod);
+                $replacedMethod = str_replace('{{foreign_table_lw}}', strtolower($relationship->modelName), $replacedMethod);
+                $replacedMethod = str_replace('{{foreign_table}}', $relationship->modelName, $replacedMethod);
 
-				$functions .= $replacedMethod;
+                $functions .= $replacedMethod;
 
-				$methodCall = 'if (array_key_exists(\'{{related_table_pl}}\', $vars))';
-				$methodCall .= "\n\t\t\t";
-				$methodCall .= '$this->save{{related_table_pl_uc}}($vars, ${{class_name_lw}});';
-				$methodCall = str_replace('{{related_table_pl_uc}}', $relatedTablePluralizedUc, $methodCall);
-				$methodCall = str_replace('{{related_table_pl}}', $relatedTablePluralized, $methodCall);
-				$methodCall = str_replace('{{class_name_lw}}', $this->modelData->tableName, $methodCall);
+                $methodCall = 'if (array_key_exists(\'{{related_table_pl}}\', $vars))';
+                $methodCall .= "\n\t\t\t";
+                $methodCall .= '$this->save{{related_table_pl_uc}}($vars, ${{class_name_lw}});';
+                $methodCall = str_replace('{{related_table_pl_uc}}', $relatedTablePluralizedUc, $methodCall);
+                $methodCall = str_replace('{{related_table_pl}}', $relatedTablePluralized, $methodCall);
+                $methodCall = str_replace('{{class_name_lw}}', $this->modelData->tableName, $methodCall);
 
-				$functionsCall .= $methodCall . "\n\t\t";
+                $functionsCall .= $methodCall . "\n\t\t";
 				
-				$removeAllMethod = File::get($this->stubsDirectory . '/Controller/ControllerRemoveAll.php');
-				$removeAllMethod = str_replace('{{related_table_pl_uc}}', $relatedTablePluralizedUc, $removeAllMethod);
-				$removeAllMethod = str_replace('{{foreign_key}}', $relationship->foreignKey, $removeAllMethod);
-				$removeAllMethod = str_replace('{{foreign_table}}', $relationship->modelName, $removeAllMethod);
-				$removeAllMethod = str_replace('{{foreign_table_lw_pl}}', CamelCase::pluralize(strtolower($relationship->modelName)), $removeAllMethod);
+                $removeAllMethod = File::get($this->stubsDirectory . '/Controller/ControllerRemoveAll.php');
+                $removeAllMethod = str_replace('{{related_table_pl_uc}}', $relatedTablePluralizedUc, $removeAllMethod);
+                $removeAllMethod = str_replace('{{foreign_key}}', $relationship->foreignKey, $removeAllMethod);
+                $removeAllMethod = str_replace('{{foreign_table}}', $relationship->modelName, $removeAllMethod);
+                $removeAllMethod = str_replace('{{foreign_table_lw_pl}}', CamelCase::pluralize(strtolower($relationship->modelName)), $removeAllMethod);
 				
-				$removeAll .= $removeAllMethod;
+                $removeAll .= $removeAllMethod;
 
-				$removeAllCallMethod = '$this->deleteAll{{related_table_pl_uc}}(${{class_name_lw}}[\'id\']);';
-				$removeAllCallMethod = str_replace('{{related_table_pl_uc}}', $relatedTablePluralizedUc, $removeAllCallMethod);
-				$removeAllCallMethod = str_replace('{{class_name_lw}}', $this->modelData->tableName, $removeAllCallMethod);
+                $removeAllCallMethod = '$this->deleteAll{{related_table_pl_uc}}(${{class_name_lw}}[\'id\']);';
+                $removeAllCallMethod = str_replace('{{related_table_pl_uc}}', $relatedTablePluralizedUc, $removeAllCallMethod);
+                $removeAllCallMethod = str_replace('{{class_name_lw}}', $this->modelData->tableName, $removeAllCallMethod);
 				
-				$removeAllCall .= $removeAllCallMethod . "\n\t\t";
+                $removeAllCall .= $removeAllCallMethod . "\n\t\t";
 
-				$joinRelationshipTableStub = File::get($this->stubsDirectory . 'SearchConditions/joinRelationshipTable.php');
-				$joinRelationshipTableStub = str_replace('{{class_name_lw}}', $this->modelData->tableName, $joinRelationshipTableStub);
-				$joinRelationshipTableStub = str_replace('{{related_table_pl}}', $relatedTablePluralized, $joinRelationshipTableStub);
-				$joinRelationshipTableStub = str_replace('{{related_table}}', CamelCase::convertToCamelCase($relationship->relatedTable), $joinRelationshipTableStub);
-				$joinRelationshipTableStub = str_replace('{{foreign_key}}', $relationship->foreignKey, $joinRelationshipTableStub);
-				$joinRelationshipTableStub = str_replace('{{related_field}}', $relationship->relatedField, $joinRelationshipTableStub);
-				$joinRelationshipTableStub = str_replace('{{foreign_table}}', $relationship->tableName, $joinRelationshipTableStub);
+                $joinRelationshipTableStub = File::get($this->stubsDirectory . 'SearchConditions/joinRelationshipTable.php');
+                $joinRelationshipTableStub = str_replace('{{class_name_lw}}', $this->modelData->tableName, $joinRelationshipTableStub);
+                $joinRelationshipTableStub = str_replace('{{related_table_pl}}', $relatedTablePluralized, $joinRelationshipTableStub);
+                $joinRelationshipTableStub = str_replace('{{related_table}}', CamelCase::convertToCamelCase($relationship->relatedTable), $joinRelationshipTableStub);
+                $joinRelationshipTableStub = str_replace('{{foreign_key}}', $relationship->foreignKey, $joinRelationshipTableStub);
+                $joinRelationshipTableStub = str_replace('{{related_field}}', $relationship->relatedField, $joinRelationshipTableStub);
+                $joinRelationshipTableStub = str_replace('{{foreign_table}}', $relationship->tableName, $joinRelationshipTableStub);
 
-				$joins .= $joinRelationshipTableStub . "\n";
+                $joins .= $joinRelationshipTableStub . "\n";
 
-				$use = 'use App\Models\{{foreign_table}};';
-				$use = str_replace('{{foreign_table}}', $relationship->modelName, $use);
+                $use = 'use App\Models\{{foreign_table}};';
+                $use = str_replace('{{foreign_table}}', $relationship->modelName, $use);
 
-				$includes .= $use . "\n";
-			}
-		}
+                $includes .= $use . "\n";
+            }
+        }
 
-		$this->stub = str_replace('{{relationship_tables_store}}', $functions, $this->stub);
+        $this->stub = str_replace('{{relationship_tables_store}}', $functions, $this->stub);
 
-		$this->stub = str_replace('{{relationship_tables_call}}', $functionsCall, $this->stub);
+        $this->stub = str_replace('{{relationship_tables_call}}', $functionsCall, $this->stub);
 
-		$this->stub = str_replace('{{remove_relationship_objects}}', $removeAll, $this->stub);
+        $this->stub = str_replace('{{remove_relationship_objects}}', $removeAll, $this->stub);
 
-		$this->stub = str_replace('{{remove_relationship_objects_call}}', $removeAllCall, $this->stub);
+        $this->stub = str_replace('{{remove_relationship_objects_call}}', $removeAllCall, $this->stub);
 
-		$this->stub = str_replace('{{relationship_tables_classes}}', $includes, $this->stub);
+        $this->stub = str_replace('{{relationship_tables_classes}}', $includes, $this->stub);
 
-		$this->stub = str_replace('{{relationship_tables_joins}}', $joins, $this->stub);
+        $this->stub = str_replace('{{relationship_tables_joins}}', $joins, $this->stub);
 
 		
 		
-		return $this;
+        return $this;
 
-	}
+    }
 
 
-	/**
-	 * Replace search conditions
-	 *
-	 * @return $this
-	 */
-	private function replaceSearchConditions(){
+    /**
+     * Replace search conditions
+     *
+     * @return $this
+     */
+    private function replaceSearchConditions(){
 
-		$searchConditions = $this->getSearchConditions();
+        $searchConditions = $this->getSearchConditions();
 
-		$this->stub = str_replace('{{conditions}}', $searchConditions, $this->stub);
+        $this->stub = str_replace('{{conditions}}', $searchConditions, $this->stub);
 
-		return $this;
-	}
+        return $this;
+    }
 
-	/**
-	 * get search conditions
-	 *
-	 * @return $this
-	 */
-	public function getSearchConditions(){
+    /**
+     * get search conditions
+     *
+     * @return $this
+     */
+    public function getSearchConditions(){
 
-		$fieldConditions = '';
+        $fieldConditions = '';
 
-		$searchConditions = File::get($this->stubsDirectory . '/SearchConditions/Conditions.php');
+        $searchConditions = File::get($this->stubsDirectory . '/SearchConditions/Conditions.php');
 
-		foreach ($this->modelData->fields as $field)
-		{
+        foreach ($this->modelData->fields as $field)
+        {
 
-			$fieldConditions .= $this->replaceFieldStrings($field, $this->getConditionStubByField($field)) ;
+            $fieldConditions .= $this->replaceFieldStrings($field, $this->getConditionStubByField($field)) ;
 
-		}
+        }
 
-		// replace all field conditions
-		$searchConditions = str_replace('{{field_conditions}}', $fieldConditions, $searchConditions);
+        // replace all field conditions
+        $searchConditions = str_replace('{{field_conditions}}', $fieldConditions, $searchConditions);
 
-		// replace table name
-		$searchConditions = str_replace('{{table_name}}', $this->modelData->tableName, $searchConditions);
+        // replace table name
+        $searchConditions = str_replace('{{table_name}}', $this->modelData->tableName, $searchConditions);
 
-		return $searchConditions ;
+        return $searchConditions ;
 
-	}
+    }
 
-	/**
-	 * get search conditions stub by db type
-	 *
-	 * @param string $field
-	 *
-	 * @return $this
-	 */
-	private $conditionsStub = [];
-	private function getConditionStubByField($field){
+    /**
+     * get search conditions stub by db type
+     *
+     * @param string $field
+     *
+     * @return $this
+     */
+    private $conditionsStub = [];
+    private function getConditionStubByField($field){
 		
-		if($field->index == 'primary'){
-			$dbType = 'primary' ;
-		}
-		elseif($field->foreignKey){
-			$dbType = 'primary' ;
-		}
-		elseif($field->type->db == 'enum'){
-			$dbType = 'primary' ;
-		}
-		elseif($field->type->db == 'boolean'){
-			$dbType = 'primary' ;
-		}
-		elseif($field->type->db == 'text'){
-			$dbType = 'string' ;
-		}
-		else {
-			$dbType = $field->type->db ;
-		}
-
-		if(array_key_exists($dbType, $this->conditionsStub)){
-			return $this->conditionsStub[$dbType];
-		}
-		else {
-			$this->conditionsStub[$dbType] = File::get($this->stubsDirectory . 'SearchConditions/'. ucwords($dbType). '.php');;
-
-			return $this->conditionsStub[$dbType];
-		}
-	}
-
-	public function replaceSortConditions()	{
-		$joinSorts = '';
-
-		foreach ($this->modelData->fields as $field) {
-			if($field->foreignKey){
-				$joinSortStub = File::get($this->stubsDirectory . 'SearchConditions/JoinSort.php');
-				$joinSortStub = str_replace('{{field}}', $field->name, $joinSortStub);
-				$joinSortStub = str_replace('{{foreign_table}}', $field->foreignKey->table, $joinSortStub);
-				$joinSortStub = str_replace('{{foreign_key}}', $field->foreignKey->table, $joinSortStub);
-				$joinSorts .= $joinSortStub;
-
-			}
+        if($field->index == 'primary'){
+            $dbType = 'primary' ;
+        }
+        elseif($field->foreignKey){
+            $dbType = 'primary' ;
+        }
+        elseif($field->type->db == 'enum'){
+            $dbType = 'primary' ;
+        }
+        elseif($field->type->db == 'boolean'){
+            $dbType = 'primary' ;
+        }
+        elseif($field->type->db == 'text'){
+            $dbType = 'string' ;
+        }
+        else {
+            $dbType = $field->type->db ;
+        }
+
+        if(array_key_exists($dbType, $this->conditionsStub)){
+            return $this->conditionsStub[$dbType];
+        }
+        else {
+            $this->conditionsStub[$dbType] = File::get($this->stubsDirectory . 'SearchConditions/'. ucwords($dbType). '.php');;
+
+            return $this->conditionsStub[$dbType];
+        }
+    }
+
+    public function replaceSortConditions()	{
+        $joinSorts = '';
+
+        foreach ($this->modelData->fields as $field) {
+            if($field->foreignKey){
+                $joinSortStub = File::get($this->stubsDirectory . 'SearchConditions/JoinSort.php');
+                $joinSortStub = str_replace('{{field}}', $field->name, $joinSortStub);
+                $joinSortStub = str_replace('{{foreign_table}}', $field->foreignKey->table, $joinSortStub);
+                $joinSortStub = str_replace('{{foreign_key}}', $field->foreignKey->table, $joinSortStub);
+                $joinSorts .= $joinSortStub;
+
+            }
 			
 	
 			
-		}
+        }
 		
 
-		$this->stub = str_replace('{{relationship_tables_joins_sort}}', $joinSorts, $this->stub);
+        $this->stub = str_replace('{{relationship_tables_joins_sort}}', $joinSorts, $this->stub);
 
-		return $this;
-	}
+        return $this;
+    }
 
 
 
-	/**
-	 * replace reverse relationships
-	 *
-	 * @return $this
-	 */
-	public function replaceReverseRelationshipsFunctions(){
+    /**
+     * replace reverse relationships
+     *
+     * @return $this
+     */
+    public function replaceReverseRelationshipsFunctions(){
 
-		$functions = '';
+        $functions = '';
 
-		$method = File::get($this->stubsDirectory . '/Model/ModelReverseRelationshipFunctions.php');
+        $method = File::get($this->stubsDirectory . '/Model/ModelReverseRelationshipFunctions.php');
 
-		foreach ($this->modelData->reverseRelationships as $relationship)
-		{
-			$functionName = '';
-			if ($relationship->type == "hasOne")
-				$functionName = strtolower($relationship->modelName);
-			elseif ($relationship->type == "belongsToMany") 
-				$functionName = CamelCase::pluralize(strtolower($relationship->relatedTable));
-			else 
-				$functionName = CamelCase::pluralize(strtolower($relationship->modelName));
+        foreach ($this->modelData->reverseRelationships as $relationship)
+        {
+            $functionName = '';
+            if ($relationship->type == "hasOne")
+                $functionName = strtolower($relationship->modelName);
+            elseif ($relationship->type == "belongsToMany") 
+                $functionName = CamelCase::pluralize(strtolower($relationship->relatedTable));
+            else 
+                $functionName = CamelCase::pluralize(strtolower($relationship->modelName));
 
-			$replacedMethod = '';
-			$replacedMethod = str_replace('{{function_name}}', $functionName, $method);
-			$replacedMethod = str_replace('{{class_name_lw}}', $this->modelData->tableName, $replacedMethod);
-			$replacedMethod = str_replace('{{class_name}}', ucwords($this->modelData->tableName), $replacedMethod);
+            $replacedMethod = '';
+            $replacedMethod = str_replace('{{function_name}}', $functionName, $method);
+            $replacedMethod = str_replace('{{class_name_lw}}', $this->modelData->tableName, $replacedMethod);
+            $replacedMethod = str_replace('{{class_name}}', ucwords($this->modelData->tableName), $replacedMethod);
 
-			$functions .= $replacedMethod;
-		}
+            $functions .= $replacedMethod;
+        }
 
-		$this->stub = str_replace('{{reverseRelationshipFunctions}}', $functions, $this->stub);
+        $this->stub = str_replace('{{reverseRelationshipFunctions}}', $functions, $this->stub);
 
-		return $this;
+        return $this;
 
-	}
+    }
 
 
-	/**
-	 * replace checkbox fields
-	 *
-	 * @return $this
-	 */
-	public function replaceCheckbox(){
+    /**
+     * replace checkbox fields
+     *
+     * @return $this
+     */
+    public function replaceCheckbox(){
 
-		$method = File::get($this->stubsDirectory . '/Model/ModelCheckbox.php');
-		$key = false;
+        $method = File::get($this->stubsDirectory . '/Model/ModelCheckbox.php');
+        $key = false;
 
-		$method = str_replace('{{class_name_lw}}', $this->modelData->tableName, $method);
-		$method = str_replace('{{class_name}}', ucwords($this->modelData->tableName), $method);
-		$method = str_replace('{{model_name}}', $this->modelData->modelName, $method);
-		$this->stub = str_replace('{{checkbox}}', $method, $this->stub);
+        $method = str_replace('{{class_name_lw}}', $this->modelData->tableName, $method);
+        $method = str_replace('{{class_name}}', ucwords($this->modelData->tableName), $method);
+        $method = str_replace('{{model_name}}', $this->modelData->modelName, $method);
+        $this->stub = str_replace('{{checkbox}}', $method, $this->stub);
 
-		return $this;
+        return $this;
 
-	}
+    }
 
 
-	/**
-	 * Replace simple filter
-	 *
-	 * @return $this
-	 */
-	private function replaceSimpleFilter(){
-		$i = 0;
+    /**
+     * Replace simple filter
+     *
+     * @return $this
+     */
+    private function replaceSimpleFilter(){
+        $i = 0;
 
-		$stubSimpleFilter = '';
+        $stubSimpleFilter = '';
 
-		foreach ($this->modelData->fields as $field)
-		{
-			//var_dump($field->name);
+        foreach ($this->modelData->fields as $field)
+        {
+            //var_dump($field->name);
 			
-			if($field->index == 'primary'){
-				$dbType = 'primaryKey' ;
-			}
-			elseif($field->foreignKey){
-				$dbType = 'primary' ;
-			}
-			elseif($field->type->db == 'enum'){
-				$dbType = 'primary' ;
-			}
-			elseif($field->type->db == 'boolean'){
-				$dbType = 'primary' ;
-			}
-			elseif($field->type->db == 'text'){
-				$dbType = 'string' ;
-			}
-			else {
-				$dbType = $field->type->db ;
-			}
+            if($field->index == 'primary'){
+                $dbType = 'primaryKey' ;
+            }
+            elseif($field->foreignKey){
+                $dbType = 'primary' ;
+            }
+            elseif($field->type->db == 'enum'){
+                $dbType = 'primary' ;
+            }
+            elseif($field->type->db == 'boolean'){
+                $dbType = 'primary' ;
+            }
+            elseif($field->type->db == 'text'){
+                $dbType = 'string' ;
+            }
+            else {
+                $dbType = $field->type->db ;
+            }
 			
-			if($dbType == 'primaryKey')
-			{
-				$stubSimpleFilter .= '$query->where("'.$this->modelData->tableName.'.'.$field->name.'", "=", $'.$this->modelData->tableName.'Conditions["'.$field->name.'"])'.PHP_EOL;
-			}
-
-			if($dbType == 'primary')
-			{
-				$stubSimpleFilter .= '->orWhere("'.$this->modelData->tableName.'.'.$field->name.'", "=", $'.$this->modelData->tableName.'Conditions["'.$field->name.'"])'.PHP_EOL;
-			}
-
-			if($dbType == 'string')
-			{
-				$stubSimpleFilter .= '->orWhere("'.$this->modelData->tableName.'.'.$field->name.'", "LIKE", "%".$'.$this->modelData->tableName.'Conditions["'.$field->name.'"]."%")'.PHP_EOL;
-			}
-
-			if($dbType == 'date' || $dbType == 'datetime' || $dbType == 'float' || $dbType == 'integer' || $dbType == 'number')
-			{
-				$stubSimpleFilter .= '->orWhere("'.$this->modelData->tableName.'.'.$field->name.'", "=", $'.$this->modelData->tableName.'Conditions["'.$field->name.'"])'.PHP_EOL;
-			}
-
-		}
-		$stubSimpleFilter .= ';';
-		$this->stub = str_replace('{{simple_filter}}', $stubSimpleFilter, $this->stub);
-
-		return $this;
-	}
+            if($dbType == 'primaryKey')
+            {
+                $stubSimpleFilter .= '$query->where("'.$this->modelData->tableName.'.'.$field->name.'", "=", $'.$this->modelData->tableName.'Conditions["'.$field->name.'"])'.PHP_EOL;
+            }
+
+            if($dbType == 'primary')
+            {
+                $stubSimpleFilter .= '->orWhere("'.$this->modelData->tableName.'.'.$field->name.'", "=", $'.$this->modelData->tableName.'Conditions["'.$field->name.'"])'.PHP_EOL;
+            }
+
+            if($dbType == 'string')
+            {
+                $stubSimpleFilter .= '->orWhere("'.$this->modelData->tableName.'.'.$field->name.'", "LIKE", "%".$'.$this->modelData->tableName.'Conditions["'.$field->name.'"]."%")'.PHP_EOL;
+            }
+
+            if($dbType == 'date' || $dbType == 'datetime' || $dbType == 'float' || $dbType == 'integer' || $dbType == 'number')
+            {
+                $stubSimpleFilter .= '->orWhere("'.$this->modelData->tableName.'.'.$field->name.'", "=", $'.$this->modelData->tableName.'Conditions["'.$field->name.'"])'.PHP_EOL;
+            }
+
+        }
+        $stubSimpleFilter .= ';';
+        $this->stub = str_replace('{{simple_filter}}', $stubSimpleFilter, $this->stub);
+
+        return $this;
+    }
 }
\ No newline at end of file

src/Scaffolder/Compilers/Core/MigrationCompiler.php

Indentation +118 added lines, -118 removed lines

@@ -10,130 +10,130 @@
 
 class MigrationCompiler extends AbstractCompiler
 {
-	private $date;
+    private $date;
 
-	protected $cachePrefix 	= 'migration_';
-	protected $stubFilename = 'Migration.php' ;
+    protected $cachePrefix 	= 'migration_';
+    protected $stubFilename = 'Migration.php' ;
 
-	public function __construct($scaffolderConfig, $modelData = null)
-	{
-		$this->stubsDirectory = __DIR__ . '/../../../../stubs/Api/';
+    public function __construct($scaffolderConfig, $modelData = null)
+    {
+        $this->stubsDirectory = __DIR__ . '/../../../../stubs/Api/';
 
-		parent::__construct($scaffolderConfig, $modelData);
+        parent::__construct($scaffolderConfig, $modelData);
 
-		$this->date = Carbon::now();
-	}
+        $this->date = Carbon::now();
+    }
 
-	/**
-	 * Replace and store the Stub.
-	 *
-	 * @return string
-	 */
-	public function replaceAndStore()
-	{
+    /**
+     * Replace and store the Stub.
+     *
+     * @return string
+     */
+    public function replaceAndStore()
+    {
 		
-		return $this->addFields()
-					->store(new FileToCompile(false, $this->modelData->modelHash));
+        return $this->addFields()
+                    ->store(new FileToCompile(false, $this->modelData->modelHash));
 		
-	}
-
-	/**
-	 * Get output filename
-	 *
-	 *
-	 * @return $this
-	 */
-	protected function getOutputFilename()
-	{
-
-		return  PathParser::parse($this->scaffolderConfig->generator->paths->migrations) . $this->date->format('Y_m_d_') . str_pad($this->modelData->migrationOrder, 2, 0, STR_PAD_LEFT) . '_create_' . strtolower($this->modelName) . '_table.php';
-	}
-
-	/**
-	 * Add fields.
-	 *
-	 * @param $modelData
-	 *
-	 * @return $this
-	 */
-	private function addFields()
-	{
-		// Default primary key
-		$fields = "\t\t\t\$table->increments('id');" . PHP_EOL . PHP_EOL;
-
-		// Check primary key
-		# TODO FIX, primary
+    }
+
+    /**
+     * Get output filename
+     *
+     *
+     * @return $this
+     */
+    protected function getOutputFilename()
+    {
+
+        return  PathParser::parse($this->scaffolderConfig->generator->paths->migrations) . $this->date->format('Y_m_d_') . str_pad($this->modelData->migrationOrder, 2, 0, STR_PAD_LEFT) . '_create_' . strtolower($this->modelName) . '_table.php';
+    }
+
+    /**
+     * Add fields.
+     *
+     * @param $modelData
+     *
+     * @return $this
+     */
+    private function addFields()
+    {
+        // Default primary key
+        $fields = "\t\t\t\$table->increments('id');" . PHP_EOL . PHP_EOL;
+
+        // Check primary key
+        # TODO FIX, primary
 		
-		foreach ($this->modelData->fields as $field)
-		{
-			$parsedModifiers = '';
-
-			if($field->index == "primary")
-				continue ;
-			if($this->modelData->timeStamps && $field->name == "created_at")
-				continue ;
-			if($this->modelData->timeStamps && $field->name == "updated_at")
-				continue ;
-
-			// Check modifiers
-			if (!empty($field->modifiers))
-			{
-				$modifiersArray = explode(':', $field->modifiers);
-
-				foreach ($modifiersArray as $modifier)
-				{
-					$modifierAndValue = explode(',', $modifier);
-
-					if (count($modifierAndValue) == 2)
-					{
-						$parsedModifiers .= '->' . $modifierAndValue[0] . '(' . $modifierAndValue[1] . ')';
-					}
-					else
-					{
-						$parsedModifiers .= '->' . $modifierAndValue[0] . '()';
-					}
-				}
-			}
-
-			// Check foreign key for unsigned modifier
-			if ($field->foreignKey)
-			{
-				$parsedModifiers .= '->unsigned()';
-			}
-
-			// Check indexes
-			if ($field->index != 'none')
-			{
-				$fields .= sprintf("\t\t\t\$table->%s('%s')%s->%s();" . PHP_EOL, $field->type->db, $field->name, $parsedModifiers, $field->index);
-			}
-			else
-			{
-				if ($field->type->db == "enum") {
-					$items = '';
-					foreach ($field->options as $key => $option) {
-						$items .= "'" . $option . "'";
-						if ($key < (count($field->options) - 1))
-							$items .= ", ";
-					}
-
-					$fields .= sprintf("\t\t\t\$table->%s('%s', array(%s));" . PHP_EOL, $field->type->db, $field->name, $items);
-				}
-				else
-					$fields .= sprintf("\t\t\t\$table->%s('%s')%s;" . PHP_EOL, $field->type->db, $field->name, $parsedModifiers);
-			}
-
-			// Check foreign key
-			if ($field->foreignKey)
-			{
-				$fields .= sprintf("\t\t\t\$table->foreign('%s')->references('%s')->on('%s');" . PHP_EOL . PHP_EOL, $field->name, $field->foreignKey->field, $field->foreignKey->table);
-			}
-		}
-
-		if($this->modelData->timeStamps)
-			$fields .= PHP_EOL . "\t\t\t\$table->timestamps();" . PHP_EOL;
-
-		$this->stub = str_replace('{{fields}}', $fields, $this->stub);
-
-		return $this;
-	}
+        foreach ($this->modelData->fields as $field)
+        {
+            $parsedModifiers = '';
+
+            if($field->index == "primary")
+                continue ;
+            if($this->modelData->timeStamps && $field->name == "created_at")
+                continue ;
+            if($this->modelData->timeStamps && $field->name == "updated_at")
+                continue ;
+
+            // Check modifiers
+            if (!empty($field->modifiers))
+            {
+                $modifiersArray = explode(':', $field->modifiers);
+
+                foreach ($modifiersArray as $modifier)
+                {
+                    $modifierAndValue = explode(',', $modifier);
+
+                    if (count($modifierAndValue) == 2)
+                    {
+                        $parsedModifiers .= '->' . $modifierAndValue[0] . '(' . $modifierAndValue[1] . ')';
+                    }
+                    else
+                    {
+                        $parsedModifiers .= '->' . $modifierAndValue[0] . '()';
+                    }
+                }
+            }
+
+            // Check foreign key for unsigned modifier
+            if ($field->foreignKey)
+            {
+                $parsedModifiers .= '->unsigned()';
+            }
+
+            // Check indexes
+            if ($field->index != 'none')
+            {
+                $fields .= sprintf("\t\t\t\$table->%s('%s')%s->%s();" . PHP_EOL, $field->type->db, $field->name, $parsedModifiers, $field->index);
+            }
+            else
+            {
+                if ($field->type->db == "enum") {
+                    $items = '';
+                    foreach ($field->options as $key => $option) {
+                        $items .= "'" . $option . "'";
+                        if ($key < (count($field->options) - 1))
+                            $items .= ", ";
+                    }
+
+                    $fields .= sprintf("\t\t\t\$table->%s('%s', array(%s));" . PHP_EOL, $field->type->db, $field->name, $items);
+                }
+                else
+                    $fields .= sprintf("\t\t\t\$table->%s('%s')%s;" . PHP_EOL, $field->type->db, $field->name, $parsedModifiers);
+            }
+
+            // Check foreign key
+            if ($field->foreignKey)
+            {
+                $fields .= sprintf("\t\t\t\$table->foreign('%s')->references('%s')->on('%s');" . PHP_EOL . PHP_EOL, $field->name, $field->foreignKey->field, $field->foreignKey->table);
+            }
+        }
+
+        if($this->modelData->timeStamps)
+            $fields .= PHP_EOL . "\t\t\t\$table->timestamps();" . PHP_EOL;
+
+        $this->stub = str_replace('{{fields}}', $fields, $this->stub);
+
+        return $this;
+    }
 }
\ No newline at end of file