Inspection of "Atualização dos arquivos do Scaffolder" - codificar/scaffolder - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Push — master ( 63d8d6...28be9d )

by Raphael

created 2017-03-30 19:20 UTC

Status

Spacing +8 added lines, -8 removed lines patch added patch discarded remove patch

@@ -27,7 +27,7 @@  discard block
 block discarded – undo
 	 */
 	public function compile($stub, $modelName, $modelData, $scaffolderConfig, $hash, $extra = null)
 	{
-		if (File::exists(base_path('scaffolder-config/cache/view_edit_' . $hash . self::CACHE_EXT)))
+		if (File::exists(base_path('scaffolder-config/cache/view_edit_'.$hash.self::CACHE_EXT)))
 		{
 			return $this->store($modelName, $scaffolderConfig, '', new FileToCompile(true, $hash));
 		}
@@ -56,22 +56,22 @@  discard block
 block discarded – undo
 	 */
 	protected function store($modelName, $scaffolderConfig, $compiled, FileToCompile $fileToCompile)
 	{
-		$folder = PathParser::parse($scaffolderConfig->generator->paths->views) . strtolower($modelName) ;
+		$folder = PathParser::parse($scaffolderConfig->generator->paths->views).strtolower($modelName);
 		
 		// create folder directory
 		Directory::createIfNotExists($folder, 0755, true);
 
-		$path   = $folder . '/edit.blade.php';
+		$path = $folder.'/edit.blade.php';
 
 		// Store in cache
 		if ($fileToCompile->cached)
 		{
-			File::copy(base_path('scaffolder-config/cache/view_edit_' . $fileToCompile->hash . self::CACHE_EXT), $path);
+			File::copy(base_path('scaffolder-config/cache/view_edit_'.$fileToCompile->hash.self::CACHE_EXT), $path);
 		}
 		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);
+			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);
 		}
 
 		return $path;
@@ -93,12 +93,12 @@  discard block
 block discarded – undo
 		{
 			if ($firstIteration)
 			{
-				$fields .= sprintf(self::getInputFor($field) . PHP_EOL, $field->name);
+				$fields .= sprintf(self::getInputFor($field).PHP_EOL, $field->name);
 				$firstIteration = false;
 			}
 			else
 			{
-				$fields .= sprintf("\t" . self::getInputFor($field) . PHP_EOL, $field->name);
+				$fields .= sprintf("\t".self::getInputFor($field).PHP_EOL, $field->name);
 			}
 		}
 

Please login to merge, or discard this patch.

src/Scaffolder/Compilers/Blade/IndexViewCompiler.php 1 patch

Spacing +10 added lines, -10 removed lines patch added patch discarded remove patch

@@ -24,7 +24,7 @@  discard block
 block discarded – undo
      */
     public function compile($stub, $modelName, $modelData, $scaffolderConfig, $hash, $extra = null)
     {
-        if (File::exists(base_path('scaffolder-config/cache/view_index_' . $hash . self::CACHE_EXT)))
+        if (File::exists(base_path('scaffolder-config/cache/view_index_'.$hash.self::CACHE_EXT)))
         {
             return $this->store($modelName, $scaffolderConfig, '', new FileToCompile(true, $hash));
         }
@@ -53,22 +53,22 @@  discard block
 block discarded – undo
      */
     protected function store($modelName, $scaffolderConfig, $compiled, FileToCompile $fileToCompile)
     {
-        $folder = PathParser::parse($scaffolderConfig->generator->paths->views) . strtolower($modelName) ;
+        $folder = PathParser::parse($scaffolderConfig->generator->paths->views).strtolower($modelName);
         
         // create folder directory
         Directory::createIfNotExists($folder, 0755, true);
 
-        $path = $folder  . '/index.blade.php';
+        $path = $folder.'/index.blade.php';
 
         // Store in cache
         if ($fileToCompile->cached)
         {
-            File::copy(base_path('scaffolder-config/cache/view_index_' . $fileToCompile->hash . self::CACHE_EXT), $path);
+            File::copy(base_path('scaffolder-config/cache/view_index_'.$fileToCompile->hash.self::CACHE_EXT), $path);
         }
         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);
+            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);
         }
 
         return $path;
@@ -93,12 +93,12 @@  discard block
 block discarded – undo
             {
                 if ($firstIteration)
                 {
-                    $fields .= sprintf("{ data: '%s', name: '%s' }," . PHP_EOL, $field->name, $field->name);
+                    $fields .= sprintf("{ data: '%s', name: '%s' },".PHP_EOL, $field->name, $field->name);
                     $firstIteration = false;
                 }
                 else
                 {
-                    $fields .= sprintf("\t\t\t\t{ data: '%s', name: '%s' }," . PHP_EOL, $field->name, $field->name);
+                    $fields .= sprintf("\t\t\t\t{ data: '%s', name: '%s' },".PHP_EOL, $field->name, $field->name);
                 }
             }
         }
@@ -127,13 +127,13 @@  discard block
 block discarded – undo
             {
                 if ($firstIteration)
                 {
-                    $fields .= sprintf("<th>%s</th>" . PHP_EOL, ucfirst($field->name));
+                    $fields .= sprintf("<th>%s</th>".PHP_EOL, ucfirst($field->name));
                     $firstIteration = false;
 
                 }
                 else
                 {
-                    $fields .= sprintf("\t\t\t<th>%s</th>" . PHP_EOL, ucfirst($field->name));
+                    $fields .= sprintf("\t\t\t<th>%s</th>".PHP_EOL, ucfirst($field->name));
                 }
             }
         }

Please login to merge, or discard this patch.

src/Scaffolder/Compilers/View/CreateViewCompiler.php 1 patch

Spacing +8 added lines, -8 removed lines patch added patch discarded remove patch

