codificar / scaffolder

src/Scaffolder/Commands/BuildCommand.php

Indentation +37 added lines, -37 removed lines

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

Spacing +3 added lines, -3 removed lines

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

src/Scaffolder/Compilers/Blade/PageLayoutCompiler.php

Spacing +2 added lines, -2 removed lines

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

src/Scaffolder/Compilers/Blade/CreateViewCompiler.php

Indentation +95 added lines, -95 removed lines

@@ -11,112 +11,112 @@
 
 class CreateViewCompiler extends AbstractViewCompiler
 {
-	use InputTypeResolverTrait;
+    use InputTypeResolverTrait;
 
-	/**
-	 * Compiles the create view.
-	 *
-	 * @param      $stub
-	 * @param      $modelName
-	 * @param      $modelData
-	 * @param      $scaffolderConfig
-	 * @param      $hash
-	 * @param null $extra
-	 *
-	 * @return string
-	 */
-	public function compile($stub, $modelName, $modelData, $scaffolderConfig, $hash, $extra = null)
-	{
-		if (File::exists(base_path('scaffolder-config/cache/view_create_' . $hash . self::CACHE_EXT)))
-		{
-			return $this->store($modelName, $scaffolderConfig, '', new FileToCompile(true, $hash));
-		}
-		else
-		{
-			$this->stub = $stub;
+    /**
+     * Compiles the create view.
+     *
+     * @param      $stub
+     * @param      $modelName
+     * @param      $modelData
+     * @param      $scaffolderConfig
+     * @param      $hash
+     * @param null $extra
+     *
+     * @return string
+     */
+    public function compile($stub, $modelName, $modelData, $scaffolderConfig, $hash, $extra = null)
+    {
+        if (File::exists(base_path('scaffolder-config/cache/view_create_' . $hash . self::CACHE_EXT)))
+        {
+            return $this->store($modelName, $scaffolderConfig, '', new FileToCompile(true, $hash));
+        }
+        else
+        {
+            $this->stub = $stub;
 
-			return $this->replaceClassName($modelName)
-				->replaceBreadcrumb($modelName)
-				->addFields($modelData)
-				->replaceRoutePrefix($scaffolderConfig->generator->routing->prefix)
-				->store($modelName, $scaffolderConfig, $this->stub, new FileToCompile(false, $hash));
-		}
-	}
+            return $this->replaceClassName($modelName)
+                ->replaceBreadcrumb($modelName)
+                ->addFields($modelData)
+                ->replaceRoutePrefix($scaffolderConfig->generator->routing->prefix)
+                ->store($modelName, $scaffolderConfig, $this->stub, new FileToCompile(false, $hash));
+        }
+    }
 
-	/**
-	 * Store the compiled stub.
-	 *
-	 * @param               $modelName
-	 * @param               $scaffolderConfig
-	 * @param               $compiled
-	 * @param FileToCompile $fileToCompile
-	 *
-	 * @return string
-	 */
-	protected function store($modelName, $scaffolderConfig, $compiled, FileToCompile $fileToCompile)
-	{
-		$folder = PathParser::parse($scaffolderConfig->generator->paths->views) . strtolower($modelName) ;
+    /**
+     * Store the compiled stub.
+     *
+     * @param               $modelName
+     * @param               $scaffolderConfig
+     * @param               $compiled
+     * @param FileToCompile $fileToCompile
+     *
+     * @return string
+     */
+    protected function store($modelName, $scaffolderConfig, $compiled, FileToCompile $fileToCompile)
+    {
+        $folder = PathParser::parse($scaffolderConfig->generator->paths->views) . strtolower($modelName) ;
 		
-		// create folder directory
-		Directory::createIfNotExists($folder, 0755, true);
+        // 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);
-		}
-		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);
-		}
+        // Store in cache
+        if ($fileToCompile->cached)
+        {
+            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);
+        }
 
-		return $path;
-	}
+        return $path;
+    }
 
