codificar / scaffolder

src/Scaffolder/Compilers/Blade/EditViewCompiler.php

Braces +3 added lines, -6 removed lines

@@ -30,8 +30,7 @@ 
 		if (File::exists(base_path('scaffolder-config/cache/view_edit_' . $hash . self::CACHE_EXT)))
 		{
 			return $this->store($modelName, $scaffolderConfig, '', new FileToCompile(true, $hash));
-		}
-		else
+		} else
 		{
 			$this->stub = $stub;
 
@@ -67,8 +66,7 @@ 
 		if ($fileToCompile->cached)
 		{
 			File::copy(base_path('scaffolder-config/cache/view_edit_' . $fileToCompile->hash . self::CACHE_EXT), $path);
-		}
-		else
+		} else
 		{
 			File::put(base_path('scaffolder-config/cache/view_edit_' . $fileToCompile->hash . self::CACHE_EXT), $compiled);
 			File::copy(base_path('scaffolder-config/cache/view_edit_' . $fileToCompile->hash . self::CACHE_EXT), $path);
@@ -95,8 +93,7 @@ 
 			{
 				$fields .= sprintf(self::getInputFor($field) . PHP_EOL, $field->name);
 				$firstIteration = false;
-			}
-			else
+			} else
 			{
 				$fields .= sprintf("\t" . self::getInputFor($field) . PHP_EOL, $field->name);
 			}

src/Scaffolder/Compilers/Blade/IndexViewCompiler.php

Braces +4 added lines, -8 removed lines

@@ -26,8 +26,7 @@ 
         if (File::exists(base_path('scaffolder-config/cache/view_index_' . $hash . self::CACHE_EXT)))
         {
             return $this->store($modelName, $scaffolderConfig, '', new FileToCompile(true, $hash));
-        }
-        else
+        } else
         {
             $this->stub = $stub;
 
@@ -58,8 +57,7 @@ 
         if ($fileToCompile->cached)
         {
             File::copy(base_path('scaffolder-config/cache/view_index_' . $fileToCompile->hash . self::CACHE_EXT), $path);
-        }
-        else
+        } else
         {
             File::put(base_path('scaffolder-config/cache/view_index_' . $fileToCompile->hash . self::CACHE_EXT), $compiled);
             File::copy(base_path('scaffolder-config/cache/view_index_' . $fileToCompile->hash . self::CACHE_EXT), $path);
@@ -89,8 +87,7 @@ 
                 {
                     $fields .= sprintf("{ data: '%s', name: '%s' }," . PHP_EOL, $field->name, $field->name);
                     $firstIteration = false;
-                }
-                else
+                } else
                 {
                     $fields .= sprintf("\t\t\t\t{ data: '%s', name: '%s' }," . PHP_EOL, $field->name, $field->name);
                 }
@@ -124,8 +121,7 @@ 
                     $fields .= sprintf("<th>%s</th>" . PHP_EOL, ucfirst($field->name));
                     $firstIteration = false;
 
-                }
-                else
+                } else
                 {
                     $fields .= sprintf("\t\t\t<th>%s</th>" . PHP_EOL, ucfirst($field->name));
                 }

src/Scaffolder/Compilers/AngularJs/ListTemplateCompiler.php

Braces +13 added lines, -14 removed lines

@@ -122,10 +122,11 @@ 
 		$inputValidations = '' ; 
 
 		foreach ($validationsConverted as $attribute => $value) {
-			if($value)
-				$inputValidations .=  ' '.$attribute.'="'. $value.'"' ;
-			else
-				$inputValidations .=  ' '.$attribute  ; 
+			if($value) {
+							$inputValidations .=  ' '.$attribute.'="'. $value.'"' ;
+			} else {
+							$inputValidations .=  ' '.$attribute  ;
+			}
 		}
 
 		$fieldStub = str_replace('{{field_validation}}', $inputValidations, $fieldStub);