@@ -27,7 +27,7 @@  discard block
 block discarded – undo
 	 */
 	public function compile($stub, $modelName, $modelData, $scaffolderConfig, $hash, $extra = null)
 	{
-		if (File::exists(base_path('scaffolder-config/cache/view_create_' . $hash . self::CACHE_EXT)))
+		if (File::exists(base_path('scaffolder-config/cache/view_create_'.$hash.self::CACHE_EXT)))
 		{
 			return $this->store($modelName, $scaffolderConfig, '', new FileToCompile(true, $hash));
 		}
@@ -55,22 +55,22 @@  discard block
 block discarded – undo
 	 */
 	protected function store($modelName, $scaffolderConfig, $compiled, FileToCompile $fileToCompile)
 	{
-		$folder = PathParser::parse($scaffolderConfig->paths->views) . strtolower($modelName) ;
+		$folder = PathParser::parse($scaffolderConfig->paths->views).strtolower($modelName);
 		
 		// create folder directory
 		Directory::createIfNotExists($folder, 0755, true);
 
-		$path = $folder  . '/create.blade.php';
+		$path = $folder.'/create.blade.php';
 
 		// Store in cache
 		if ($fileToCompile->cached)
 		{
-			File::copy(base_path('scaffolder-config/cache/view_create_' . $fileToCompile->hash . self::CACHE_EXT), $path);
+			File::copy(base_path('scaffolder-config/cache/view_create_'.$fileToCompile->hash.self::CACHE_EXT), $path);
 		}
 		else
 		{
-			File::put(base_path('scaffolder-config/cache/view_create_' . $fileToCompile->hash . self::CACHE_EXT), $compiled);
-			File::copy(base_path('scaffolder-config/cache/view_create_' . $fileToCompile->hash . self::CACHE_EXT), $path);
+			File::put(base_path('scaffolder-config/cache/view_create_'.$fileToCompile->hash.self::CACHE_EXT), $compiled);
+			File::copy(base_path('scaffolder-config/cache/view_create_'.$fileToCompile->hash.self::CACHE_EXT), $path);
 		}
 
 		return $path;
@@ -92,12 +92,12 @@  discard block
 block discarded – undo
 		{
 			if ($firstIteration)
 			{
-				$fields .= sprintf(self::getInputFor($field) . PHP_EOL, $field->name);
+				$fields .= sprintf(self::getInputFor($field).PHP_EOL, $field->name);
 				$firstIteration = false;
 			}
 			else
 			{
-				$fields .= sprintf("\t" . self::getInputFor($field) . PHP_EOL, $field->name);
+				$fields .= sprintf("\t".self::getInputFor($field).PHP_EOL, $field->name);
 			}
 		}
 

Please login to merge, or discard this patch.

src/Scaffolder/Compilers/View/EditViewCompiler.php 1 patch

Spacing +8 added lines, -8 removed lines patch added patch discarded remove patch

@@ -27,7 +27,7 @@  discard block
 block discarded – undo
 	 */
 	public function compile($stub, $modelName, $modelData, $scaffolderConfig, $hash, $extra = null)
 	{
-		if (File::exists(base_path('scaffolder-config/cache/view_edit_' . $hash . self::CACHE_EXT)))
+		if (File::exists(base_path('scaffolder-config/cache/view_edit_'.$hash.self::CACHE_EXT)))
 		{
 			return $this->store($modelName, $scaffolderConfig, '', new FileToCompile(true, $hash));
 		}
@@ -56,22 +56,22 @@  discard block
 block discarded – undo
 	 */
 	protected function store($modelName, $scaffolderConfig, $compiled, FileToCompile $fileToCompile)
 	{
-		$folder = PathParser::parse($scaffolderConfig->paths->views) . strtolower($modelName) ;
+		$folder = PathParser::parse($scaffolderConfig->paths->views).strtolower($modelName);
 		
 		// create folder directory
 		Directory::createIfNotExists($folder, 0755, true);
 
-		$path   = $folder . '/edit.blade.php';
+		$path = $folder.'/edit.blade.php';
 
 		// Store in cache
 		if ($fileToCompile->cached)
 		{
-			File::copy(base_path('scaffolder-config/cache/view_edit_' . $fileToCompile->hash . self::CACHE_EXT), $path);
+			File::copy(base_path('scaffolder-config/cache/view_edit_'.$fileToCompile->hash.self::CACHE_EXT), $path);
 		}
 		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);
+			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);
 		}
 
 		return $path;
@@ -93,12 +93,12 @@  discard block
 block discarded – undo
 		{
 			if ($firstIteration)
 			{
-				$fields .= sprintf(self::getInputFor($field) . PHP_EOL, $field->name);
+				$fields .= sprintf(self::getInputFor($field).PHP_EOL, $field->name);
 				$firstIteration = false;
 			}
 			else
 			{
-				$fields .= sprintf("\t" . self::getInputFor($field) . PHP_EOL, $field->name);
+				$fields .= sprintf("\t".self::getInputFor($field).PHP_EOL, $field->name);
 			}
 		}
 

Please login to merge, or discard this patch.

src/Scaffolder/Compilers/View/IndexViewCompiler.php 1 patch

Spacing +10 added lines, -10 removed lines patch added patch discarded remove patch

@@ -24,7 +24,7 @@  discard block
 block discarded – undo
      */
     public function compile($stub, $modelName, $modelData, $scaffolderConfig, $hash, $extra = null)
     {
-        if (File::exists(base_path('scaffolder-config/cache/view_index_' . $hash . self::CACHE_EXT)))
+        if (File::exists(base_path('scaffolder-config/cache/view_index_'.$hash.self::CACHE_EXT)))
         {
             return $this->store($modelName, $scaffolderConfig, '', new FileToCompile(true, $hash));
         }
@@ -53,22 +53,22 @@  discard block
 block discarded – undo
      */
     protected function store($modelName, $scaffolderConfig, $compiled, FileToCompile $fileToCompile)
     {
-        $folder = PathParser::parse($scaffolderConfig->paths->views) . strtolower($modelName) ;
+        $folder = PathParser::parse($scaffolderConfig->paths->views).strtolower($modelName);
         
         // create folder directory
         Directory::createIfNotExists($folder, 0755, true);
 
-        $path = $folder  . '/index.blade.php';
+        $path = $folder.'/index.blade.php';
 
         // Store in cache
         if ($fileToCompile->cached)
         {
-            File::copy(base_path('scaffolder-config/cache/view_index_' . $fileToCompile->hash . self::CACHE_EXT), $path);
+            File::copy(base_path('scaffolder-config/cache/view_index_'.$fileToCompile->hash.self::CACHE_EXT), $path);
         }
         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);
+            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);
         }
 
         return $path;
@@ -93,12 +93,12 @@  discard block
 block discarded – undo
             {
                 if ($firstIteration)
                 {
-                    $fields .= sprintf("{ data: '%s', name: '%s' }," . PHP_EOL, $field->name, $field->name);
+                    $fields .= sprintf("{ data: '%s', name: '%s' },".PHP_EOL, $field->name, $field->name);
                     $firstIteration = false;
                 }
                 else
                 {
-                    $fields .= sprintf("\t\t\t\t{ data: '%s', name: '%s' }," . PHP_EOL, $field->name, $field->name);
+                    $fields .= sprintf("\t\t\t\t{ data: '%s', name: '%s' },".PHP_EOL, $field->name, $field->name);
                 }
             }
         }
@@ -127,13 +127,13 @@  discard block
 block discarded – undo
             {
                 if ($firstIteration)
                 {
-                    $fields .= sprintf("<th>%s</th>" . PHP_EOL, ucfirst($field->name));
+                    $fields .= sprintf("<th>%s</th>".PHP_EOL, ucfirst($field->name));
                     $firstIteration = false;
 
                 }
                 else
                 {
-                    $fields .= sprintf("\t\t\t<th>%s</th>" . PHP_EOL, ucfirst($field->name));
+                    $fields .= sprintf("\t\t\t<th>%s</th>".PHP_EOL, ucfirst($field->name));
                 }
             }
         }