-	/**
-	 * Add fields to the create view.
-	 *
-	 * @param $modelData
-	 *
-	 * @return $this
-	 */
-	private function addFields($modelData)
-	{
-		$fields = '';
-		$firstIteration = true;
+    /**
+     * Add fields to the create view.
+     *
+     * @param $modelData
+     *
+     * @return $this
+     */
+    private function addFields($modelData)
+    {
+        $fields = '';
+        $firstIteration = true;
 
-		foreach ($modelData->fields as $field)
-		{
-			if ($firstIteration)
-			{
-				$fields .= sprintf(self::getInputFor($field) . PHP_EOL, $field->name);
-				$firstIteration = false;
-			}
-			else
-			{
-				$fields .= sprintf("\t" . self::getInputFor($field) . PHP_EOL, $field->name);
-			}
-		}
+        foreach ($modelData->fields as $field)
+        {
+            if ($firstIteration)
+            {
+                $fields .= sprintf(self::getInputFor($field) . PHP_EOL, $field->name);
+                $firstIteration = false;
+            }
+            else
+            {
+                $fields .= sprintf("\t" . self::getInputFor($field) . PHP_EOL, $field->name);
+            }
+        }
 
-		$this->stub = str_replace('{{fields}}', $fields, $this->stub);
+        $this->stub = str_replace('{{fields}}', $fields, $this->stub);
 
-		return $this;
-	}
+        return $this;
+    }
 
-	/**
-	 * Replace the prefix.
-	 *
-	 * @param $prefix
-	 *
-	 * @return $this
-	 */
-	private function replaceRoutePrefix($prefix)
-	{
-		$this->stub = str_replace('{{route_prefix}}', $prefix, $this->stub);
+    /**
+     * Replace the prefix.
+     *
+     * @param $prefix
+     *
+     * @return $this
+     */
+    private function replaceRoutePrefix($prefix)
+    {
+        $this->stub = str_replace('{{route_prefix}}', $prefix, $this->stub);
 
-		return $this;
-	}
+        return $this;
+    }
 }
\ No newline at end of file

Spacing +8 added lines, -8 removed lines

@@ -27,7 +27,7 @@ 
 	 */
 	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 @@ 
 	 */
 	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  . '/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 @@ 
 		{
 			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);
 			}
 		}
 

Braces +3 added lines, -6 removed lines

@@ -30,8 +30,7 @@ 
 		if (File::exists(base_path('scaffolder-config/cache/view_create_' . $hash . self::CACHE_EXT)))
 		{
 			return $this->store($modelName, $scaffolderConfig, '', new FileToCompile(true, $hash));
-		}
-		else
+		} else
 		{
 			$this->stub = $stub;
 
@@ -66,8 +65,7 @@ 
 		if ($fileToCompile->cached)
 		{
 			File::copy(base_path('scaffolder-config/cache/view_create_' . $fileToCompile->hash . self::CACHE_EXT), $path);
-		}
-		else
+		} 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);
@@ -94,8 +92,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/EditViewCompiler.php

Indentation +131 added lines, -131 removed lines

