codificar / scaffolder

src/Scaffolder/Compilers/AngularJs/TranslateCompiler.php

Doc Comments +2 added lines, -2 removed lines

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

Unused Use Statements -2 removed lines

@@ -2,13 +2,11 @@
 
 namespace Scaffolder\Compilers\AngularJs;
 
-use Illuminate\Support\Facades\File;
 use Scaffolder\Compilers\AbstractCompiler;
 use Scaffolder\Compilers\Support\FileToCompile;
 use Scaffolder\Compilers\Support\PathParser;
 use Scaffolder\Support\Directory;
 use Scaffolder\Support\CamelCase;
-use stdClass ;
 
 
 class TranslateCompiler extends AbstractCompiler

Indentation +65 added lines, -65 removed lines

@@ -13,73 +13,73 @@
 
 class TranslateCompiler extends AbstractCompiler
 {
-	protected $cachePrefix 	= 'translate_';
-	protected $stubFilename = 'Translate.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 	= 'translate_';
+    protected $stubFilename = 'Translate.js' ;
+
+    public function __construct($scaffolderConfig, $modelData = null)
+    {
+        $this->stubsDirectory = __DIR__ . '/../../../../stubs/AngularJs/';
+        parent::__construct($scaffolderConfig, $modelData);
+    }
+
+    /**
+     * Replace and store the Stub.
+     *
+     * @return string
+     */
+    public function replaceAndStore()
+    {
 		
-		return $this->replaceColumns()
-					->replaceArea()
-					->store(new FileToCompile(false, $this->modelData->modelHash));
+        return $this->replaceColumns()
+                    ->replaceArea()
+                    ->store(new FileToCompile(false, $this->modelData->modelHash));
 		
-	}
-
-	/**
-	 * replace columns
-	 *
-	 * @return $this
-	 */
-	public function replaceArea(){
-		$this->stub = str_replace('{{singular}}', ucwords($this->modelData->tableName), $this->stub); 
-		$this->stub = str_replace('{{plural}}', ucwords(CamelCase::pluralize($this->modelData->tableName)), $this->stub); 
-		return $this;
-	}
-
-	/**
-	 * replace columns
-	 *
-	 * @return $this
-	 */
-	public function replaceColumns(){
-
-		$columns = [];
-
-		foreach ($this->modelData->fields as $field)
-		{
-			array_push($columns,  "\t\t".sprintf('"%s" : "%s"',  $field->name,  CamelCase::convertToCamelCase($field->name) ));
-		}
-
-		$this->stub = str_replace('{{columns}}', join(",\n", $columns), $this->stub); 
-
-		return $this ;
-
-	}
+    }
+
+    /**
+     * replace columns
+     *
+     * @return $this
+     */
+    public function replaceArea(){
+        $this->stub = str_replace('{{singular}}', ucwords($this->modelData->tableName), $this->stub); 
+        $this->stub = str_replace('{{plural}}', ucwords(CamelCase::pluralize($this->modelData->tableName)), $this->stub); 
+        return $this;
+    }
+
+    /**
+     * replace columns
+     *
+     * @return $this
+     */
+    public function replaceColumns(){
+
+        $columns = [];
+
+        foreach ($this->modelData->fields as $field)
+        {
+            array_push($columns,  "\t\t".sprintf('"%s" : "%s"',  $field->name,  CamelCase::convertToCamelCase($field->name) ));
+        }
+
+        $this->stub = str_replace('{{columns}}', join(",\n", $columns), $this->stub); 
+
+        return $this ;
+
+    }
 	
-	/**
-	 * Get output filename
-	 *
-	 *
-	 * @return $this
-	 */
-	protected function getOutputFilename()
-	{
-		$folder = PathParser::parse($this->scaffolderConfig->generator->paths->pages).$this->modelData->tableName.'/i18n/' ;
-
-		Directory::createIfNotExists($folder, 0755, true);
-
-		return $folder . 'en.json';
-	}
+    /**
+     * Get output filename
+     *
+     *
+     * @return $this
+     */
+    protected function getOutputFilename()
+    {
+        $folder = PathParser::parse($this->scaffolderConfig->generator->paths->pages).$this->modelData->tableName.'/i18n/' ;
+
+        Directory::createIfNotExists($folder, 0755, true);
+
+        return $folder . 'en.json';
+    }
 
 }
\ No newline at end of file

Spacing +9 added lines, -9 removed lines

@@ -8,17 +8,17 @@ 
 use Scaffolder\Compilers\Support\PathParser;
 use Scaffolder\Support\Directory;
 use Scaffolder\Support\CamelCase;