@@ -174,21 +175,19 @@ 
 		
 		if($field->index == 'primary'){
 			$uiType = 'primary' ;
-		}
-		elseif(isset($field->foreignKey) && $field->foreignKey){
-			if(isset($field->foreignKey->eager) && $field->foreignKey->eager)
-				$uiType = 'foreign_eager' ;
-			else 
-				$uiType = $field->type->ui ;
-		}
-		else {
+		} elseif(isset($field->foreignKey) && $field->foreignKey){
+			if(isset($field->foreignKey->eager) && $field->foreignKey->eager) {
+							$uiType = 'foreign_eager' ;
+			} else {
+							$uiType = $field->type->ui ;
+			}
+		} else {
 			$uiType = $field->type->ui ;
 		}
 
 		if(array_key_exists($uiType, $this->inputStub)){
 			return $this->inputStub[$uiType];
-		}
-		else {
+		} else {
 			$this->inputStub[$uiType] = File::get($this->stubsDirectory . 'List/'. CamelCase::convertToCamelCase($uiType). '.html');
 
 			return $this->inputStub[$uiType];

src/Scaffolder/Compilers/AngularJs/IndexApiCompiler.php

Braces +1 added lines, -2 removed lines

@@ -41,8 +41,7 @@
 		if (File::exists(base_path('scaffolder-config/cache/' . $this->cachePrefix  . self::CACHE_EXT)))
 		{
 			return $this->store(new FileToCompile(true, $this->cachePrefix));
-		}
-		else
+		} else
 		{
 
 			return $this->replaceAndStore();

src/Scaffolder/Compilers/AngularJs/RegisterTemplateCompiler.php

Braces +13 added lines, -14 removed lines

@@ -153,10 +153,11 @@ 
 		$inputValidations = '' ; 
 
 		foreach ($validationsConverted as $attribute => $value) {
-			if($value)
-				$inputValidations .=  ' '.$attribute.'="'. $value.'"' ;
-			else
-				$inputValidations .=  ' '.$attribute  ; 
+			if($value) {
+							$inputValidations .=  ' '.$attribute.'="'. $value.'"' ;
+			} else {
+							$inputValidations .=  ' '.$attribute  ;
+			}
 		}
 
 		$fieldStub = str_replace('{{field_validation}}', $inputValidations, $fieldStub);
@@ -177,21 +178,19 @@ 
 		
 		if($field->index == 'primary'){
 			$uiType = 'primary' ;
-		}
-		elseif(isset($field->foreignKey) && $field->foreignKey){
-			if(isset($field->foreignKey->eager) && $field->foreignKey->eager)
-				$uiType = 'foreign_eager' ;
-			else 
-				$uiType = $field->type->ui ;
-		}
-		else {
+		} elseif(isset($field->foreignKey) && $field->foreignKey){
+			if(isset($field->foreignKey->eager) && $field->foreignKey->eager) {
+							$uiType = 'foreign_eager' ;
+			} else {
+							$uiType = $field->type->ui ;
+			}
+		} else {
 			$uiType = $field->type->ui ;
 		}
 
 		if(array_key_exists($uiType, $this->inputStub)){
 			return $this->inputStub[$uiType];
-		}
-		else {
+		} else {
 			$this->inputStub[$uiType] = File::get($this->stubsDirectory . 'Register/'. CamelCase::convertToCamelCase($uiType). '.html');
 
 			return $this->inputStub[$uiType];

src/Scaffolder/Compilers/AbstractCompiler.php

Braces +9 added lines, -9 removed lines

@@ -43,8 +43,7 @@ 
 		if (File::exists(base_path('scaffolder-config/cache/' . $this->cachePrefix  . $this->modelData->modelHash . self::CACHE_EXT)))
 		{
 			return $this->store(new FileToCompile(true, $this->modelData->modelHash));
-		}
-		else
+		} else
 		{
 
 			return $this->replacePrimaryKey()
@@ -88,8 +87,7 @@ 
 		if ($fileToCompile->cached)
 		{
 			File::copy(base_path('scaffolder-config/cache/' . $this->cachePrefix . $fileToCompile->hash . self::CACHE_EXT), $path);
-		}
-		else
+		} else
 		{
 			File::put(base_path('scaffolder-config/cache/' . $this->cachePrefix . $fileToCompile->hash . self::CACHE_EXT), $this->stub);
 			File::copy(base_path('scaffolder-config/cache/' . $this->cachePrefix . $fileToCompile->hash . self::CACHE_EXT), $path);
@@ -197,8 +195,9 @@ 
 		$replaceStub = str_replace('{{foreign_model}}', ucwords($field->foreignKey->table), $replaceStub);
 		$replaceStub = str_replace('{{field}}', $field->name, $replaceStub);
 
-		if(isset($this->scaffolderConfig->generator->namespaces))
-			$replaceStub = str_replace('{{model_namespace}}', $this->scaffolderConfig->generator->namespaces->models, $replaceStub);
+		if(isset($this->scaffolderConfig->generator->namespaces)) {
+					$replaceStub = str_replace('{{model_namespace}}', $this->scaffolderConfig->generator->namespaces->models, $replaceStub);
+		}
 
 		return $replaceStub;
 		
@@ -215,7 +214,9 @@ 
 	protected function replaceFieldStrings($field,  $originalStubPart){
 		$replaceStub = str_replace('{{field}}', $field->name, $originalStubPart);
 		
-		if($this->eagerTable) $this->eagerTable.'.' ;
+		if($this->eagerTable) {
+		    $this->eagerTable.'.' ;
+		}
 
 		$replaceStub = str_replace('{{eager_table}}', $this->eagerTable, $replaceStub);
 
@@ -247,8 +248,7 @@ 
 		
 		if(array_key_exists($tableName, $this->modelDataArray)){
 			return $this->modelDataArray[$tableName];
-		}
-		else {
+		} else {
 
 			$modelFilename = base_path('scaffolder-config/models/') . $tableName . '.json' ;
 

src/Scaffolder/Compilers/Core/ModelCompiler.php

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

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

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];