@@ -11,136 +11,136 @@
 
 class EditViewCompiler extends AbstractViewCompiler
 {
-	use InputTypeResolverTrait;
-
-	/**
-	 * Compiles the edit view.
-	 *
-	 * @param      $stub
-	 * @param      $modelName
-	 * @param      $modelData
-	 * @param      $scaffolderConfig
-	 * @param      $hash
-	 * @param null $extra
-	 *
-	 * @return string
-	 */
-	public function compile($stub, $modelName, $modelData, $scaffolderConfig, $hash, $extra = null)
-	{
-		if (File::exists(base_path('scaffolder-config/cache/view_edit_' . $hash . self::CACHE_EXT)))
-		{
-			return $this->store($modelName, $scaffolderConfig, '', new FileToCompile(true, $hash));
-		}
-		else
-		{
-			$this->stub = $stub;
-
-			return $this->replaceClassName($modelName)
-				->replaceBreadcrumb($modelName)
-				->addFields($modelData)
-				->replacePrimaryKey($modelData)
-				->replaceRoutePrefix($scaffolderConfig->generator->routing->prefix)
-				->store($modelName, $scaffolderConfig, $this->stub, new FileToCompile(false, $hash));
-		}
-	}
-
-	/**
-	 * Store the compiled stub.
-	 *
-	 * @param               $modelName
-	 * @param               $scaffolderConfig
-	 * @param               $compiled
-	 * @param FileToCompile $fileToCompile
-	 *
-	 * @return string
-	 */
-	protected function store($modelName, $scaffolderConfig, $compiled, FileToCompile $fileToCompile)
-	{
-		$folder = PathParser::parse($scaffolderConfig->generator->paths->views) . strtolower($modelName) ;
+    use InputTypeResolverTrait;
+
+    /**
+     * Compiles the edit view.
+     *
+     * @param      $stub
+     * @param      $modelName
+     * @param      $modelData
+     * @param      $scaffolderConfig
+     * @param      $hash
+     * @param null $extra
+     *
+     * @return string
+     */
+    public function compile($stub, $modelName, $modelData, $scaffolderConfig, $hash, $extra = null)
+    {
+        if (File::exists(base_path('scaffolder-config/cache/view_edit_' . $hash . self::CACHE_EXT)))
+        {
+            return $this->store($modelName, $scaffolderConfig, '', new FileToCompile(true, $hash));
+        }
+        else
+        {
+            $this->stub = $stub;
+
+            return $this->replaceClassName($modelName)
+                ->replaceBreadcrumb($modelName)
+                ->addFields($modelData)
+                ->replacePrimaryKey($modelData)
+                ->replaceRoutePrefix($scaffolderConfig->generator->routing->prefix)
+                ->store($modelName, $scaffolderConfig, $this->stub, new FileToCompile(false, $hash));
+        }
+    }
+
+    /**
+     * Store the compiled stub.
+     *
+     * @param               $modelName
+     * @param               $scaffolderConfig
+     * @param               $compiled
+     * @param FileToCompile $fileToCompile
+     *
+     * @return string
+     */
+    protected function store($modelName, $scaffolderConfig, $compiled, FileToCompile $fileToCompile)
+    {
+        $folder = PathParser::parse($scaffolderConfig->generator->paths->views) . strtolower($modelName) ;
 		
-		// create folder directory
-		Directory::createIfNotExists($folder, 0755, true);
-
-		$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);
-		}
-		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);
-		}
-
-		return $path;
-	}
-
-	/**
-	 * Add fields to the edit view.
-	 *
-	 * @param $modelData
-	 *
-	 * @return $this
-	 */
-	private function addFields($modelData)
-	{
-		$fields = '';
-		$firstIteration = true;
-
-		foreach ($modelData->fields as $field)
-		{
-			if ($firstIteration)
-			{
-				$fields .= sprintf(self::getInputFor($field) . PHP_EOL, $field->name);
-				$firstIteration = false;
-			}
-			else
-			{
-				$fields .= sprintf("\t" . self::getInputFor($field) . PHP_EOL, $field->name);
-			}
-		}
-
-		$this->stub = str_replace('{{fields}}', $fields, $this->stub);
-
-		return $this;
-	}
-
-	/**
-	 * Replace the prefix.
-	 *
-	 * @param $prefix
-	 *
-	 * @return $this
-	 */
-	private function replaceRoutePrefix($prefix)
-	{
-		$this->stub = str_replace('{{route_prefix}}', $prefix, $this->stub);
-
-		return $this;
-	}
-
-	/**
-	 * Replace the primary key.
-	 *
-	 * @param $modelData
-	 */
-	private function replacePrimaryKey($modelData)
-	{
-		$primaryKey = 'id';
-
-		foreach ($modelData->fields as $field)
-		{
-			if ($field->index == 'primary')
-			{
-				$primaryKey = $field->name;
-				break;
-			}
-		}
-
-		$this->stub = str_replace('{{primaryKey}}', $primaryKey, $this->stub);
-
-		return $this;
-	}
+        // create folder directory
+        Directory::createIfNotExists($folder, 0755, true);
+
+        $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);
+        }
+        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);
+        }
+
+        return $path;
+    }
+
+    /**
+     * Add fields to the edit view.
+     *
+     * @param $modelData
+     *
+     * @return $this
+     */
+    private function addFields($modelData)
+    {
+        $fields = '';
+        $firstIteration = true;
+
+        foreach ($modelData->fields as $field)
+        {
+            if ($firstIteration)
+            {
+                $fields .= sprintf(self::getInputFor($field) . PHP_EOL, $field->name);
+                $firstIteration = false;
+            }
+            else
+            {
+                $fields .= sprintf("\t" . self::getInputFor($field) . PHP_EOL, $field->name);
+            }
+        }
+
+        $this->stub = str_replace('{{fields}}', $fields, $this->stub);
+
+        return $this;
+    }
+
+    /**
+     * Replace the prefix.
+     *
+     * @param $prefix
+     *
+     * @return $this
+     */
+    private function replaceRoutePrefix($prefix)
+    {
+        $this->stub = str_replace('{{route_prefix}}', $prefix, $this->stub);
+
+        return $this;
+    }
+
+    /**
+     * Replace the primary key.
+     *
+     * @param $modelData
+     */
+    private function replacePrimaryKey($modelData)
+    {
+        $primaryKey = 'id';
+
+        foreach ($modelData->fields as $field)
+        {
+            if ($field->index == 'primary')
+            {
+                $primaryKey = $field->name;
+                break;
+            }
+        }
+
+        $this->stub = str_replace('{{primaryKey}}', $primaryKey, $this->stub);
+
+        return $this;
+    }
 }