Please login to merge, or discard this patch.

src/Scaffolder/Compilers/AngularJs/ListControllerCompiler.php 1 patch

Spacing +10 added lines, -10 removed lines patch added patch discarded remove patch

@@ -11,11 +11,11 @@  discard block
 block discarded – undo
 class ListControllerCompiler extends AbstractCompiler
 {
 	protected $cachePrefix 	= 'list_controller_';
-	protected $stubFilename = 'ListController.js' ;
+	protected $stubFilename = 'ListController.js';
 
 	public function __construct($scaffolderConfig, $modelData = null)
 	{
-		$this->stubsDirectory = __DIR__ . '/../../../../stubs/AngularJs/';
+		$this->stubsDirectory = __DIR__.'/../../../../stubs/AngularJs/';
 		parent::__construct($scaffolderConfig, $modelData);
 	}
 
@@ -37,23 +37,23 @@  discard block
 block discarded – undo
 	 *
 	 * @return $this
 	 */
-	public function replaceColumns(){
+	public function replaceColumns() {
 
 		$columns = $this->getGridColumns();
 
-		$this->stub = str_replace('{{grid_columns}}',  join(",\n ", $columns) , $this->stub); 
+		$this->stub = str_replace('{{grid_columns}}', join(",\n ", $columns), $this->stub); 
 
-		return $this ;
+		return $this;
 
 	}
 
-	public function getGridColumns(){
+	public function getGridColumns() {
 
 		$columns = [];
 
 		foreach ($this->modelData->fields as $field)
 		{
-			array_push($columns,  "\t\t\t".sprintf('{ name: vm. $t("%s.columns.%s"), field: "%s%s" }',  $this->modelData->tableName, $field->name, $this->eagerTable, $field->name ) );
+			array_push($columns, "\t\t\t".sprintf('{ name: vm. $t("%s.columns.%s"), field: "%s%s" }', $this->modelData->tableName, $field->name, $this->eagerTable, $field->name));
 
 			// Check foreign key
 			if ($field->foreignKey && isset($field->foreignKey->eager) && $field->foreignKey->eager)
@@ -62,7 +62,7 @@  discard block
 block discarded – undo
 				$foreignModelData = $this->getModelData($field->foreignKey->table);
 				$foreignControllerCompiler = new ListControllerCompiler($this->scaffolderConfig, $foreignModelData);
 				$foreignControllerCompiler->setEagerTable($field->foreignKey->table);
-				$eagerColumns 	= $foreignControllerCompiler->getGridColumns();
+				$eagerColumns = $foreignControllerCompiler->getGridColumns();
 
 				$columns = array_merge($columns, $eagerColumns);
 			}
@@ -81,11 +81,11 @@  discard block
 block discarded – undo
 	 */
 	protected function getOutputFilename()
 	{
-		$folder = PathParser::parse($this->scaffolderConfig->generator->paths->pages).$this->modelData->tableName.'/list/' ;
+		$folder = PathParser::parse($this->scaffolderConfig->generator->paths->pages).$this->modelData->tableName.'/list/';
 
 		Directory::createIfNotExists($folder, 0755, true);
 
-		return $folder .$this->modelData->tableName . '_list.controller.js';
+		return $folder.$this->modelData->tableName.'_list.controller.js';
 	}
 
 }
\ No newline at end of file

Please login to merge, or discard this patch.

src/Scaffolder/Compilers/AngularJs/ListTemplateCompiler.php 1 patch

Spacing +35 added lines, -35 removed lines patch added patch discarded remove patch

@@ -9,16 +9,16 @@  discard block
 block discarded – undo
 use Scaffolder\Support\Directory;
 use Scaffolder\Support\CamelCase;
 use Scaffolder\Support\Validator;
-use stdClass ;
+use stdClass;
 
 class ListTemplateCompiler extends AbstractCompiler
 {
 	protected $cachePrefix 	= 'list_template_';
-	protected $stubFilename = 'ListTemplate.html' ;
+	protected $stubFilename = 'ListTemplate.html';
 
 	public function __construct($scaffolderConfig, $modelData = null)
 	{
-		$this->stubsDirectory = __DIR__ . '/../../../../stubs/AngularJs/';
+		$this->stubsDirectory = __DIR__.'/../../../../stubs/AngularJs/';
 		parent::__construct($scaffolderConfig, $modelData);
 	}
 
@@ -41,7 +41,7 @@  discard block
 block discarded – undo
 	 *
 	 * @return $this
 	 */
-	private function replaceInputFields(){
+	private function replaceInputFields() {
 
 		$inputFields = $this->getInputFields();
 
@@ -55,7 +55,7 @@  discard block
 block discarded – undo
 	 *
 	 * @return $this
 	 */
-	public function getInputFields(){
+	public function getInputFields() {
 
 		$inputFields = $eagerFields = '';
 
@@ -63,12 +63,12 @@  discard block
 block discarded – undo
 		{
 			$fieldStub = $this->getInputStubByField($field);
 
-			if($field->foreignKey){
-				$fieldStub 	= $this->replaceForeingStrings($field, $fieldStub) ;
+			if ($field->foreignKey) {
+				$fieldStub = $this->replaceForeingStrings($field, $fieldStub);
 				$fieldStub = str_replace('{{foreign_model_name}}', strtolower(CamelCase::convertToCamelCase($field->foreignKey->table)), $fieldStub);
 			}
 
-			$inputFields .= $this->replaceFieldInput($field, $fieldStub) ;
+			$inputFields .= $this->replaceFieldInput($field, $fieldStub);
 
 			// Check foreign key
 			if ($field->foreignKey && isset($field->foreignKey->eager) && $field->foreignKey->eager)
@@ -77,7 +77,7 @@  discard block
 block discarded – undo
 				$foreignModelData = $this->getModelData($field->foreignKey->table);
 				$foreignControllerCompiler = new ListTemplateCompiler($this->scaffolderConfig, $foreignModelData);
 				$foreignControllerCompiler->setEagerTable($this->modelData->tableName);
-				$eagerFields 	.= $foreignControllerCompiler->getInputFields();
+				$eagerFields .= $foreignControllerCompiler->getInputFields();
 			}
 
 		}
@@ -87,7 +87,7 @@  discard block
 block discarded – undo
 		
 		$this->stub = str_replace('{{eager_objects_inputs}}', $eagerFields, $this->stub); 
 
-		return $inputFields ;
+		return $inputFields;
 
 	}
 
@@ -99,11 +99,11 @@  discard block
 block discarded – undo
 	 *
 	 * @return $this
 	 */
-	protected function replaceFieldInput($field, $fieldStub){
-		$fieldStub = $this->replaceFieldStrings($field, $fieldStub) ;
-		$fieldStub = $this->replaceFieldValidations($field, $fieldStub) ;
+	protected function replaceFieldInput($field, $fieldStub) {
+		$fieldStub = $this->replaceFieldStrings($field, $fieldStub);
+		$fieldStub = $this->replaceFieldValidations($field, $fieldStub);
 
-		return $fieldStub ;
+		return $fieldStub;
 	}
 
 	/**
@@ -114,23 +114,23 @@  discard block
 block discarded – undo
 	 *
 	 * @return $this
 	 */
-	protected function replaceFieldValidations($field, $fieldStub){
-		$fieldStub = $this->replaceFieldStrings($field, $fieldStub) ;
+	protected function replaceFieldValidations($field, $fieldStub) {
+		$fieldStub = $this->replaceFieldStrings($field, $fieldStub);
 		
 		$validationsConverted = Validator::convertValidations($field->validations, true);
 
-		$inputValidations = '' ; 
+		$inputValidations = ''; 
 
 		foreach ($validationsConverted as $attribute => $value) {
-			if($value)
-				$inputValidations .=  ' '.$attribute.'="'. $value.'"' ;
+			if ($value)
+				$inputValidations .= ' '.$attribute.'="'.$value.'"';
 			else
-				$inputValidations .=  ' '.$attribute  ; 
+				$inputValidations .= ' '.$attribute; 
 		}
 
 		$fieldStub = str_replace('{{field_validation}}', $inputValidations, $fieldStub);
 
-		return $fieldStub ;
+		return $fieldStub;
 	}
 
 	/**
@@ -145,9 +145,9 @@  discard block
 block discarded – undo
 		foreach ($this->modelData->reverseRelationships as $relationship)
 		{
 			if ($relationship->type == "belongsToMany") {
-				$fieldStub = File::get($this->stubsDirectory . 'List/'. CamelCase::convertToCamelCase($relationship->ui). '.html');
+				$fieldStub = File::get($this->stubsDirectory.'List/'.CamelCase::convertToCamelCase($relationship->ui).'.html');
 
-				$fieldStub = str_replace('{{related_table}}',CamelCase::convertToCamelCase($relationship->relatedTable), $fieldStub);
+				$fieldStub = str_replace('{{related_table}}', CamelCase::convertToCamelCase($relationship->relatedTable), $fieldStub);
 				$fieldStub = str_replace('{{related_table_lw}}', strtolower(CamelCase::convertToCamelCase($relationship->relatedTable)), $fieldStub);
 				$fieldStub = str_replace('{{table_name}}', $this->modelData->tableName, $fieldStub);
 				$fieldStub = str_replace('{{related_table_lw_pl}}', CamelCase::pluralize(strtolower($relationship->relatedTable)), $fieldStub);
@@ -170,26 +170,26 @@  discard block
 block discarded – undo
 	 * @return $this
 	 */
 	private $inputStub = [];
-	private function getInputStubByField($field){
+	private function getInputStubByField($field) {
 		
-		if($field->index == 'primary'){
-			$uiType = 'primary' ;
+		if ($field->index == 'primary') {
+			$uiType = 'primary';
 		}
-		elseif(isset($field->foreignKey) && $field->foreignKey){
-			if(isset($field->foreignKey->eager) && $field->foreignKey->eager)
-				$uiType = 'foreign_eager' ;
+		elseif (isset($field->foreignKey) && $field->foreignKey) {
+			if (isset($field->foreignKey->eager) && $field->foreignKey->eager)
+				$uiType = 'foreign_eager';
 			else 
-				$uiType = $field->type->ui ;
+				$uiType = $field->type->ui;
 		}
 		else {
-			$uiType = $field->type->ui ;
+			$uiType = $field->type->ui;
 		}
 
-		if(array_key_exists($uiType, $this->inputStub)){
+		if (array_key_exists($uiType, $this->inputStub)) {
 			return $this->inputStub[$uiType];
 		}
 		else {
-			$this->inputStub[$uiType] = File::get($this->stubsDirectory . 'List/'. CamelCase::convertToCamelCase($uiType). '.html');
+			$this->inputStub[$uiType] = File::get($this->stubsDirectory.'List/'.CamelCase::convertToCamelCase($uiType).'.html');
 
 			return $this->inputStub[$uiType];
 		}
@@ -203,11 +203,11 @@  discard block
 block discarded – undo
 	 */
 	protected function getOutputFilename()
 	{
-		$folder = PathParser::parse($this->scaffolderConfig->generator->paths->pages).$this->modelData->tableName.'/list/' ;
+		$folder = PathParser::parse($this->scaffolderConfig->generator->paths->pages).$this->modelData->tableName.'/list/';
 
 		Directory::createIfNotExists($folder, 0755, true);
 
-		return $folder .$this->modelData->tableName . '_list.html';
+		return $folder.$this->modelData->tableName.'_list.html';
 	}
 
 }
\ No newline at end of file

Please login to merge, or discard this patch.

src/Scaffolder/Compilers/AngularJs/ListDetailCompiler.php 1 patch

Spacing +4 added lines, -4 removed lines patch added patch discarded remove patch

@@ -11,11 +11,11 @@  discard block
 block discarded – undo
 class ListDetailCompiler extends AbstractCompiler
 {
 	protected $cachePrefix 	= 'list_detail_';
-	protected $stubFilename = 'DetailDialog.html' ;
+	protected $stubFilename = 'DetailDialog.html';
 
 	public function __construct($scaffolderConfig, $modelData = null)
 	{
-		$this->stubsDirectory = __DIR__ . '/../../../../stubs/AngularJs/';
+		$this->stubsDirectory = __DIR__.'/../../../../stubs/AngularJs/';
 		parent::__construct($scaffolderConfig, $modelData);
 	}
 
@@ -39,11 +39,11 @@  discard block
 block discarded – undo
 	 */
 	protected function getOutputFilename()
 	{
-		$folder = PathParser::parse($this->scaffolderConfig->generator->paths->pages).$this->modelData->tableName.'/list/' ;
+		$folder = PathParser::parse($this->scaffolderConfig->generator->paths->pages).$this->modelData->tableName.'/list/';
 
 		Directory::createIfNotExists($folder, 0755, true);
 
-		return $folder .$this->modelData->tableName . '_details.dialog.html';
+		return $folder.$this->modelData->tableName.'_details.dialog.html';
 	}
 
 }
\ No newline at end of file

Please login to merge, or discard this patch.

src/Scaffolder/Compilers/AngularJs/IndexApiCompiler.php 1 patch

Spacing +4 added lines, -4 removed lines patch added patch discarded remove patch

@@ -11,11 +11,11 @@  discard block
 block discarded – undo
 class IndexApiCompiler extends AbstractCompiler
 {
 	protected $cachePrefix 	= 'index_api_';
-	protected $stubFilename = 'IndexApi.js' ;
+	protected $stubFilename = 'IndexApi.js';
 
 	public function __construct($scaffolderConfig, $modelData = null)
 	{
-		$this->stubsDirectory = __DIR__ . '/../../../../stubs/AngularJs/';
+		$this->stubsDirectory = __DIR__.'/../../../../stubs/AngularJs/';
 		parent::__construct($scaffolderConfig, $modelData);
 	}
 
@@ -38,7 +38,7 @@  discard block
 block discarded – undo
 	 */
 	public function compile($extra = null)
 	{
-		if (File::exists(base_path('scaffolder-config/cache/' . $this->cachePrefix  . self::CACHE_EXT)))
+		if (File::exists(base_path('scaffolder-config/cache/'.$this->cachePrefix.self::CACHE_EXT)))
 		{
 			return $this->store(new FileToCompile(true, $this->cachePrefix));
 		}
@@ -59,7 +59,7 @@  discard block
 block discarded – undo
 	{
 		$folder = PathParser::parse($this->scaffolderConfig->generator->paths->index);
 
-		return $folder  . 'index.api.js';
+		return $folder.'index.api.js';
 	}
 
 }
\ No newline at end of file

Please login to merge, or discard this patch.

		@@ -24,7 +24,7 @@ discard block
		block discarded – undo
24	24	*/
25	25	public function compile($stub, $modelName, $modelData, $scaffolderConfig, $hash, $extra = null)
26	26	{
27		- if (File::exists(base_path('scaffolder-config/cache/view_index_' . $hash . self::CACHE_EXT)))
	27	+ if (File::exists(base_path('scaffolder-config/cache/view_index_'.$hash.self::CACHE_EXT)))
28	28	{
29	29	return $this->store($modelName, $scaffolderConfig, '', new FileToCompile(true, $hash));
30	30	}
		@@ -53,22 +53,22 @@ discard block
		block discarded – undo
53	53	*/
54	54	protected function store($modelName, $scaffolderConfig, $compiled, FileToCompile $fileToCompile)
55	55	{
56		- $folder = PathParser::parse($scaffolderConfig->generator->paths->views) . strtolower($modelName) ;
	56	+ $folder = PathParser::parse($scaffolderConfig->generator->paths->views).strtolower($modelName);
57	57
58	58	// create folder directory
59	59	Directory::createIfNotExists($folder, 0755, true);
60	60
61		- $path = $folder . '/index.blade.php';
	61	+ $path = $folder.'/index.blade.php';
62	62
63	63	// Store in cache
64	64	if ($fileToCompile->cached)
65	65	{
66		- File::copy(base_path('scaffolder-config/cache/view_index_' . $fileToCompile->hash . self::CACHE_EXT), $path);
	66	+ File::copy(base_path('scaffolder-config/cache/view_index_'.$fileToCompile->hash.self::CACHE_EXT), $path);
67	67	}
68	68	else
69	69	{
70		- File::put(base_path('scaffolder-config/cache/view_index_' . $fileToCompile->hash . self::CACHE_EXT), $compiled);
71		- File::copy(base_path('scaffolder-config/cache/view_index_' . $fileToCompile->hash . self::CACHE_EXT), $path);
	70	+ File::put(base_path('scaffolder-config/cache/view_index_'.$fileToCompile->hash.self::CACHE_EXT), $compiled);
	71	+ File::copy(base_path('scaffolder-config/cache/view_index_'.$fileToCompile->hash.self::CACHE_EXT), $path);
72	72	}
73	73
74	74	return $path;
		@@ -93,12 +93,12 @@ discard block
		block discarded – undo
93	93	{
94	94	if ($firstIteration)
95	95	{
96		- $fields .= sprintf("{ data: '%s', name: '%s' }," . PHP_EOL, $field->name, $field->name);
	96	+ $fields .= sprintf("{ data: '%s', name: '%s' },".PHP_EOL, $field->name, $field->name);
97	97	$firstIteration = false;
98	98	}
99	99	else
100	100	{
101		- $fields .= sprintf("\t\t\t\t{ data: '%s', name: '%s' }," . PHP_EOL, $field->name, $field->name);
	101	+ $fields .= sprintf("\t\t\t\t{ data: '%s', name: '%s' },".PHP_EOL, $field->name, $field->name);
102	102	}
103	103	}
104	104	}
		@@ -127,13 +127,13 @@ discard block
		block discarded – undo
127	127	{
128	128	if ($firstIteration)
129	129	{
130		- $fields .= sprintf("<th>%s</th>" . PHP_EOL, ucfirst($field->name));
	130	+ $fields .= sprintf("<th>%s</th>".PHP_EOL, ucfirst($field->name));
131	131	$firstIteration = false;
132	132
133	133	}
134	134	else
135	135	{
136		- $fields .= sprintf("\t\t\t<th>%s</th>" . PHP_EOL, ucfirst($field->name));
	136	+ $fields .= sprintf("\t\t\t<th>%s</th>".PHP_EOL, ucfirst($field->name));
137	137	}
138	138	}
139	139	}

		@@ -24,7 +24,7 @@ discard block
		block discarded – undo
24	24	*/
25	25	public function compile($stub, $modelName, $modelData, $scaffolderConfig, $hash, $extra = null)
26	26	{
27		- if (File::exists(base_path('scaffolder-config/cache/view_index_' . $hash . self::CACHE_EXT)))
	27	+ if (File::exists(base_path('scaffolder-config/cache/view_index_'.$hash.self::CACHE_EXT)))
28	28	{
29	29	return $this->store($modelName, $scaffolderConfig, '', new FileToCompile(true, $hash));
30	30	}
		@@ -53,22 +53,22 @@ discard block
		block discarded – undo
53	53	*/
54	54	protected function store($modelName, $scaffolderConfig, $compiled, FileToCompile $fileToCompile)
55	55	{
56		- $folder = PathParser::parse($scaffolderConfig->paths->views) . strtolower($modelName) ;
	56	+ $folder = PathParser::parse($scaffolderConfig->paths->views).strtolower($modelName);
57	57
58	58	// create folder directory
59	59	Directory::createIfNotExists($folder, 0755, true);
60	60
61		- $path = $folder . '/index.blade.php';
	61	+ $path = $folder.'/index.blade.php';
62	62
63	63	// Store in cache
64	64	if ($fileToCompile->cached)
65	65	{
66		- File::copy(base_path('scaffolder-config/cache/view_index_' . $fileToCompile->hash . self::CACHE_EXT), $path);
	66	+ File::copy(base_path('scaffolder-config/cache/view_index_'.$fileToCompile->hash.self::CACHE_EXT), $path);
67	67	}
68	68	else
69	69	{
70		- File::put(base_path('scaffolder-config/cache/view_index_' . $fileToCompile->hash . self::CACHE_EXT), $compiled);
71		- File::copy(base_path('scaffolder-config/cache/view_index_' . $fileToCompile->hash . self::CACHE_EXT), $path);
	70	+ File::put(base_path('scaffolder-config/cache/view_index_'.$fileToCompile->hash.self::CACHE_EXT), $compiled);
	71	+ File::copy(base_path('scaffolder-config/cache/view_index_'.$fileToCompile->hash.self::CACHE_EXT), $path);
72	72	}
73	73
74	74	return $path;
		@@ -93,12 +93,12 @@ discard block
		block discarded – undo
93	93	{
94	94	if ($firstIteration)
95	95	{
96		- $fields .= sprintf("{ data: '%s', name: '%s' }," . PHP_EOL, $field->name, $field->name);
	96	+ $fields .= sprintf("{ data: '%s', name: '%s' },".PHP_EOL, $field->name, $field->name);
97	97	$firstIteration = false;
98	98	}
99	99	else
100	100	{
101		- $fields .= sprintf("\t\t\t\t{ data: '%s', name: '%s' }," . PHP_EOL, $field->name, $field->name);
	101	+ $fields .= sprintf("\t\t\t\t{ data: '%s', name: '%s' },".PHP_EOL, $field->name, $field->name);
102	102	}
103	103	}
104	104	}
		@@ -127,13 +127,13 @@ discard block
		block discarded – undo
127	127	{
128	128	if ($firstIteration)
129	129	{
130		- $fields .= sprintf("<th>%s</th>" . PHP_EOL, ucfirst($field->name));
	130	+ $fields .= sprintf("<th>%s</th>".PHP_EOL, ucfirst($field->name));
131	131	$firstIteration = false;
132	132
133	133	}
134	134	else
135	135	{
136		- $fields .= sprintf("\t\t\t<th>%s</th>" . PHP_EOL, ucfirst($field->name));
	136	+ $fields .= sprintf("\t\t\t<th>%s</th>".PHP_EOL, ucfirst($field->name));
137	137	}
138	138	}
139	139	}

		@@ -9,16 +9,16 @@ discard block
		block discarded – undo
9	9	use Scaffolder\Support\Directory;
10	10	use Scaffolder\Support\CamelCase;
11	11	use Scaffolder\Support\Validator;
12		-use stdClass ;
	12	+use stdClass;
13	13
14	14	class ListTemplateCompiler extends AbstractCompiler
15	15	{
16	16	protected $cachePrefix = 'list_template_';
17		- protected $stubFilename = 'ListTemplate.html' ;
	17	+ protected $stubFilename = 'ListTemplate.html';
18	18
19	19	public function __construct($scaffolderConfig, $modelData = null)
20	20	{
21		- $this->stubsDirectory = __DIR__ . '/../../../../stubs/AngularJs/';
	21	+ $this->stubsDirectory = __DIR__.'/../../../../stubs/AngularJs/';
22	22	parent::__construct($scaffolderConfig, $modelData);
23	23	}
24	24
		@@ -41,7 +41,7 @@ discard block
		block discarded – undo
41	41	*
42	42	* @return $this
43	43	*/
44		- private function replaceInputFields(){
	44	+ private function replaceInputFields() {
45	45
46	46	$inputFields = $this->getInputFields();
47	47
		@@ -55,7 +55,7 @@ discard block
		block discarded – undo
55	55	*
56	56	* @return $this
57	57	*/
58		- public function getInputFields(){
	58	+ public function getInputFields() {
59	59
60	60	$inputFields = $eagerFields = '';
61	61
		@@ -63,12 +63,12 @@ discard block
		block discarded – undo
63	63	{
64	64	$fieldStub = $this->getInputStubByField($field);
65	65
66		- if($field->foreignKey){
67		- $fieldStub = $this->replaceForeingStrings($field, $fieldStub) ;
	66	+ if ($field->foreignKey) {
	67	+ $fieldStub = $this->replaceForeingStrings($field, $fieldStub);
68	68	$fieldStub = str_replace('{{foreign_model_name}}', strtolower(CamelCase::convertToCamelCase($field->foreignKey->table)), $fieldStub);
69	69	}
70	70
71		- $inputFields .= $this->replaceFieldInput($field, $fieldStub) ;
	71	+ $inputFields .= $this->replaceFieldInput($field, $fieldStub);
72	72
73	73	// Check foreign key
74	74	if ($field->foreignKey && isset($field->foreignKey->eager) && $field->foreignKey->eager)
		@@ -77,7 +77,7 @@ discard block
		block discarded – undo
77	77	$foreignModelData = $this->getModelData($field->foreignKey->table);
78	78	$foreignControllerCompiler = new ListTemplateCompiler($this->scaffolderConfig, $foreignModelData);
79	79	$foreignControllerCompiler->setEagerTable($this->modelData->tableName);
80		- $eagerFields .= $foreignControllerCompiler->getInputFields();
	80	+ $eagerFields .= $foreignControllerCompiler->getInputFields();
81	81	}
82	82
83	83	}
		@@ -87,7 +87,7 @@ discard block
		block discarded – undo
87	87
88	88	$this->stub = str_replace('{{eager_objects_inputs}}', $eagerFields, $this->stub);
89	89
90		- return $inputFields ;
	90	+ return $inputFields;
91	91
92	92	}
93	93
		@@ -99,11 +99,11 @@ discard block
		block discarded – undo
99	99	*
100	100	* @return $this
101	101	*/
102		- protected function replaceFieldInput($field, $fieldStub){
103		- $fieldStub = $this->replaceFieldStrings($field, $fieldStub) ;
104		- $fieldStub = $this->replaceFieldValidations($field, $fieldStub) ;
	102	+ protected function replaceFieldInput($field, $fieldStub) {
	103	+ $fieldStub = $this->replaceFieldStrings($field, $fieldStub);
	104	+ $fieldStub = $this->replaceFieldValidations($field, $fieldStub);
105	105
106		- return $fieldStub ;
	106	+ return $fieldStub;
107	107	}
108	108
109	109	/**
		@@ -114,23 +114,23 @@ discard block
		block discarded – undo
114	114	*
115	115	* @return $this
116	116	*/
117		- protected function replaceFieldValidations($field, $fieldStub){
118		- $fieldStub = $this->replaceFieldStrings($field, $fieldStub) ;
	117	+ protected function replaceFieldValidations($field, $fieldStub) {
	118	+ $fieldStub = $this->replaceFieldStrings($field, $fieldStub);
119	119
120	120	$validationsConverted = Validator::convertValidations($field->validations, true);
121	121
122		- $inputValidations = '' ;
	122	+ $inputValidations = '';
123	123
124	124	foreach ($validationsConverted as $attribute => $value) {
125		- if($value)
126		- $inputValidations .= ' '.$attribute.'="'. $value.'"' ;
	125	+ if ($value)
	126	+ $inputValidations .= ' '.$attribute.'="'.$value.'"';
127	127	else
128		- $inputValidations .= ' '.$attribute ;
	128	+ $inputValidations .= ' '.$attribute;
129	129	}
130	130
131	131	$fieldStub = str_replace('{{field_validation}}', $inputValidations, $fieldStub);
132	132
133		- return $fieldStub ;
	133	+ return $fieldStub;
134	134	}
135	135
136	136	/**
		@@ -145,9 +145,9 @@ discard block
		block discarded – undo
145	145	foreach ($this->modelData->reverseRelationships as $relationship)
146	146	{
147	147	if ($relationship->type == "belongsToMany") {
148		- $fieldStub = File::get($this->stubsDirectory . 'List/'. CamelCase::convertToCamelCase($relationship->ui). '.html');
	148	+ $fieldStub = File::get($this->stubsDirectory.'List/'.CamelCase::convertToCamelCase($relationship->ui).'.html');
149	149
150		- $fieldStub = str_replace('{{related_table}}',CamelCase::convertToCamelCase($relationship->relatedTable), $fieldStub);
	150	+ $fieldStub = str_replace('{{related_table}}', CamelCase::convertToCamelCase($relationship->relatedTable), $fieldStub);
151	151	$fieldStub = str_replace('{{related_table_lw}}', strtolower(CamelCase::convertToCamelCase($relationship->relatedTable)), $fieldStub);
152	152	$fieldStub = str_replace('{{table_name}}', $this->modelData->tableName, $fieldStub);
153	153	$fieldStub = str_replace('{{related_table_lw_pl}}', CamelCase::pluralize(strtolower($relationship->relatedTable)), $fieldStub);
		@@ -170,26 +170,26 @@ discard block
		block discarded – undo
170	170	* @return $this
171	171	*/
172	172	private $inputStub = [];
173		- private function getInputStubByField($field){
	173	+ private function getInputStubByField($field) {
174	174
175		- if($field->index == 'primary'){
176		- $uiType = 'primary' ;
	175	+ if ($field->index == 'primary') {
	176	+ $uiType = 'primary';
177	177	}
178		- elseif(isset($field->foreignKey) && $field->foreignKey){
179		- if(isset($field->foreignKey->eager) && $field->foreignKey->eager)
180		- $uiType = 'foreign_eager' ;
	178	+ elseif (isset($field->foreignKey) && $field->foreignKey) {
	179	+ if (isset($field->foreignKey->eager) && $field->foreignKey->eager)
	180	+ $uiType = 'foreign_eager';
181	181	else
182		- $uiType = $field->type->ui ;
	182	+ $uiType = $field->type->ui;
183	183	}
184	184	else {
185		- $uiType = $field->type->ui ;
	185	+ $uiType = $field->type->ui;
186	186	}
187	187
188		- if(array_key_exists($uiType, $this->inputStub)){
	188	+ if (array_key_exists($uiType, $this->inputStub)) {
189	189	return $this->inputStub[$uiType];
190	190	}
191	191	else {
192		- $this->inputStub[$uiType] = File::get($this->stubsDirectory . 'List/'. CamelCase::convertToCamelCase($uiType). '.html');
	192	+ $this->inputStub[$uiType] = File::get($this->stubsDirectory.'List/'.CamelCase::convertToCamelCase($uiType).'.html');
193	193
194	194	return $this->inputStub[$uiType];
195	195	}
		@@ -203,11 +203,11 @@ discard block
		block discarded – undo
203	203	*/
204	204	protected function getOutputFilename()
205	205	{
206		- $folder = PathParser::parse($this->scaffolderConfig->generator->paths->pages).$this->modelData->tableName.'/list/' ;
	206	+ $folder = PathParser::parse($this->scaffolderConfig->generator->paths->pages).$this->modelData->tableName.'/list/';
207	207
208	208	Directory::createIfNotExists($folder, 0755, true);
209	209
210		- return $folder .$this->modelData->tableName . '_list.html';
	210	+ return $folder.$this->modelData->tableName.'_list.html';
211	211	}
212	212
213	213	}
214	214	\ No newline at end of file

		@@ -27,7 +27,7 @@ discard block
		block discarded – undo
27	27	*/
28	28	public function compile($stub, $modelName, $modelData, $scaffolderConfig, $hash, $extra = null)
29	29	{
30		- if (File::exists(base_path('scaffolder-config/cache/view_edit_' . $hash . self::CACHE_EXT)))
	30	+ if (File::exists(base_path('scaffolder-config/cache/view_edit_'.$hash.self::CACHE_EXT)))
31	31	{
32	32	return $this->store($modelName, $scaffolderConfig, '', new FileToCompile(true, $hash));
33	33	}
		@@ -56,22 +56,22 @@ discard block
		block discarded – undo
56	56	*/
57	57	protected function store($modelName, $scaffolderConfig, $compiled, FileToCompile $fileToCompile)
58	58	{
59		- $folder = PathParser::parse($scaffolderConfig->generator->paths->views) . strtolower($modelName) ;
	59	+ $folder = PathParser::parse($scaffolderConfig->generator->paths->views).strtolower($modelName);
60	60
61	61	// create folder directory
62	62	Directory::createIfNotExists($folder, 0755, true);
63	63
64		- $path = $folder . '/edit.blade.php';
	64	+ $path = $folder.'/edit.blade.php';
65	65
66	66	// Store in cache
67	67	if ($fileToCompile->cached)
68	68	{
69		- File::copy(base_path('scaffolder-config/cache/view_edit_' . $fileToCompile->hash . self::CACHE_EXT), $path);
	69	+ File::copy(base_path('scaffolder-config/cache/view_edit_'.$fileToCompile->hash.self::CACHE_EXT), $path);
70	70	}
71	71	else
72	72	{
73		- File::put(base_path('scaffolder-config/cache/view_edit_' . $fileToCompile->hash . self::CACHE_EXT), $compiled);
74		- File::copy(base_path('scaffolder-config/cache/view_edit_' . $fileToCompile->hash . self::CACHE_EXT), $path);
	73	+ File::put(base_path('scaffolder-config/cache/view_edit_'.$fileToCompile->hash.self::CACHE_EXT), $compiled);
	74	+ File::copy(base_path('scaffolder-config/cache/view_edit_'.$fileToCompile->hash.self::CACHE_EXT), $path);
75	75	}
76	76
77	77	return $path;
		@@ -93,12 +93,12 @@ discard block
		block discarded – undo
93	93	{
94	94	if ($firstIteration)
95	95	{
96		- $fields .= sprintf(self::getInputFor($field) . PHP_EOL, $field->name);
	96	+ $fields .= sprintf(self::getInputFor($field).PHP_EOL, $field->name);
97	97	$firstIteration = false;
98	98	}
99	99	else
100	100	{
101		- $fields .= sprintf("\t" . self::getInputFor($field) . PHP_EOL, $field->name);
	101	+ $fields .= sprintf("\t".self::getInputFor($field).PHP_EOL, $field->name);
102	102	}
103	103	}
104	104

		@@ -11,11 +11,11 @@ discard block
		block discarded – undo
11	11	class ListControllerCompiler extends AbstractCompiler
12	12	{
13	13	protected $cachePrefix = 'list_controller_';
14		- protected $stubFilename = 'ListController.js' ;
	14	+ protected $stubFilename = 'ListController.js';
15	15
16	16	public function __construct($scaffolderConfig, $modelData = null)
17	17	{
18		- $this->stubsDirectory = __DIR__ . '/../../../../stubs/AngularJs/';
	18	+ $this->stubsDirectory = __DIR__.'/../../../../stubs/AngularJs/';
19	19	parent::__construct($scaffolderConfig, $modelData);
20	20	}
21	21
		@@ -37,23 +37,23 @@ discard block
		block discarded – undo
37	37	*
38	38	* @return $this
39	39	*/
40		- public function replaceColumns(){
	40	+ public function replaceColumns() {
41	41
42	42	$columns = $this->getGridColumns();
43	43
44		- $this->stub = str_replace('{{grid_columns}}', join(",\n ", $columns) , $this->stub);
	44	+ $this->stub = str_replace('{{grid_columns}}', join(",\n ", $columns), $this->stub);
45	45
46		- return $this ;
	46	+ return $this;
47	47
48	48	}
49	49
50		- public function getGridColumns(){
	50	+ public function getGridColumns() {
51	51
52	52	$columns = [];
53	53
54	54	foreach ($this->modelData->fields as $field)
55	55	{
56		- array_push($columns, "\t\t\t".sprintf('{ name: vm. $t("%s.columns.%s"), field: "%s%s" }', $this->modelData->tableName, $field->name, $this->eagerTable, $field->name ) );
	56	+ array_push($columns, "\t\t\t".sprintf('{ name: vm. $t("%s.columns.%s"), field: "%s%s" }', $this->modelData->tableName, $field->name, $this->eagerTable, $field->name));
57	57
58	58	// Check foreign key
59	59	if ($field->foreignKey && isset($field->foreignKey->eager) && $field->foreignKey->eager)
		@@ -62,7 +62,7 @@ discard block
		block discarded – undo
62	62	$foreignModelData = $this->getModelData($field->foreignKey->table);
63	63	$foreignControllerCompiler = new ListControllerCompiler($this->scaffolderConfig, $foreignModelData);
64	64	$foreignControllerCompiler->setEagerTable($field->foreignKey->table);
65		- $eagerColumns = $foreignControllerCompiler->getGridColumns();
	65	+ $eagerColumns = $foreignControllerCompiler->getGridColumns();
66	66
67	67	$columns = array_merge($columns, $eagerColumns);
68	68	}
		@@ -81,11 +81,11 @@ discard block
		block discarded – undo
81	81	*/
82	82	protected function getOutputFilename()
83	83	{
84		- $folder = PathParser::parse($this->scaffolderConfig->generator->paths->pages).$this->modelData->tableName.'/list/' ;
	84	+ $folder = PathParser::parse($this->scaffolderConfig->generator->paths->pages).$this->modelData->tableName.'/list/';
85	85
86	86	Directory::createIfNotExists($folder, 0755, true);
87	87
88		- return $folder .$this->modelData->tableName . '_list.controller.js';
	88	+ return $folder.$this->modelData->tableName.'_list.controller.js';
89	89	}
90	90
91	91	}
92	92	\ No newline at end of file

		@@ -11,11 +11,11 @@ discard block
		block discarded – undo
11	11	class ListDetailCompiler extends AbstractCompiler
12	12	{
13	13	protected $cachePrefix = 'list_detail_';
14		- protected $stubFilename = 'DetailDialog.html' ;
	14	+ protected $stubFilename = 'DetailDialog.html';
15	15
16	16	public function __construct($scaffolderConfig, $modelData = null)
17	17	{
18		- $this->stubsDirectory = __DIR__ . '/../../../../stubs/AngularJs/';
	18	+ $this->stubsDirectory = __DIR__.'/../../../../stubs/AngularJs/';
19	19	parent::__construct($scaffolderConfig, $modelData);
20	20	}
21	21
		@@ -39,11 +39,11 @@ discard block
		block discarded – undo
39	39	*/
40	40	protected function getOutputFilename()
41	41	{
42		- $folder = PathParser::parse($this->scaffolderConfig->generator->paths->pages).$this->modelData->tableName.'/list/' ;
	42	+ $folder = PathParser::parse($this->scaffolderConfig->generator->paths->pages).$this->modelData->tableName.'/list/';
43	43
44	44	Directory::createIfNotExists($folder, 0755, true);
45	45
46		- return $folder .$this->modelData->tableName . '_details.dialog.html';
	46	+ return $folder.$this->modelData->tableName.'_details.dialog.html';
47	47	}
48	48
49	49	}
50	50	\ No newline at end of file

		@@ -11,11 +11,11 @@ discard block
		block discarded – undo
11	11	class IndexApiCompiler extends AbstractCompiler
12	12	{
13	13	protected $cachePrefix = 'index_api_';
14		- protected $stubFilename = 'IndexApi.js' ;
	14	+ protected $stubFilename = 'IndexApi.js';
15	15
16	16	public function __construct($scaffolderConfig, $modelData = null)
17	17	{
18		- $this->stubsDirectory = __DIR__ . '/../../../../stubs/AngularJs/';
	18	+ $this->stubsDirectory = __DIR__.'/../../../../stubs/AngularJs/';
19	19	parent::__construct($scaffolderConfig, $modelData);
20	20	}
21	21
		@@ -38,7 +38,7 @@ discard block
		block discarded – undo
38	38	*/
39	39	public function compile($extra = null)
40	40	{
41		- if (File::exists(base_path('scaffolder-config/cache/' . $this->cachePrefix . self::CACHE_EXT)))
	41	+ if (File::exists(base_path('scaffolder-config/cache/'.$this->cachePrefix.self::CACHE_EXT)))
42	42	{
43	43	return $this->store(new FileToCompile(true, $this->cachePrefix));
44	44	}
		@@ -59,7 +59,7 @@ discard block
		block discarded – undo
59	59	{
60	60	$folder = PathParser::parse($this->scaffolderConfig->generator->paths->index);
61	61
62		- return $folder . 'index.api.js';
	62	+ return $folder.'index.api.js';
63	63	}
64	64
65	65	}
66	66	\ No newline at end of file

codificar / scaffolder

Push — master ( 63d8d6...28be9d )

Status

Category

Spacing +8 added lines, -8 removed lines patch added patch discarded remove patch

Spacing +10 added lines, -10 removed lines patch added patch discarded remove patch

Spacing +8 added lines, -8 removed lines patch added patch discarded remove patch

Spacing +8 added lines, -8 removed lines patch added patch discarded remove patch

Spacing +10 added lines, -10 removed lines patch added patch discarded remove patch

Spacing +10 added lines, -10 removed lines patch added patch discarded remove patch

Spacing +35 added lines, -35 removed lines patch added patch discarded remove patch

Spacing +4 added lines, -4 removed lines patch added patch discarded remove patch

Spacing +4 added lines, -4 removed lines patch added patch discarded remove patch