-use stdClass ;
+use stdClass;
 
 
 class TranslateCompiler extends AbstractCompiler
 {
 	protected $cachePrefix 	= 'translate_';
-	protected $stubFilename = 'Translate.js' ;
+	protected $stubFilename = 'Translate.js';
 
 	public function __construct($scaffolderConfig, $modelData = null)
 	{
-		$this->stubsDirectory = __DIR__ . '/../../../../stubs/AngularJs/';
+		$this->stubsDirectory = __DIR__.'/../../../../stubs/AngularJs/';
 		parent::__construct($scaffolderConfig, $modelData);
 	}
 
@@ -41,7 +41,7 @@ 
 	 *
 	 * @return $this
 	 */
-	public function replaceArea(){
+	public function replaceArea() {
 		$this->stub = str_replace('{{singular}}', ucwords($this->modelData->tableName), $this->stub); 
 		$this->stub = str_replace('{{plural}}', ucwords(CamelCase::pluralize($this->modelData->tableName)), $this->stub); 
 		return $this;
@@ -52,18 +52,18 @@ 
 	 *
 	 * @return $this
 	 */
-	public function replaceColumns(){
+	public function replaceColumns() {
 
 		$columns = [];
 
 		foreach ($this->modelData->fields as $field)
 		{
-			array_push($columns,  "\t\t".sprintf('"%s" : "%s"',  $field->name,  CamelCase::convertToCamelCase($field->name) ));
+			array_push($columns, "\t\t".sprintf('"%s" : "%s"', $field->name, CamelCase::convertToCamelCase($field->name)));
 		}
 
 		$this->stub = str_replace('{{columns}}', join(",\n", $columns), $this->stub); 
 
-		return $this ;
+		return $this;
 
 	}
 	
@@ -75,11 +75,11 @@ 
 	 */
 	protected function getOutputFilename()
 	{
-		$folder = PathParser::parse($this->scaffolderConfig->generator->paths->pages).$this->modelData->tableName.'/i18n/' ;
+		$folder = PathParser::parse($this->scaffolderConfig->generator->paths->pages).$this->modelData->tableName.'/i18n/';
 
 		Directory::createIfNotExists($folder, 0755, true);
 
-		return $folder . 'en.json';
+		return $folder.'en.json';
 	}
 
 }
\ No newline at end of file

src/Scaffolder/Compilers/Core/ControllerCompiler.php

Doc Comments +9 added lines, -2 removed lines

@@ -13,6 +13,9 @@ 
 	protected $cachePrefix 	= 'controller_';
 	protected $stubFilename = 'Controller/Controller.php' ;
 	
+	/**
+	 * @param string $stubName
+	 */
 	public function __construct($scaffolderConfig, $modelData = null, $stubName = null)
 	{
 		if ($stubName)
@@ -24,7 +27,7 @@ 
 	/**
 	 * Replace and store the Stub.
 	 *
-	 * @return string
+	 * @return ControllerCompiler
 	 */
 	public function replaceAndStore()
 	{
@@ -49,7 +52,7 @@ 
 	 * Get output filename
 	 *
 	 *
-	 * @return $this
+	 * @return string
 	 */
 	protected function getOutputFilename()
 	{
@@ -474,6 +477,10 @@ 
 	 * @return $this
 	 */
 	private $conditionsStub = [];
+
+	/**
+	 * @return string
+	 */
 	private function getConditionStubByField($field){
 		
 		if($field->index == 'primary'){

Indentation +402 added lines, -402 removed lines

@@ -10,437 +10,437 @@ 
 
 class ControllerCompiler extends AbstractCompiler
 {	
-	protected $cachePrefix 	= 'controller_';
-	protected $stubFilename = 'Controller/Controller.php' ;
+    protected $cachePrefix 	= 'controller_';
+    protected $stubFilename = 'Controller/Controller.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()
-	{
+    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->replacePrimaryKey()
-					->replaceEagerCode()
-					->replaceUniqueRules()
-					->replaceSearchConditions()
-					->replaceSimpleFilter()
-					->replaceSortConditions()
-					->replaceRoutePrefix()
-					->replaceReverseRelationships()
-					->replaceCheckbox()
-					->replaceEnum()
-					->replaceRelationshipTables()
-					->store(new FileToCompile(false, $this->modelData->modelHash));
+        return $this->replacePrimaryKey()
+                    ->replaceEagerCode()
+                    ->replaceUniqueRules()
+                    ->replaceSearchConditions()
+                    ->replaceSimpleFilter()
+                    ->replaceSortConditions()
+                    ->replaceRoutePrefix()
+                    ->replaceReverseRelationships()
+                    ->replaceCheckbox()
+                    ->replaceEnum()
+                    ->replaceRelationshipTables()
+                    ->store(new FileToCompile(false, $this->modelData->modelHash));
 		
-	}
-
-
-	/**
-	 * Get output filename
-	 *
-	 *
-	 * @return $this
-	 */
-	protected function getOutputFilename()
-	{
-
-		return PathParser::parse($this->scaffolderConfig->generator->paths->controllers) . $this->modelName . 'Controller.php';
-	}
-
-	/**
-	 * 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');
-
-		foreach ($this->modelData->fields as $field)
-		{
+    }
+
+
+    /**
+     * Get output filename
+     *
+     *
+     * @return $this
+     */
+    protected function getOutputFilename()
+    {
+
+        return PathParser::parse($this->scaffolderConfig->generator->paths->controllers) . $this->modelName . 'Controller.php';
+    }
+
+    /**
+     * 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');
+
+        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;
+    }
 
 
-	public function replaceSortConditions()	{
-		$joinSorts = '';
+    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;
+        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;
+    }
 
-	public function replaceUniqueRules() {
-		$uniqueRules = '';
+    public function replaceUniqueRules() {
+        $uniqueRules = '';
 
-		foreach ($this->modelData->fields as $field) {
-			if (strpos($field->validations, 'unique')) {
-				$rule = sprintf('$rules["%s"] = $rules["%s"] . \',%s,\' . $id;', $field->name, $field->name, $field->name);
-				$uniqueRules .= $rule . "\n";
-			}
-		}
+        foreach ($this->modelData->fields as $field) {
+            if (strpos($field->validations, 'unique')) {
+                $rule = sprintf('$rules["%s"] = $rules["%s"] . \',%s,\' . $id;', $field->name, $field->name, $field->name);
+                $uniqueRules .= $rule . "\n";
+            }
+        }
 
-		$this->stub = str_replace('{{unique_rules}}', $uniqueRules, $this->stub);
+        $this->stub = str_replace('{{unique_rules}}', $uniqueRules, $this->stub);
 
-		return $this;
-	}
+        return $this;
+    }
 
-	public function getEagerUniqueRules() {
-		$uniqueRules = '';
+    public function getEagerUniqueRules() {
+        $uniqueRules = '';
 
-		foreach ($this->modelData->fields as $field) {
-			if (strpos($field->validations, 'unique')) {
-				$rule = sprintf('$rules["%s.%s"] .= \',%s,\' . ${{class_name_lw}}->{{field}};', $this->modelData->tableName, $field->name, $field->name);
-				$uniqueRules .= $rule . "\n";
-			}
-		}
+        foreach ($this->modelData->fields as $field) {
+            if (strpos($field->validations, 'unique')) {
+                $rule = sprintf('$rules["%s.%s"] .= \',%s,\' . ${{class_name_lw}}->{{field}};', $this->modelData->tableName, $field->name, $field->name);
+                $uniqueRules .= $rule . "\n";
+            }
+        }
 
-		return $uniqueRules;
-	}
+        return $uniqueRules;
+    }
 
-	/**
-	 * 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 ;
 
-	}
+    }
 
 
-	/**
-	 * 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;
-	}
-
-
-	/**
-	 * replace reverse relationships
-	 *
-	 * @return $this
-	 */
-	public function replaceReverseRelationships(){
-
-		$functions = '';
-
-		$method = File::get($this->stubsDirectory . '/Controller/ControllerReverseRelationship.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));
-
-			$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;
-		}
-
-		$this->stub = str_replace('{{reverseRelationships}}', $functions, $this->stub);
-
-		return $this;
-
-	}
-
-	/**
-	 * replace enum fields
-	 *
-	 * @return $this
-	 */
-	public function replaceEnum(){
-
-		$functions = '';
-
-		$method = File::get($this->stubsDirectory . '/Controller/ControllerEnum.php');
-
-		foreach ($this->modelData->fields as $field)
-		{
-			if ($field->type->db == "enum") {
-				$replacedMethod = '';
-				$replacedMethod = str_replace('{{field_name_uc}}', CamelCase::convertToCamelCase($field->name), $method);	
-				$replacedMethod = str_replace('{{field_name}}', $field->name, $replacedMethod);
-				$replacedMethod = str_replace('{{model_name}}', $this->modelData->modelName, $replacedMethod);
+            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;
+    }
+
+
+    /**
+     * replace reverse relationships
+     *
+     * @return $this
+     */
+    public function replaceReverseRelationships(){
+
+        $functions = '';
+
+        $method = File::get($this->stubsDirectory . '/Controller/ControllerReverseRelationship.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));
+
+            $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;
+        }
+
+        $this->stub = str_replace('{{reverseRelationships}}', $functions, $this->stub);
+
+        return $this;
+
+    }
+
+    /**
+     * replace enum fields
+     *
+     * @return $this
+     */
+    public function replaceEnum(){
+
+        $functions = '';
+
+        $method = File::get($this->stubsDirectory . '/Controller/ControllerEnum.php');
+
+        foreach ($this->modelData->fields as $field)
+        {
+            if ($field->type->db == "enum") {
+                $replacedMethod = '';
+                $replacedMethod = str_replace('{{field_name_uc}}', CamelCase::convertToCamelCase($field->name), $method);	
+                $replacedMethod = str_replace('{{field_name}}', $field->name, $replacedMethod);
+                $replacedMethod = str_replace('{{model_name}}', $this->modelData->modelName, $replacedMethod);
 				
-				$functions .= $replacedMethod;
-			}
-		}
-
-		$this->stub = str_replace('{{enum}}', $functions, $this->stub);
-
-		return $this;
-
-	}
-
-	/**
-	 * replace relationship tables
-	 *
-	 * @return $this
-	 */
-	public function replaceRelationshipTables() {
-
-		$functions = "";
-		$functionsCall = "";
-		$removeAll = "";
-		$removeAllCall = "";
-		$includes = "";
-		$joins = "";
-		$joinSorts = "";
-
-		$method = File::get($this->stubsDirectory . '/Controller/ControllerRelationshipTable.php');
-
-		foreach ($this->modelData->reverseRelationships as $relationship) {
-
-			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);
-
-				$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);
-
-				$functionsCall .= $methodCall . "\n\t\t";
+                $functions .= $replacedMethod;
+            }
+        }
+
+        $this->stub = str_replace('{{enum}}', $functions, $this->stub);
+
+        return $this;
+
+    }
+
+    /**
+     * replace relationship tables
+     *
+     * @return $this
+     */
+    public function replaceRelationshipTables() {
+
+        $functions = "";
+        $functionsCall = "";
+        $removeAll = "";
+        $removeAllCall = "";
+        $includes = "";
+        $joins = "";
+        $joinSorts = "";
+
+        $method = File::get($this->stubsDirectory . '/Controller/ControllerRelationshipTable.php');
+
+        foreach ($this->modelData->reverseRelationships as $relationship) {
+
+            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);
+
+                $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);
+
+                $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 checkbox fields
-	 *
-	 * @return $this
-	 */
-	public function replaceCheckbox(){
+    /**
+     * replace checkbox fields
+     *
+     * @return $this
+     */
+    public function replaceCheckbox(){
 
-		$method = File::get($this->stubsDirectory . '/Controller/ControllerCheckbox.php');
-		$key = false;
+        $method = File::get($this->stubsDirectory . '/Controller/ControllerCheckbox.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);
 
-		/*foreach ($this->modelData->fields as $field)
+        /*foreach ($this->modelData->fields as $field)
 		{
 			if ($field->type->ui == "checkbox") {
 				
@@ -461,49 +461,49 @@ 
 		}*/
 		
 
-		return $this;
+        return $this;
 
-	}
+    }
 
 
-	/**
-	 * 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];
-		}
-	}
+        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];
+        }
+    }
 	
 
 

Spacing +67 added lines, -67 removed lines

@@ -11,13 +11,13 @@ 
 class ControllerCompiler extends AbstractCompiler
 {	
 	protected $cachePrefix 	= 'controller_';
-	protected $stubFilename = 'Controller/Controller.php' ;
+	protected $stubFilename = 'Controller/Controller.php';
 	
 	public function __construct($scaffolderConfig, $modelData = null, $stubName = null)
 	{
 		if ($stubName)
 			$this->stubFilename = $stubName;
-		$this->stubsDirectory = __DIR__ . '/../../../../stubs/Api/';
+		$this->stubsDirectory = __DIR__.'/../../../../stubs/Api/';
 		parent::__construct($scaffolderConfig, $modelData);
 	}
 
@@ -54,7 +54,7 @@ 
 	protected function getOutputFilename()
 	{
 
-		return PathParser::parse($this->scaffolderConfig->generator->paths->controllers) . $this->modelName . 'Controller.php';
+		return PathParser::parse($this->scaffolderConfig->generator->paths->controllers).$this->modelName.'Controller.php';
 	}
 
 	/**
@@ -67,11 +67,11 @@ 
 		$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)
 		{
@@ -81,20 +81,20 @@ 
 			{
 
 				$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) ;
+				$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();
+				$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) ;
+				$ruleCommands = str_replace('{{unique_eager_rules}}', $eagerUniqueRules, $ruleCommands);
 			}
 
 		}
@@ -113,12 +113,12 @@ 
 	}
 
 
-	public function replaceSortConditions()	{
+	public function replaceSortConditions() {
 		$joinSorts = '';
 
 		foreach ($this->modelData->fields as $field) {
-			if($field->foreignKey){
-				$joinSortStub = File::get($this->stubsDirectory . 'SearchConditions/JoinSort.php');
+			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);
@@ -142,7 +142,7 @@ 
 		foreach ($this->modelData->fields as $field) {
 			if (strpos($field->validations, 'unique')) {
 				$rule = sprintf('$rules["%s"] = $rules["%s"] . \',%s,\' . $id;', $field->name, $field->name, $field->name);
-				$uniqueRules .= $rule . "\n";
+				$uniqueRules .= $rule."\n";
 			}
 		}
 
@@ -157,7 +157,7 @@ 
 		foreach ($this->modelData->fields as $field) {
 			if (strpos($field->validations, 'unique')) {
 				$rule = sprintf('$rules["%s.%s"] .= \',%s,\' . ${{class_name_lw}}->{{field}};', $this->modelData->tableName, $field->name, $field->name);
-				$uniqueRules .= $rule . "\n";
+				$uniqueRules .= $rule."\n";
 			}
 		}
 
@@ -169,7 +169,7 @@ 
 	 *
 	 * @return $this
 	 */
-	private function replaceSearchConditions(){
+	private function replaceSearchConditions() {
 
 		$searchConditions = $this->getSearchConditions();
 
@@ -183,16 +183,16 @@ 
 	 *
 	 * @return $this
 	 */
-	public function getSearchConditions(){
+	public function getSearchConditions() {
 
 		$fieldConditions = '';
 
-		$searchConditions = File::get($this->stubsDirectory . '/SearchConditions/Conditions.php');
+		$searchConditions = File::get($this->stubsDirectory.'/SearchConditions/Conditions.php');
 
 		foreach ($this->modelData->fields as $field)
 		{
 
-			$fieldConditions .= $this->replaceFieldStrings($field, $this->getConditionStubByField($field)) ;
+			$fieldConditions .= $this->replaceFieldStrings($field, $this->getConditionStubByField($field));
 
 		}
 
@@ -202,7 +202,7 @@ 
 		// replace table name
 		$searchConditions = str_replace('{{table_name}}', $this->modelData->tableName, $searchConditions);
 
-		return $searchConditions ;
+		return $searchConditions;
 
 	}
 
@@ -212,7 +212,7 @@ 
 	 *
 	 * @return $this
 	 */
-	private function replaceSimpleFilter(){
+	private function replaceSimpleFilter() {
 		$i = 0;
 
 		$stubSimpleFilter = '';
@@ -221,41 +221,41 @@ 
 		{
 			//var_dump($field->name);
 			
-			if($field->index == 'primary'){
-				$dbType = 'primaryKey' ;
+			if ($field->index == 'primary') {
+				$dbType = 'primaryKey';
 			}
-			elseif($field->foreignKey){
-				$dbType = 'primary' ;
+			elseif ($field->foreignKey) {
+				$dbType = 'primary';
 			}
-			elseif($field->type->db == 'enum'){
-				$dbType = 'primary' ;
+			elseif ($field->type->db == 'enum') {
+				$dbType = 'primary';
 			}
-			elseif($field->type->db == 'boolean'){
-				$dbType = 'primary' ;
+			elseif ($field->type->db == 'boolean') {
+				$dbType = 'primary';
 			}
-			elseif($field->type->db == 'text'){
-				$dbType = 'string' ;
+			elseif ($field->type->db == 'text') {
+				$dbType = 'string';
 			}
 			else {
-				$dbType = $field->type->db ;
+				$dbType = $field->type->db;
 			}
 			
-			if($dbType == 'primaryKey')
+			if ($dbType == 'primaryKey')
 			{
 				$stubSimpleFilter .= '$query->where("'.$this->modelData->tableName.'.'.$field->name.'", "=", $'.$this->modelData->tableName.'Conditions["'.$field->name.'"])'.PHP_EOL;
 			}
 
-			if($dbType == 'primary')
+			if ($dbType == 'primary')
 			{
 				$stubSimpleFilter .= '->orWhere("'.$this->modelData->tableName.'.'.$field->name.'", "=", $'.$this->modelData->tableName.'Conditions["'.$field->name.'"])'.PHP_EOL;
 			}
 
-			if($dbType == 'string')
+			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')
+			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;
 			}
@@ -273,11 +273,11 @@ 
 	 *
 	 * @return $this
 	 */
-	public function replaceReverseRelationships(){
+	public function replaceReverseRelationships() {
 
 		$functions = '';
 
-		$method = File::get($this->stubsDirectory . '/Controller/ControllerReverseRelationship.php');
+		$method = File::get($this->stubsDirectory.'/Controller/ControllerReverseRelationship.php');
 
 		foreach ($this->modelData->reverseRelationships as $relationship)
 		{
@@ -308,11 +308,11 @@ 
 	 *
 	 * @return $this
 	 */
-	public function replaceEnum(){
+	public function replaceEnum() {
 
 		$functions = '';
 
-		$method = File::get($this->stubsDirectory . '/Controller/ControllerEnum.php');
+		$method = File::get($this->stubsDirectory.'/Controller/ControllerEnum.php');
 
 		foreach ($this->modelData->fields as $field)
 		{
@@ -347,7 +347,7 @@ 
 		$joins = "";
 		$joinSorts = "";
 
-		$method = File::get($this->stubsDirectory . '/Controller/ControllerRelationshipTable.php');
+		$method = File::get($this->stubsDirectory.'/Controller/ControllerRelationshipTable.php');
 
 		foreach ($this->modelData->reverseRelationships as $relationship) {
 
@@ -373,9 +373,9 @@ 
 				$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 = 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);
@@ -387,9 +387,9 @@ 
 				$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 = 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);
@@ -397,12 +397,12 @@ 
 				$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);
 
-				$includes .= $use . "\n";
+				$includes .= $use."\n";
 			}
 		}
 
@@ -430,9 +430,9 @@ 
 	 *
 	 * @return $this
 	 */
-	public function replaceCheckbox(){
+	public function replaceCheckbox() {
 
-		$method = File::get($this->stubsDirectory . '/Controller/ControllerCheckbox.php');
+		$method = File::get($this->stubsDirectory.'/Controller/ControllerCheckbox.php');
 		$key = false;
 
 		$method = str_replace('{{class_name_lw}}', $this->modelData->tableName, $method);
@@ -474,32 +474,32 @@ 
 	 * @return $this
 	 */
 	private $conditionsStub = [];
-	private function getConditionStubByField($field){
+	private function getConditionStubByField($field) {
 		
-		if($field->index == 'primary'){
-			$dbType = 'primary' ;
+		if ($field->index == 'primary') {
+			$dbType = 'primary';
 		}
-		elseif($field->foreignKey){
-			$dbType = 'primary' ;
+		elseif ($field->foreignKey) {
+			$dbType = 'primary';
 		}
-		elseif($field->type->db == 'enum'){
-			$dbType = 'primary' ;
+		elseif ($field->type->db == 'enum') {
+			$dbType = 'primary';
 		}
-		elseif($field->type->db == 'boolean'){
-			$dbType = 'primary' ;
+		elseif ($field->type->db == 'boolean') {
+			$dbType = 'primary';
 		}
-		elseif($field->type->db == 'text'){
-			$dbType = 'string' ;
+		elseif ($field->type->db == 'text') {
+			$dbType = 'string';
 		}
 		else {
-			$dbType = $field->type->db ;
+			$dbType = $field->type->db;
 		}
 
-		if(array_key_exists($dbType, $this->conditionsStub)){
+		if (array_key_exists($dbType, $this->conditionsStub)) {
 			return $this->conditionsStub[$dbType];
 		}
 		else {
-			$this->conditionsStub[$dbType] = File::get($this->stubsDirectory . 'SearchConditions/'. ucwords($dbType). '.php');;
+			$this->conditionsStub[$dbType] = File::get($this->stubsDirectory.'SearchConditions/'.ucwords($dbType).'.php'); ;
 
 			return $this->conditionsStub[$dbType];
 		}

Braces +21 added lines, -30 removed lines

@@ -15,8 +15,9 @@ 
 	
 	public function __construct($scaffolderConfig, $modelData = null, $stubName = null)
 	{
-		if ($stubName)
-			$this->stubFilename = $stubName;
+		if ($stubName) {
+					$this->stubFilename = $stubName;
+		}
 		$this->stubsDirectory = __DIR__ . '/../../../../stubs/Api/';
 		parent::__construct($scaffolderConfig, $modelData);
 	}
@@ -223,20 +224,15 @@ 
 			
 			if($field->index == 'primary'){
 				$dbType = 'primaryKey' ;
-			}
-			elseif($field->foreignKey){
+			} elseif($field->foreignKey){
 				$dbType = 'primary' ;
-			}
-			elseif($field->type->db == 'enum'){
+			} elseif($field->type->db == 'enum'){
 				$dbType = 'primary' ;
-			}
-			elseif($field->type->db == 'boolean'){
+			} elseif($field->type->db == 'boolean'){
 				$dbType = 'primary' ;
-			}
-			elseif($field->type->db == 'text'){
+			} elseif($field->type->db == 'text'){
 				$dbType = 'string' ;
-			}
-			else {
+			} else {
 				$dbType = $field->type->db ;
 			}
 			
@@ -282,12 +278,13 @@ 
 		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));
+			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);
@@ -478,27 +475,21 @@ 
 		
 		if($field->index == 'primary'){
 			$dbType = 'primary' ;
-		}
-		elseif($field->foreignKey){
+		} elseif($field->foreignKey){
 			$dbType = 'primary' ;
-		}
-		elseif($field->type->db == 'enum'){
+		} elseif($field->type->db == 'enum'){
 			$dbType = 'primary' ;
-		}
-		elseif($field->type->db == 'boolean'){
+		} elseif($field->type->db == 'boolean'){
 			$dbType = 'primary' ;
-		}
-		elseif($field->type->db == 'text'){
+		} elseif($field->type->db == 'text'){
 			$dbType = 'string' ;
-		}
-		else {
+		} else {
 			$dbType = $field->type->db ;
 		}
 
 		if(array_key_exists($dbType, $this->conditionsStub)){
 			return $this->conditionsStub[$dbType];
-		}
-		else {
+		} else {
 			$this->conditionsStub[$dbType] = File::get($this->stubsDirectory . 'SearchConditions/'. ucwords($dbType). '.php');;
 
 			return $this->conditionsStub[$dbType];

src/Scaffolder/Compilers/Core/MigrationCompiler.php

Doc Comments +2 added lines, -2 removed lines

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

Unused Use Statements -1 removed lines

@@ -3,7 +3,6 @@
 namespace Scaffolder\Compilers\Core;
 
 use Carbon\Carbon;
-use Illuminate\Support\Facades\File;
 use Scaffolder\Compilers\AbstractCompiler;
 use Scaffolder\Compilers\Support\FileToCompile;
 use Scaffolder\Compilers\Support\PathParser;

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

Spacing +19 added lines, -19 removed lines

@@ -13,11 +13,11 @@ 
 	private $date;
 
 	protected $cachePrefix 	= 'migration_';
-	protected $stubFilename = 'Migration.php' ;
+	protected $stubFilename = 'Migration.php';
 
 	public function __construct($scaffolderConfig, $modelData = null)
 	{
-		$this->stubsDirectory = __DIR__ . '/../../../../stubs/Api/';
+		$this->stubsDirectory = __DIR__.'/../../../../stubs/Api/';
 
 		parent::__construct($scaffolderConfig, $modelData);
 
@@ -46,7 +46,7 @@ 
 	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';
+		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';
 	}
 
 	/**
@@ -59,7 +59,7 @@ 
 	private function addFields()
 	{
 		// Default primary key
-		$fields = "\t\t\t\$table->increments('id');" . PHP_EOL . PHP_EOL;
+		$fields = "\t\t\t\$table->increments('id');".PHP_EOL.PHP_EOL;
 
 		// Check primary key
 		# TODO FIX, primary
@@ -68,12 +68,12 @@ 
 		{
 			$parsedModifiers = '';
 
-			if($field->index == "primary")
-				continue ;
-			if($this->modelData->timeStamps && $field->name == "created_at")
-				continue ;
-			if($this->modelData->timeStamps && $field->name == "updated_at")
-				continue ;
+			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))
@@ -86,11 +86,11 @@ 
 
 					if (count($modifierAndValue) == 2)
 					{
-						$parsedModifiers .= '->' . $modifierAndValue[0] . '(' . $modifierAndValue[1] . ')';
+						$parsedModifiers .= '->'.$modifierAndValue[0].'('.$modifierAndValue[1].')';
 					}
 					else
 					{
-						$parsedModifiers .= '->' . $modifierAndValue[0] . '()';
+						$parsedModifiers .= '->'.$modifierAndValue[0].'()';
 					}
 				}
 			}
@@ -104,33 +104,33 @@ 
 			// 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);
+				$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 . "'";
+						$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);
+					$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);
+					$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);
+				$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;
+		if ($this->modelData->timeStamps)
+			$fields .= PHP_EOL."\t\t\t\$table->timestamps();".PHP_EOL;
 
 		$this->stub = str_replace('{{fields}}', $fields, $this->stub);
 

Braces +19 added lines, -16 removed lines

@@ -68,12 +68,15 @@ 
 		{
 			$parsedModifiers = '';
 
-			if($field->index == "primary")
-				continue ;
-			if($this->modelData->timeStamps && $field->name == "created_at")
-				continue ;
-			if($this->modelData->timeStamps && $field->name == "updated_at")
-				continue ;
+			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))
@@ -87,8 +90,7 @@ 
 					if (count($modifierAndValue) == 2)
 					{
 						$parsedModifiers .= '->' . $modifierAndValue[0] . '(' . $modifierAndValue[1] . ')';
-					}
-					else
+					} else
 					{
 						$parsedModifiers .= '->' . $modifierAndValue[0] . '()';
 					}
@@ -105,21 +107,21 @@ 
 			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
+			} else
 			{
 				if ($field->type->db == "enum") {
 					$items = '';
 					foreach ($field->options as $key => $option) {
 						$items .= "'" . $option . "'";
-						if ($key < (count($field->options) - 1))
-							$items .= ", ";
+						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);
 				}
-				else
-					$fields .= sprintf("\t\t\t\$table->%s('%s')%s;" . PHP_EOL, $field->type->db, $field->name, $parsedModifiers);
 			}
 
 			// Check foreign key
@@ -129,8 +131,9 @@ 
 			}
 		}
 
-		if($this->modelData->timeStamps)
-			$fields .= PHP_EOL . "\t\t\t\$table->timestamps();" . PHP_EOL;
+		if($this->modelData->timeStamps) {
+					$fields .= PHP_EOL . "\t\t\t\$table->timestamps();" . PHP_EOL;
+		}
 
 		$this->stub = str_replace('{{fields}}', $fields, $this->stub);
 

src/Scaffolder/Compilers/Core/ModelCompiler.php

Doc Comments +9 added lines, -2 removed lines

@@ -14,6 +14,9 @@ 
 	protected $cachePrefix 	= 'model_';
 	protected $stubFilename = 'Model/Model.php' ;
 
+	/**
+	 * @param string $stubName
+	 */
 	public function __construct($scaffolderConfig, $modelData = null, $stubName = null)
 	{
 		if ($stubName)
@@ -25,7 +28,7 @@ 
 	/**
 	 * Replace and store the Stub.
 	 *
-	 * @return string
+	 * @return ModelCompiler
 	 */
 	public function replaceAndStore()
 	{
@@ -54,7 +57,7 @@ 
 	 * Get output filename
 	 *
 	 *
-	 * @return $this
+	 * @return string
 	 */
 	protected function getOutputFilename()
 	{
@@ -528,6 +531,10 @@ 
 	 * @return $this
 	 */
 	private $conditionsStub = [];
+
+	/**
+	 * @return string
+	 */
 	private function getConditionStubByField($field){
 		
 		if($field->index == 'primary'){

Unused Use Statements -1 removed lines

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

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

Spacing +96 added lines, -96 removed lines

@@ -12,13 +12,13 @@ 
 class ModelCompiler extends AbstractCompiler
 {
 	protected $cachePrefix 	= 'model_';
-	protected $stubFilename = 'Model/Model.php' ;
+	protected $stubFilename = 'Model/Model.php';
 
 	public function __construct($scaffolderConfig, $modelData = null, $stubName = null)
 	{
 		if ($stubName)
 			$this->stubFilename = $stubName;
-		$this->stubsDirectory = __DIR__ . '/../../../../stubs/Api/';
+		$this->stubsDirectory = __DIR__.'/../../../../stubs/Api/';
 		parent::__construct($scaffolderConfig, $modelData);
 	}
 
@@ -58,9 +58,9 @@ 
 	 */
 	protected function getOutputFilename()
 	{
-		$folder = PathParser::parse($this->scaffolderConfig->generator->paths->models) ;
+		$folder = PathParser::parse($this->scaffolderConfig->generator->paths->models);
 
-		return $folder .  $this->modelName . '.php';
+		return $folder.$this->modelName.'.php';
 	}
 
 	
@@ -91,21 +91,21 @@ 
 
 		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 ($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);
+				$fields .= sprintf("'%s',".PHP_EOL, $field->name);
 				$firstIteration = false;
 			}
 			else
 			{
-				$fields .= sprintf("\t\t'%s'," . PHP_EOL, $field->name);
+				$fields .= sprintf("\t\t'%s',".PHP_EOL, $field->name);
 			}
 		}
 
@@ -120,13 +120,13 @@ 
 		$arrays = '';
 		
 		foreach ($this->modelData->fields as $field) {
-			$enumStub = File::get($this->stubsDirectory . '/Model/ModelEnum.php');
+			$enumStub = File::get($this->stubsDirectory.'/Model/ModelEnum.php');
 
 			if ($field->type->db == "enum") {
 				$items = '';
 				
 				foreach ($field->options as $key => $option) {
-					$items .= "'" . $option . "'";
+					$items .= "'".$option."'";
 					if ($key < (count($field->options) - 1))
 						$items .= ", ";
 
@@ -160,25 +160,25 @@ 
 
 		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 ($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);
+				$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 .= sprintf("\t\t\t'%s' => '%s',".PHP_EOL, $field->name, $field->validations);
 			}
 		}
 
-		$fields = str_replace('unique','unique:'.$this->modelData->tableName,$fields);
+		$fields = str_replace('unique', 'unique:'.$this->modelData->tableName, $fields);
 		//var_dump($fields);
 
 		$this->stub = str_replace('{{validations}}', $fields, $this->stub);
@@ -192,7 +192,7 @@ 
 	 */
 	private function setTimeStamps()
 	{
-		if($this->modelData->timeStamps)
+		if ($this->modelData->timeStamps)
 		{
 			$this->stub = str_replace('{{timestamps}}', ' ', $this->stub);
 		} else {
@@ -208,11 +208,11 @@ 
 	 */
 	private function setPrimaryKey()
 	{
-		$primaryKey = '// Using default primary key' . PHP_EOL;
+		$primaryKey = '// Using default primary key'.PHP_EOL;
 
-		$field = $this->getPrimaryKeyField() ;
+		$field = $this->getPrimaryKeyField();
 
-		$primaryKey = 'protected $primaryKey = \'' . $field->name . '\';' . PHP_EOL;
+		$primaryKey = 'protected $primaryKey = \''.$field->name.'\';'.PHP_EOL;
 
 		$this->stub = str_replace('{{primaryAttribute}}', $primaryKey, $this->stub);
 
@@ -241,13 +241,13 @@ 
 				$functionName = $field->foreignKey->table;
 
 				if ($field->foreignKey->relationship == "belongsTo") {
-					$belongsToOriginalStub = File::get($this->stubsDirectory . '/Model/ModelBelongsTo.php');
+					$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');
+					$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);
@@ -258,9 +258,9 @@ 
 				$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){
+				if (isset($field->foreignKey->eager) && $field->foreignKey->eager) {
 					array_push($eagerArray, "'".$field->foreignKey->table."'");
 				}
 			}
@@ -270,7 +270,7 @@ 
 
 		$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;
 	}
@@ -295,7 +295,7 @@ 
 					$functionName = CamelCase::pluralize(strtolower($relationship->modelName));
 				
 				if ($relationship->type == "belongsToMany") {
-					$reverseRelationshipOriginalStub = File::get($this->stubsDirectory . '/Model/ModelBelongsToMany.php');
+					$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);
@@ -303,7 +303,7 @@ 
 					$reverseRelationshipStub = str_replace('{{foreign_table}}', CamelCase::pluralize(strtolower($relationship->relatedTable)), $reverseRelationshipStub);
 				}
 				else {
-					$reverseRelationshipOriginalStub = File::get($this->stubsDirectory . '/Model/ModelReverseRelationship.php');
+					$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);
@@ -313,9 +313,9 @@ 
 					
 				$reverseRelationshipStub = str_replace('{{model_namespace}}', $this->scaffolderConfig->generator->namespaces->models, $reverseRelationshipStub);
 				
-				$functions .= $reverseRelationshipStub ;
+				$functions .= $reverseRelationshipStub;
 
-				if(isset($relationship->foreignKey->eager) && $relationship->foreignKey->eager){
+				if (isset($relationship->foreignKey->eager) && $relationship->foreignKey->eager) {
 					array_push($eagerArray, "'".$relationship->foreignKey->table."'");
 				}
 			}
@@ -340,11 +340,11 @@ 
 		$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)
 		{
@@ -354,20 +354,20 @@ 
 			{
 
 				$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) ;
+				$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();
+				$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) ;
+				$ruleCommands = str_replace('{{unique_eager_rules}}', $eagerUniqueRules, $ruleCommands);
 			}
 
 		}
@@ -400,7 +400,7 @@ 
 		$joins = "";
 		$joinSorts = "";
 
-		$method = File::get($this->stubsDirectory . '/Model/ModelRelationshipTable.php');
+		$method = File::get($this->stubsDirectory.'/Model/ModelRelationshipTable.php');
 
 		foreach ($this->modelData->reverseRelationships as $relationship) {
 
@@ -426,9 +426,9 @@ 
 				$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 = 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);
@@ -440,9 +440,9 @@ 
 				$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 = 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);
@@ -450,12 +450,12 @@ 
 				$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);
 
-				$includes .= $use . "\n";
+				$includes .= $use."\n";
 			}
 		}
 
@@ -483,7 +483,7 @@ 
 	 *
 	 * @return $this
 	 */
-	private function replaceSearchConditions(){
+	private function replaceSearchConditions() {
 
 		$searchConditions = $this->getSearchConditions();
 
@@ -497,16 +497,16 @@ 
 	 *
 	 * @return $this
 	 */
-	public function getSearchConditions(){
+	public function getSearchConditions() {
 
 		$fieldConditions = '';
 
-		$searchConditions = File::get($this->stubsDirectory . '/SearchConditions/Conditions.php');
+		$searchConditions = File::get($this->stubsDirectory.'/SearchConditions/Conditions.php');
 
 		foreach ($this->modelData->fields as $field)
 		{
 
-			$fieldConditions .= $this->replaceFieldStrings($field, $this->getConditionStubByField($field)) ;
+			$fieldConditions .= $this->replaceFieldStrings($field, $this->getConditionStubByField($field));
 
 		}
 
@@ -516,7 +516,7 @@ 
 		// replace table name
 		$searchConditions = str_replace('{{table_name}}', $this->modelData->tableName, $searchConditions);
 
-		return $searchConditions ;
+		return $searchConditions;
 
 	}
 
@@ -528,43 +528,43 @@ 
 	 * @return $this
 	 */
 	private $conditionsStub = [];
-	private function getConditionStubByField($field){
+	private function getConditionStubByField($field) {
 		
-		if($field->index == 'primary'){
-			$dbType = 'primary' ;
+		if ($field->index == 'primary') {
+			$dbType = 'primary';
 		}
-		elseif($field->foreignKey){
-			$dbType = 'primary' ;
+		elseif ($field->foreignKey) {
+			$dbType = 'primary';
 		}
-		elseif($field->type->db == 'enum'){
-			$dbType = 'primary' ;
+		elseif ($field->type->db == 'enum') {
+			$dbType = 'primary';
 		}
-		elseif($field->type->db == 'boolean'){
-			$dbType = 'primary' ;
+		elseif ($field->type->db == 'boolean') {
+			$dbType = 'primary';
 		}
-		elseif($field->type->db == 'text'){
-			$dbType = 'string' ;
+		elseif ($field->type->db == 'text') {
+			$dbType = 'string';
 		}
 		else {
-			$dbType = $field->type->db ;
+			$dbType = $field->type->db;
 		}
 
-		if(array_key_exists($dbType, $this->conditionsStub)){
+		if (array_key_exists($dbType, $this->conditionsStub)) {
 			return $this->conditionsStub[$dbType];
 		}
 		else {
-			$this->conditionsStub[$dbType] = File::get($this->stubsDirectory . 'SearchConditions/'. ucwords($dbType). '.php');;
+			$this->conditionsStub[$dbType] = File::get($this->stubsDirectory.'SearchConditions/'.ucwords($dbType).'.php'); ;
 
 			return $this->conditionsStub[$dbType];
 		}
 	}
 
-	public function replaceSortConditions()	{
+	public function replaceSortConditions() {
 		$joinSorts = '';
 
 		foreach ($this->modelData->fields as $field) {
-			if($field->foreignKey){
-				$joinSortStub = File::get($this->stubsDirectory . 'SearchConditions/JoinSort.php');
+			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);
@@ -589,11 +589,11 @@ 
 	 *
 	 * @return $this
 	 */
-	public function replaceReverseRelationshipsFunctions(){
+	public function replaceReverseRelationshipsFunctions() {
 
 		$functions = '';
 
-		$method = File::get($this->stubsDirectory . '/Model/ModelReverseRelationshipFunctions.php');
+		$method = File::get($this->stubsDirectory.'/Model/ModelReverseRelationshipFunctions.php');
 
 		foreach ($this->modelData->reverseRelationships as $relationship)
 		{
@@ -625,9 +625,9 @@ 
 	 *
 	 * @return $this
 	 */
-	public function replaceCheckbox(){
+	public function replaceCheckbox() {
 
-		$method = File::get($this->stubsDirectory . '/Model/ModelCheckbox.php');
+		$method = File::get($this->stubsDirectory.'/Model/ModelCheckbox.php');
 		$key = false;
 
 		$method = str_replace('{{class_name_lw}}', $this->modelData->tableName, $method);
@@ -645,7 +645,7 @@ 
 	 *
 	 * @return $this
 	 */
-	private function replaceSimpleFilter(){
+	private function replaceSimpleFilter() {
 		$i = 0;
 
 		$stubSimpleFilter = '';
@@ -654,41 +654,41 @@ 
 		{
 			//var_dump($field->name);
 			
-			if($field->index == 'primary'){
-				$dbType = 'primaryKey' ;
+			if ($field->index == 'primary') {
+				$dbType = 'primaryKey';
 			}
-			elseif($field->foreignKey){
-				$dbType = 'primary' ;
+			elseif ($field->foreignKey) {
+				$dbType = 'primary';
 			}
-			elseif($field->type->db == 'enum'){
-				$dbType = 'primary' ;
+			elseif ($field->type->db == 'enum') {
+				$dbType = 'primary';
 			}
-			elseif($field->type->db == 'boolean'){
-				$dbType = 'primary' ;
+			elseif ($field->type->db == 'boolean') {
+				$dbType = 'primary';
 			}
-			elseif($field->type->db == 'text'){
-				$dbType = 'string' ;
+			elseif ($field->type->db == 'text') {
+				$dbType = 'string';
 			}
 			else {
-				$dbType = $field->type->db ;
+				$dbType = $field->type->db;
 			}
 			
-			if($dbType == 'primaryKey')
+			if ($dbType == 'primaryKey')
 			{
 				$stubSimpleFilter .= '$query->where("'.$this->modelData->tableName.'.'.$field->name.'", "=", $'.$this->modelData->tableName.'Conditions["'.$field->name.'"])'.PHP_EOL;
 			}
 
-			if($dbType == 'primary')
+			if ($dbType == 'primary')
 			{
 				$stubSimpleFilter .= '->orWhere("'.$this->modelData->tableName.'.'.$field->name.'", "=", $'.$this->modelData->tableName.'Conditions["'.$field->name.'"])'.PHP_EOL;
 			}
 
-			if($dbType == 'string')
+			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')
+			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;
 			}

Braces +51 added lines, -56 removed lines

@@ -16,8 +16,9 @@ 
 
 	public function __construct($scaffolderConfig, $modelData = null, $stubName = null)
 	{
-		if ($stubName)
-			$this->stubFilename = $stubName;
+		if ($stubName) {
+					$this->stubFilename = $stubName;
+		}
 		$this->stubsDirectory = __DIR__ . '/../../../../stubs/Api/';
 		parent::__construct($scaffolderConfig, $modelData);
 	}
@@ -91,19 +92,21 @@ 
 
 		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($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
+			} else
 			{
 				$fields .= sprintf("\t\t'%s'," . PHP_EOL, $field->name);
 			}
@@ -127,8 +130,9 @@ 
 				
 				foreach ($field->options as $key => $option) {
 					$items .= "'" . $option . "'";
-					if ($key < (count($field->options) - 1))
-						$items .= ", ";
+					if ($key < (count($field->options) - 1)) {
+											$items .= ", ";
+					}
 
 				}
 
@@ -160,19 +164,21 @@ 
 
 		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($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
+			} else
 			{
 				$fields .= sprintf("\t\t\t'%s' => '%s'," . PHP_EOL, $field->name, $field->validations);
 			}
@@ -245,8 +251,7 @@ 
 					$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") {
+				} 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);
@@ -289,10 +294,11 @@ 
 			{
 				$reverseRelationshipStub = "";
 				$functionName = '';
-				if ($relationship->type == "hasOne")
-					$functionName = strtolower($relationship->modelName);
-				else 
-					$functionName = CamelCase::pluralize(strtolower($relationship->modelName));
+				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');
@@ -301,8 +307,7 @@ 
 					$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 {
+				} else {
 					$reverseRelationshipOriginalStub = File::get($this->stubsDirectory . '/Model/ModelReverseRelationship.php');
 					$reverseRelationshipStub = str_replace('{{foreign_model}}', $relationship->modelName, $reverseRelationshipOriginalStub);
 					$reverseRelationshipStub = str_replace('{{field}}', $relationship->foreignKey, $reverseRelationshipStub);
@@ -532,27 +537,21 @@ 
 		
 		if($field->index == 'primary'){
 			$dbType = 'primary' ;
-		}
-		elseif($field->foreignKey){
+		} elseif($field->foreignKey){
 			$dbType = 'primary' ;
-		}
-		elseif($field->type->db == 'enum'){
+		} elseif($field->type->db == 'enum'){
 			$dbType = 'primary' ;
-		}
-		elseif($field->type->db == 'boolean'){
+		} elseif($field->type->db == 'boolean'){
 			$dbType = 'primary' ;
-		}
-		elseif($field->type->db == 'text'){
+		} elseif($field->type->db == 'text'){
 			$dbType = 'string' ;
-		}
-		else {
+		} else {
 			$dbType = $field->type->db ;
 		}
 
 		if(array_key_exists($dbType, $this->conditionsStub)){
 			return $this->conditionsStub[$dbType];
-		}
-		else {
+		} else {
 			$this->conditionsStub[$dbType] = File::get($this->stubsDirectory . 'SearchConditions/'. ucwords($dbType). '.php');;
 
 			return $this->conditionsStub[$dbType];
@@ -598,12 +597,13 @@ 
 		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));
+			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);
@@ -656,20 +656,15 @@ 
 			
 			if($field->index == 'primary'){
 				$dbType = 'primaryKey' ;
-			}
-			elseif($field->foreignKey){
+			} elseif($field->foreignKey){
 				$dbType = 'primary' ;
-			}
-			elseif($field->type->db == 'enum'){
+			} elseif($field->type->db == 'enum'){
 				$dbType = 'primary' ;
-			}
-			elseif($field->type->db == 'boolean'){
+			} elseif($field->type->db == 'boolean'){
 				$dbType = 'primary' ;
-			}
-			elseif($field->type->db == 'text'){
+			} elseif($field->type->db == 'text'){
 				$dbType = 'string' ;
-			}
-			else {
+			} else {
 				$dbType = $field->type->db ;
 			}
 			

src/Scaffolder/Compilers/Core/RouteCompiler.php

Doc Comments +2 added lines, -2 removed lines

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

Indentation +154 added lines, -154 removed lines

@@ -10,165 +10,165 @@
 
 class RouteCompiler extends AbstractCompiler
 {
-	protected $stubFilename = 'Routes.php' ;
+    protected $stubFilename = 'Routes.php' ;
 
-	protected $stubResourceFilename = 'ResourceRoute.php' ;
-	protected $stubResource  ;
+    protected $stubResourceFilename = 'ResourceRoute.php' ;
+    protected $stubResource  ;
 
 
-	public function __construct($scaffolderConfig, $modelData = null)
-	{
-		$this->stubsDirectory = __DIR__ . '/../../../../stubs/Api/';
-		parent::__construct($scaffolderConfig, null);
+    public function __construct($scaffolderConfig, $modelData = null)
+    {
+        $this->stubsDirectory = __DIR__ . '/../../../../stubs/Api/';
+        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($compiledRoutes)
-	{
-
-		$this->replaceRoutes($compiledRoutes)
-			->replaceRoutePrefix()
-			->store(new FileToCompile(null, null));
-
-		return $this->stub;
-	}
-
-
-	/**
-	 * Get output filename
-	 *
-	 *
-	 * @return $this
-	 */
-	protected function getOutputFilename()
-	{
-		$folder = PathParser::parse($this->scaffolderConfig->generator->paths->routes);
-
-		return $folder  . 'routes.php';
-	}
-
-
-	/**
-	 * 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($compiledRoutes)
+    {
+
+        $this->replaceRoutes($compiledRoutes)
+            ->replaceRoutePrefix()
+            ->store(new FileToCompile(null, null));
+
+        return $this->stub;
+    }
+
+
+    /**
+     * Get output filename
+     *
+     *
+     * @return $this
+     */
+    protected function getOutputFilename()
+    {
+        $folder = PathParser::parse($this->scaffolderConfig->generator->paths->routes);
+
+        return $folder  . 'routes.php';
+    }
+
+
+    /**
+     * Replace the resource.
+     *
+     * @param $this->modelName
+     *
+     * @return string routeStub
+     */
+    public function replaceResource($modelData)
+    {
 		
-		$routeStub = str_replace('{{resource_lw}}', strtolower($modelData->modelName), $this->stubResource);
-		$routeStub = str_replace('{{resource}}', $modelData->modelName, $routeStub);
-		$routeStub = str_replace('{{reverseRelationships}}', $this->replaceReverseRelationships($modelData), $routeStub);
-		$routeStub = str_replace('{{enum}}', $this->replaceEnum($modelData), $routeStub);
-
-		return $routeStub;
-	}
-
-	/**
-	 * Replace the reverse relationships.
-	 *
-	 * @param $this->modelData
-	 *
-	 * @return string functions
-	 */
-	public function replaceReverseRelationships($modelData)
-	{
-		$functions = '';
-
-		foreach ($modelData->reverseRelationships as $relationship)
-		{
-			if ($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));
-
-				$method = "\tRoute::get('{{resource_lw}}/{id}/{{function_name}}', '{{resource}}Controller@{{function_name}}');\n";
-				$method = str_replace('{{resource_lw}}', strtolower($modelData->modelName), $method);
-				$method = str_replace('{{function_name}}', $functionName, $method);
-				$method = str_replace('{{resource}}', $modelData->modelName, $method);
-
-				$functions .= $method;
-			}
-		}
-
-		return $functions;
-	}
-
-	/**
-	 * Replace the enum.
-	 *
-	 * @param $this->modelData
-	 *
-	 * @return string functions
-	 */
-	public function replaceEnum($modelData)
-	{
-		$functions = '';
-
-		foreach ($modelData->fields as $field)
-		{
-			if ($field->type->db == "enum")
-			{
-				$method = "\tRoute::get('{{resource_lw}}/{{field_name}}', '{{resource}}Controller@get{{field_name_uc}}Options');\n";
-				$method = str_replace('{{resource_lw}}', strtolower($modelData->modelName), $method);
-				$method = str_replace('{{field_name_uc}}', CamelCase::convertToCamelCase($field->name), $method);
-				$method = str_replace('{{field_name}}', $field->name, $method);
-				$method = str_replace('{{resource}}', $modelData->modelName, $method);
-
-				$functions .= $method;
-			}
-		}
-
-		return $functions;
-	}
-
-
-	/**
-	 * Replace compiled routes.
-	 *
-	 * @param $compiledRoutes
-	 *
-	 * @return $this
-	 */
-	private function replaceRoutes($compiledRoutes)
-	{
-		$this->stub = str_replace('{{routes}}', $compiledRoutes, $this->stub);
-
-		return $this;
-	}
+        $routeStub = str_replace('{{resource_lw}}', strtolower($modelData->modelName), $this->stubResource);
+        $routeStub = str_replace('{{resource}}', $modelData->modelName, $routeStub);
+        $routeStub = str_replace('{{reverseRelationships}}', $this->replaceReverseRelationships($modelData), $routeStub);
+        $routeStub = str_replace('{{enum}}', $this->replaceEnum($modelData), $routeStub);
+
+        return $routeStub;
+    }
+
+    /**
+     * Replace the reverse relationships.
+     *
+     * @param $this->modelData
+     *
+     * @return string functions
+     */
+    public function replaceReverseRelationships($modelData)
+    {
+        $functions = '';
+
+        foreach ($modelData->reverseRelationships as $relationship)
+        {
+            if ($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));
+
+                $method = "\tRoute::get('{{resource_lw}}/{id}/{{function_name}}', '{{resource}}Controller@{{function_name}}');\n";
+                $method = str_replace('{{resource_lw}}', strtolower($modelData->modelName), $method);
+                $method = str_replace('{{function_name}}', $functionName, $method);
+                $method = str_replace('{{resource}}', $modelData->modelName, $method);
+
+                $functions .= $method;
+            }
+        }
+
+        return $functions;
+    }
+
+    /**
+     * Replace the enum.
+     *
+     * @param $this->modelData
+     *
+     * @return string functions
+     */
+    public function replaceEnum($modelData)
+    {
+        $functions = '';
+
+        foreach ($modelData->fields as $field)
+        {
+            if ($field->type->db == "enum")
+            {
+                $method = "\tRoute::get('{{resource_lw}}/{{field_name}}', '{{resource}}Controller@get{{field_name_uc}}Options');\n";
+                $method = str_replace('{{resource_lw}}', strtolower($modelData->modelName), $method);
+                $method = str_replace('{{field_name_uc}}', CamelCase::convertToCamelCase($field->name), $method);
+                $method = str_replace('{{field_name}}', $field->name, $method);
+                $method = str_replace('{{resource}}', $modelData->modelName, $method);
+
+                $functions .= $method;
+            }
+        }
+
+        return $functions;
+    }
+
+
+    /**
+     * Replace compiled routes.
+     *
+     * @param $compiledRoutes
+     *
+     * @return $this
+     */
+    private function replaceRoutes($compiledRoutes)
+    {
+        $this->stub = str_replace('{{routes}}', $compiledRoutes, $this->stub);
+
+        return $this;
+    }
 
 	
 }

Spacing +7 added lines, -7 removed lines

@@ -10,18 +10,18 @@ 
 
 class RouteCompiler extends AbstractCompiler
 {
-	protected $stubFilename = 'Routes.php' ;
+	protected $stubFilename = 'Routes.php';
 
-	protected $stubResourceFilename = 'ResourceRoute.php' ;
-	protected $stubResource  ;
+	protected $stubResourceFilename = 'ResourceRoute.php';
+	protected $stubResource;
 
 
 	public function __construct($scaffolderConfig, $modelData = null)
 	{
-		$this->stubsDirectory = __DIR__ . '/../../../../stubs/Api/';
+		$this->stubsDirectory = __DIR__.'/../../../../stubs/Api/';
 		parent::__construct($scaffolderConfig, null);
 		
-		$this->stubResource = File::get($this->stubsDirectory . $this->stubResourceFilename );
+		$this->stubResource = File::get($this->stubsDirectory.$this->stubResourceFilename);
 	}
 
 	/**
@@ -29,7 +29,7 @@ 
 	 *
 	 * @return string
 	 */
-	public function replaceAndStore(){}
+	public function replaceAndStore() {}
 
 	/**
 	 * Compiles a resource.
@@ -70,7 +70,7 @@ 
 	{
 		$folder = PathParser::parse($this->scaffolderConfig->generator->paths->routes);
 
-		return $folder  . 'routes.php';
+		return $folder.'routes.php';
 	}
 
 

Braces +7 added lines, -6 removed lines

@@ -108,12 +108,13 @@
 			if ($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));
+				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));
+				}
 
 				$method = "\tRoute::get('{{resource_lw}}/{id}/{{function_name}}', '{{resource}}Controller@{{function_name}}');\n";
 				$method = str_replace('{{resource_lw}}', strtolower($modelData->modelName), $method);

src/Scaffolder/ScaffolderServiceProvider.php

Doc Comments +1 added lines, -1 removed lines

@@ -68,7 +68,7 @@
 	/**
 	 * Get the services provided by the provider.
 	 *
-	 * @return array
+	 * @return string[]
 	 */
 	public function provides()
 	{

Indentation +56 added lines, -56 removed lines

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

Spacing +6 added lines, -6 removed lines

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

src/Scaffolder/Support/Arrays.php

Doc Comments +3 added lines

@@ -4,6 +4,9 @@
 
 class Arrays
 {
+	/**
+	 * @param integer $targetIndex
+	 */
 	public static function moveElement($array, $toMove, $targetIndex) {
 		if (count($array) == 1)
 			return $array;

Indentation +24 added lines, -24 removed lines

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

Spacing +1 added lines, -1 removed lines

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

Braces +4 added lines, -4 removed lines

@@ -5,14 +5,14 @@
 class Arrays
 {
 	public static function moveElement($array, $toMove, $targetIndex) {
-		if (count($array) == 1)
-			return $array;
+		if (count($array) == 1) {
+					return $array;
+		}
 		if (is_int($toMove)) {
 			$tmp = array_splice($array, $toMove, 1);
 			array_splice($array, $targetIndex, 0, $tmp);
 			$output = $array;
-		}
-		elseif (is_string($toMove)) {
+		} elseif (is_string($toMove)) {
 			$indexToMove = array_search($toMove, array_keys($array));
 			$itemToMove = $array[$toMove];
 			array_splice($array, $indexToMove, 1);

src/Scaffolder/Support/Validator.php

Doc Comments +2 added lines, -2 removed lines

@@ -34,7 +34,7 @@ 
 	 *
 	 * @param  string  $rule
 	 * @param  string  $parameter
-	 * @return array
+	 * @return string
 	 */
 	public static function parseParameters($rule, $parameter)
 	{
@@ -48,7 +48,7 @@ 
 	/**
 	 * Explode the rules into an array of rules.
 	 *
-	 * @param  string  $rules
+	 * @param  string  $rule
 	 * @return array
 	 */
 	public static function explodeRule($rule)

Unused Use Statements -3 removed lines

@@ -2,9 +2,6 @@
 
 namespace Scaffolder\Support;
 
-use Illuminate\Support\Arr;
-use Illuminate\Support\Str;
-
 class Validator
 {
 	/**

Indentation +92 added lines, -92 removed lines

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

Spacing +14 added lines, -14 removed lines

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

Braces +4 added lines, -4 removed lines

@@ -77,8 +77,7 @@ 
 						if($blnSearch) {
 							$attribute = null ;
 							$attributeValue = null ;
-						}
-						else {
+						} else {
 							$attribute = "required" ;
 							$attributeValue = null ;
 						}
@@ -97,8 +96,9 @@ 
 						break;
 				}
 
-				if($attribute)
-					$validationsConverted[$attribute] = $attributeValue ;
+				if($attribute) {
+									$validationsConverted[$attribute] = $attributeValue ;
+				}
 
 			}
 			

src/Scaffolder/Support/Directory.php

Indentation +7 added lines, -7 removed lines

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

Spacing +1 added lines, -1 removed lines

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