\ No newline at end of file

Spacing +8 added lines, -8 removed lines

@@ -27,7 +27,7 @@ 
 	 */
 	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 @@ 
 	 */
 	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 @@ 
 		{
 			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);
 			}
 		}
 

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

Spacing +10 added lines, -10 removed lines

@@ -24,7 +24,7 @@ 
      */
     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 @@ 
      */
     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 @@ 
             {
                 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 @@ 
             {
                 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));
                 }
             }
         }

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/View/PageLayoutCompiler.php

Spacing +2 added lines, -2 removed lines

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

src/Scaffolder/Compilers/View/CreateViewCompiler.php

Indentation +95 added lines, -95 removed lines

@@ -11,112 +11,112 @@
 
 class CreateViewCompiler extends AbstractViewCompiler
 {
-	use InputTypeResolverTrait;
+    use InputTypeResolverTrait;
 
-	/**
-	 * Compiles the create view.
-	 *
-	 * @param      $stub
-	 * @param      $modelName
-	 * @param      $modelData
-	 * @param      $scaffolderConfig
-	 * @param      $hash
-	 * @param null $extra
-	 *
-	 * @return string
-	 */
-	public function compile($stub, $modelName, $modelData, $scaffolderConfig, $hash, $extra = null)
-	{
-		if (File::exists(base_path('scaffolder-config/cache/view_create_' . $hash . self::CACHE_EXT)))
-		{
-			return $this->store($modelName, $scaffolderConfig, '', new FileToCompile(true, $hash));
-		}
-		else
-		{
-			$this->stub = $stub;
+    /**
+     * Compiles the create view.
+     *
+     * @param      $stub
+     * @param      $modelName
+     * @param      $modelData
+     * @param      $scaffolderConfig
+     * @param      $hash
+     * @param null $extra
+     *
+     * @return string
+     */
+    public function compile($stub, $modelName, $modelData, $scaffolderConfig, $hash, $extra = null)
+    {
+        if (File::exists(base_path('scaffolder-config/cache/view_create_' . $hash . self::CACHE_EXT)))
+        {
+            return $this->store($modelName, $scaffolderConfig, '', new FileToCompile(true, $hash));
+        }
+        else
+        {
+            $this->stub = $stub;
 
-			return $this->replaceClassName($modelName)
-				->replaceBreadcrumb($modelName)
-				->addFields($modelData)
-				->replaceRoutePrefix($scaffolderConfig->routing->prefix)
-				->store($modelName, $scaffolderConfig, $this->stub, new FileToCompile(false, $hash));
-		}
-	}
+            return $this->replaceClassName($modelName)
+                ->replaceBreadcrumb($modelName)
+                ->addFields($modelData)
+                ->replaceRoutePrefix($scaffolderConfig->routing->prefix)
+                ->store($modelName, $scaffolderConfig, $this->stub, new FileToCompile(false, $hash));
+        }
+    }
 
-	/**
-	 * Store the compiled stub.
-	 *
-	 * @param               $modelName
-	 * @param               $scaffolderConfig
-	 * @param               $compiled
-	 * @param FileToCompile $fileToCompile
-	 *
-	 * @return string
-	 */
-	protected function store($modelName, $scaffolderConfig, $compiled, FileToCompile $fileToCompile)
-	{
-		$folder = PathParser::parse($scaffolderConfig->paths->views) . strtolower($modelName) ;
+    /**
+     * Store the compiled stub.
+     *
+     * @param               $modelName
+     * @param               $scaffolderConfig
+     * @param               $compiled
+     * @param FileToCompile $fileToCompile
+     *
+     * @return string
+     */
+    protected function store($modelName, $scaffolderConfig, $compiled, FileToCompile $fileToCompile)
+    {
+        $folder = PathParser::parse($scaffolderConfig->paths->views) . strtolower($modelName) ;
 		
-		// create folder directory
-		Directory::createIfNotExists($folder, 0755, true);
+        // 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);
-		}
-		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);
-		}
+        // Store in cache
+        if ($fileToCompile->cached)
+        {
+            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);
+        }
 
-		return $path;
-	}
+        return $path;
+    }
 
-	/**
-	 * Add fields to the create view.
-	 *
-	 * @param $modelData
-	 *
-	 * @return $this
-	 */
-	private function addFields($modelData)
-	{
-		$fields = '';
-		$firstIteration = true;
+    /**
+     * Add fields to the create view.
+     *
+     * @param $modelData
+     *
+     * @return $this
+     */
+    private function addFields($modelData)
+    {
+        $fields = '';
+        $firstIteration = true;
 
-		foreach ($modelData->fields as $field)
-		{
-			if ($firstIteration)
-			{
-				$fields .= sprintf(self::getInputFor($field) . PHP_EOL, $field->name);
-				$firstIteration = false;
-			}
-			else
-			{
-				$fields .= sprintf("\t" . self::getInputFor($field) . PHP_EOL, $field->name);
-			}
-		}
+        foreach ($modelData->fields as $field)
+        {
+            if ($firstIteration)
+            {
+                $fields .= sprintf(self::getInputFor($field) . PHP_EOL, $field->name);
+                $firstIteration = false;
+            }
+            else
+            {
+                $fields .= sprintf("\t" . self::getInputFor($field) . PHP_EOL, $field->name);
+            }
+        }
 
-		$this->stub = str_replace('{{fields}}', $fields, $this->stub);
+        $this->stub = str_replace('{{fields}}', $fields, $this->stub);
 
-		return $this;
-	}
+        return $this;
+    }
 
-	/**
-	 * Replace the prefix.
-	 *
-	 * @param $prefix
-	 *
-	 * @return $this
-	 */
-	private function replaceRoutePrefix($prefix)
-	{
-		$this->stub = str_replace('{{route_prefix}}', $prefix, $this->stub);
+    /**
+     * Replace the prefix.
+     *
+     * @param $prefix
+     *
+     * @return $this
+     */
+    private function replaceRoutePrefix($prefix)
+    {
+        $this->stub = str_replace('{{route_prefix}}', $prefix, $this->stub);
 
-		return $this;
-	}
+        return $this;
+    }
 }
\ No newline at end of file

Spacing +8 added lines, -8 removed lines

@@ -27,7 +27,7 @@ 
 	 */
 	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 @@ 
 	 */
 	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 @@ 
 		{
 			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);
 			}
 		}
 

Braces +3 added lines, -6 removed lines

@@ -30,8 +30,7 @@ 
 		if (File::exists(base_path('scaffolder-config/cache/view_create_' . $hash . self::CACHE_EXT)))
 		{
 			return $this->store($modelName, $scaffolderConfig, '', new FileToCompile(true, $hash));
-		}
-		else
+		} else
 		{
 			$this->stub = $stub;
 
@@ -66,8 +65,7 @@ 
 		if ($fileToCompile->cached)
 		{
 			File::copy(base_path('scaffolder-config/cache/view_create_' . $fileToCompile->hash . self::CACHE_EXT), $path);
-		}
-		else
+		} 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);
@@ -94,8 +92,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/View/EditViewCompiler.php

Indentation +131 added lines, -131 removed lines

@@ -11,136 +11,136 @@
 
 class EditViewCompiler extends AbstractViewCompiler
 {
-	use InputTypeResolverTrait;
-
-	/**
-	 * Compiles the edit view.
-	 *
-	 * @param      $stub
-	 * @param      $modelName
-	 * @param      $modelData
-	 * @param      $scaffolderConfig
-	 * @param      $hash
-	 * @param null $extra
-	 *
-	 * @return string
-	 */
-	public function compile($stub, $modelName, $modelData, $scaffolderConfig, $hash, $extra = null)
-	{
-		if (File::exists(base_path('scaffolder-config/cache/view_edit_' . $hash . self::CACHE_EXT)))
-		{
-			return $this->store($modelName, $scaffolderConfig, '', new FileToCompile(true, $hash));
-		}
-		else
-		{
-			$this->stub = $stub;
-
-			return $this->replaceClassName($modelName)
-				->replaceBreadcrumb($modelName)
-				->addFields($modelData)
-				->replacePrimaryKey($modelData)
-				->replaceRoutePrefix($scaffolderConfig->routing->prefix)
-				->store($modelName, $scaffolderConfig, $this->stub, new FileToCompile(false, $hash));
-		}
-	}
-
-	/**
-	 * Store the compiled stub.
-	 *
-	 * @param               $modelName
-	 * @param               $scaffolderConfig
-	 * @param               $compiled
-	 * @param FileToCompile $fileToCompile
-	 *
-	 * @return string
-	 */
-	protected function store($modelName, $scaffolderConfig, $compiled, FileToCompile $fileToCompile)
-	{
-		$folder = PathParser::parse($scaffolderConfig->paths->views) . strtolower($modelName) ;
+    use InputTypeResolverTrait;
+
+    /**
+     * Compiles the edit view.
+     *
+     * @param      $stub
+     * @param      $modelName
+     * @param      $modelData
+     * @param      $scaffolderConfig
+     * @param      $hash
+     * @param null $extra
+     *
+     * @return string
+     */
+    public function compile($stub, $modelName, $modelData, $scaffolderConfig, $hash, $extra = null)
+    {
+        if (File::exists(base_path('scaffolder-config/cache/view_edit_' . $hash . self::CACHE_EXT)))
+        {
+            return $this->store($modelName, $scaffolderConfig, '', new FileToCompile(true, $hash));
+        }
+        else
+        {
+            $this->stub = $stub;
+
+            return $this->replaceClassName($modelName)
+                ->replaceBreadcrumb($modelName)
+                ->addFields($modelData)
+                ->replacePrimaryKey($modelData)
+                ->replaceRoutePrefix($scaffolderConfig->routing->prefix)
+                ->store($modelName, $scaffolderConfig, $this->stub, new FileToCompile(false, $hash));
+        }
+    }
+
+    /**
+     * Store the compiled stub.
+     *
+     * @param               $modelName
+     * @param               $scaffolderConfig
+     * @param               $compiled
+     * @param FileToCompile $fileToCompile
+     *
+     * @return string
+     */
+    protected function store($modelName, $scaffolderConfig, $compiled, FileToCompile $fileToCompile)
+    {
+        $folder = PathParser::parse($scaffolderConfig->paths->views) . strtolower($modelName) ;
 		
-		// create folder directory
-		Directory::createIfNotExists($folder, 0755, true);
-
-		$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);
-		}
-		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);
-		}
-
-		return $path;
-	}
-
-	/**
-	 * Add fields to the edit view.
-	 *
-	 * @param $modelData
-	 *
-	 * @return $this
-	 */
-	private function addFields($modelData)
-	{
-		$fields = '';
-		$firstIteration = true;
-
-		foreach ($modelData->fields as $field)
-		{
-			if ($firstIteration)
-			{
-				$fields .= sprintf(self::getInputFor($field) . PHP_EOL, $field->name);
-				$firstIteration = false;
-			}
-			else
-			{
-				$fields .= sprintf("\t" . self::getInputFor($field) . PHP_EOL, $field->name);
-			}
-		}
-
-		$this->stub = str_replace('{{fields}}', $fields, $this->stub);
-
-		return $this;
-	}
-
-	/**
-	 * Replace the prefix.
-	 *
-	 * @param $prefix
-	 *
-	 * @return $this
-	 */
-	private function replaceRoutePrefix($prefix)
-	{
-		$this->stub = str_replace('{{route_prefix}}', $prefix, $this->stub);
-
-		return $this;
-	}
-
-	/**
-	 * Replace the primary key.
-	 *
-	 * @param $modelData
-	 */
-	private function replacePrimaryKey($modelData)
-	{
-		$primaryKey = 'id';
-
-		foreach ($modelData->fields as $field)
-		{
-			if ($field->index == 'primary')
-			{
-				$primaryKey = $field->name;
-				break;
-			}
-		}
-
-		$this->stub = str_replace('{{primaryKey}}', $primaryKey, $this->stub);
-
-		return $this;
-	}
+        // create folder directory
+        Directory::createIfNotExists($folder, 0755, true);
+
+        $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);
+        }
+        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);
+        }
+
+        return $path;
+    }
+
+    /**
+     * Add fields to the edit view.
+     *
+     * @param $modelData
+     *
+     * @return $this
+     */
+    private function addFields($modelData)
+    {
+        $fields = '';
+        $firstIteration = true;
+
+        foreach ($modelData->fields as $field)
+        {
+            if ($firstIteration)
+            {
+                $fields .= sprintf(self::getInputFor($field) . PHP_EOL, $field->name);
+                $firstIteration = false;
+            }
+            else
+            {
+                $fields .= sprintf("\t" . self::getInputFor($field) . PHP_EOL, $field->name);
+            }
+        }
+
+        $this->stub = str_replace('{{fields}}', $fields, $this->stub);
+
+        return $this;
+    }
+
+    /**
+     * Replace the prefix.
+     *
+     * @param $prefix
+     *
+     * @return $this
+     */
+    private function replaceRoutePrefix($prefix)
+    {
+        $this->stub = str_replace('{{route_prefix}}', $prefix, $this->stub);
+
+        return $this;
+    }
+
+    /**
+     * Replace the primary key.
+     *
+     * @param $modelData
+     */
+    private function replacePrimaryKey($modelData)
+    {
+        $primaryKey = 'id';
+
+        foreach ($modelData->fields as $field)
+        {
+            if ($field->index == 'primary')
+            {
+                $primaryKey = $field->name;
+                break;
+            }
+        }
+
+        $this->stub = str_replace('{{primaryKey}}', $primaryKey, $this->stub);
+
+        return $this;
+    }
 }
\ No newline at end of file

Spacing +8 added lines, -8 removed lines

@@ -27,7 +27,7 @@ 
 	 */
 	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 @@ 
 	 */
 	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 @@ 
 		{
 			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);
 			}
 		}
 

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

Indentation +247 added lines, -247 removed lines

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

Spacing +35 added lines, -35 removed lines

@@ -5,30 +5,30 @@ 
 use Scaffolder\Compilers\Support\FileToCompile;
 use Illuminate\Support\Facades\File;
 use Scaffolder\Support\Json;
-use stdClass ;
+use stdClass;
 
 abstract class AbstractCompiler
 {
-	protected $cachePrefix ;
+	protected $cachePrefix;
 	protected $stubFilename;
 
 	protected $stub;
-	protected $scaffolderConfig ;
-	protected $modelName ;
-	protected $modelData ;
-	protected $stubsDirectory ;
+	protected $scaffolderConfig;
+	protected $modelName;
+	protected $modelData;
+	protected $stubsDirectory;
 
-	protected $eagerTable ;
+	protected $eagerTable;
 
 	const CACHE_EXT = '.scf';
 
 	public function __construct($scaffolderConfig, $modelData = null)
 	{
-		$this->modelName = isset($modelData->modelName) ? $modelData->modelName : null  ;
-		$this->modelData = $modelData ;
-		$this->scaffolderConfig = $scaffolderConfig ;
+		$this->modelName = isset($modelData->modelName) ? $modelData->modelName : null;
+		$this->modelData = $modelData;
+		$this->scaffolderConfig = $scaffolderConfig;
 
-		$this->stub = File::get($this->stubsDirectory . $this->stubFilename );
+		$this->stub = File::get($this->stubsDirectory.$this->stubFilename);
 	}
 
 	/**
@@ -40,7 +40,7 @@ 
 	 */
 	public function compile($extra = null)
 	{
-		if (File::exists(base_path('scaffolder-config/cache/' . $this->cachePrefix  . $this->modelData->modelHash . self::CACHE_EXT)))
+		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));
 		}
@@ -69,7 +69,7 @@ 
 	 *
 	 * @return string
 	 */
-	protected function setEagerTable($eagerTable){
+	protected function setEagerTable($eagerTable) {
 		$this->eagerTable = $eagerTable.'.';
 	}
 
@@ -87,12 +87,12 @@ 
 		// Store in cache
 		if ($fileToCompile->cached)
 		{
-			File::copy(base_path('scaffolder-config/cache/' . $this->cachePrefix . $fileToCompile->hash . self::CACHE_EXT), $path);
+			File::copy(base_path('scaffolder-config/cache/'.$this->cachePrefix.$fileToCompile->hash.self::CACHE_EXT), $path);
 		}
 		else
 		{
-			File::put(base_path('scaffolder-config/cache/' . $this->cachePrefix . $fileToCompile->hash . self::CACHE_EXT), $this->stub);
-			File::copy(base_path('scaffolder-config/cache/' . $this->cachePrefix . $fileToCompile->hash . self::CACHE_EXT), $path);
+			File::put(base_path('scaffolder-config/cache/'.$this->cachePrefix.$fileToCompile->hash.self::CACHE_EXT), $this->stub);
+			File::copy(base_path('scaffolder-config/cache/'.$this->cachePrefix.$fileToCompile->hash.self::CACHE_EXT), $path);
 		}
 
 		return $path;
@@ -121,27 +121,27 @@ 
 		return $this;
 	}
 
-	protected function getPrimaryKeyField(){
+	protected function getPrimaryKeyField() {
 		$primaryKey = new stdClass;
-		$primaryKey->name = "id" ;
-		$primaryKey->index = "primary" ;
-		$primaryKey->declared =  false ;
-		$primaryKey->type = new stdClass ;
-		$primaryKey->type->ui = 'label' ;
-		$primaryKey->type->db = 'integer' ;
+		$primaryKey->name = "id";
+		$primaryKey->index = "primary";
+		$primaryKey->declared = false;
+		$primaryKey->type = new stdClass;
+		$primaryKey->type->ui = 'label';
+		$primaryKey->type->db = 'integer';
 		$primaryKey->foreignKey = [];
-		$primaryKey->validations = "required" ;
+		$primaryKey->validations = "required";
 
 		foreach ($this->modelData->fields as $field)
 		{
 			if ($field->index == 'primary')
 			{
-				$primaryKey = $field ;
+				$primaryKey = $field;
 				break;
 			}
 		}
 
-		return $primaryKey ;
+		return $primaryKey;
 	}
 
 	/**
@@ -190,14 +190,14 @@ 
 	 *
 	 * @return $this
 	 */
-	protected function replaceForeingStrings($field,  $originalStubPart){
+	protected function replaceForeingStrings($field, $originalStubPart) {
 		$replaceStub = str_replace('{{foreign_table}}', $field->foreignKey->table, $originalStubPart);
 		$replaceStub = str_replace('{{table_name}}', $this->modelData->tableName, $replaceStub);
 		$replaceStub = str_replace('{{foreign_field}}', $field->foreignKey->field, $replaceStub);
 		$replaceStub = str_replace('{{foreign_model}}', ucwords($field->foreignKey->table), $replaceStub);
 		$replaceStub = str_replace('{{field}}', $field->name, $replaceStub);
 
-		if(isset($this->scaffolderConfig->generator->namespaces))
+		if (isset($this->scaffolderConfig->generator->namespaces))
 			$replaceStub = str_replace('{{model_namespace}}', $this->scaffolderConfig->generator->namespaces->models, $replaceStub);
 
 		return $replaceStub;
@@ -212,10 +212,10 @@ 
 	 *
 	 * @return $this
 	 */
-	protected function replaceFieldStrings($field,  $originalStubPart){
+	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);
 
@@ -243,14 +243,14 @@ 
 	 * @return $this
 	 */
 	protected $modelDataArray = [];
-	protected function getModelData($tableName){
+	protected function getModelData($tableName) {
 		
-		if(array_key_exists($tableName, $this->modelDataArray)){
+		if (array_key_exists($tableName, $this->modelDataArray)) {
 			return $this->modelDataArray[$tableName];
 		}
 		else {
 
-			$modelFilename = base_path('scaffolder-config/models/') . $tableName . '.json' ;
+			$modelFilename = base_path('scaffolder-config/models/').$tableName.'.json';
 
 			$modelData = Json::decodeFile($modelFilename);
 
@@ -261,10 +261,10 @@ 
 			$modelHash = md5_file($modelFilename);
 
 			// Set model name
-			$modelData->modelName = $modelName ;
+			$modelData->modelName = $modelName;
 
 			// Set model name
-			$modelData->modelHash = $modelHash ;
+			$modelData->modelHash = $modelHash;
 
 			$this->modelDataArray[$tableName] = $modelData;
 

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