codificar / scaffolder

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/View/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->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 @@ 
             {
                 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));
                 }
             }
         }

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

stubs/Api/Routes.php

Indentation +9 added lines, -9 removed lines

@@ -8,13 +8,13 @@ 
 Route::group(['prefix' => '{{route_prefix}}', 'middleware' => 'cors'], function ()
 {
 
-	Route::get('dashboard', function ()
-	{
-		return view('dashboard');
-	});
+    Route::get('dashboard', function ()
+    {
+        return view('dashboard');
+    });
 
-	Route::match(['post'], 'upload', 'FileController@upload')->middleware('cors');
-	Route::get('upload', 'FileController@upload');
+    Route::match(['post'], 'upload', 'FileController@upload')->middleware('cors');
+    Route::get('upload', 'FileController@upload');
 	
 {{routes}}
 });
@@ -22,14 +22,14 @@ 
 # todo fix in the correct manner
 // font fix issues
 Route::get('/styles/ui-grid.woff', function(){
-	return file_get_contents(base_path('public').'/fonts/ui-grid.woff');
+    return file_get_contents(base_path('public').'/fonts/ui-grid.woff');
 });
 
 Route::get('/styles/ui-grid.ttf', function(){
-	return file_get_contents(base_path('public').'/fonts/ui-grid.ttf');
+    return file_get_contents(base_path('public').'/fonts/ui-grid.ttf');
 });
 
 // other routes point for the dist html file
 Route::any('{any}', function(){
-	return file_get_contents(base_path('public').'/index.html');
+    return file_get_contents(base_path('public').'/index.html');
 })->where('any', '.*');
\ No newline at end of file

Spacing +5 added lines, -5 removed lines

@@ -5,10 +5,10 @@ 
 |--------------------------------------------------------------------------
 */
 
-Route::group(['prefix' => '{{route_prefix}}', 'middleware' => 'cors'], function ()
+Route::group(['prefix' => '{{route_prefix}}', 'middleware' => 'cors'], function()
 {
 
-	Route::get('dashboard', function ()
+	Route::get('dashboard', function()
 	{
 		return view('dashboard');
 	});
@@ -21,15 +21,15 @@ 
 
 # todo fix in the correct manner
 // font fix issues
-Route::get('/styles/ui-grid.woff', function(){
+Route::get('/styles/ui-grid.woff', function() {
 	return file_get_contents(base_path('public').'/fonts/ui-grid.woff');
 });
 
-Route::get('/styles/ui-grid.ttf', function(){
+Route::get('/styles/ui-grid.ttf', function() {
 	return file_get_contents(base_path('public').'/fonts/ui-grid.ttf');
 });
 
 // other routes point for the dist html file
-Route::any('{any}', function(){
+Route::any('{any}', function() {
 	return file_get_contents(base_path('public').'/index.html');
 })->where('any', '.*');
\ No newline at end of file

stubs/Api/Controller/FileController.php

Indentation +41 added lines, -41 removed lines

@@ -15,56 +15,56 @@
 
 class {{class_name}}Controller extends Controller
 {
-	// blade views
-	// index view
+    // blade views
+    // index view
 
-	public function show($id)
-	{
-		$file = {{class_name}}Model::find($id);
-		return $file ;
-	}
+    public function show($id)
+    {
+        $file = {{class_name}}Model::find($id);
+        return $file ;
+    }
 
-	public function upload()
-	{
-		$config = new FlowConfig();
-		$config->setTempDir(storage_path() . '/tmp');
-		$config->setDeleteChunksOnSave(true);
+    public function upload()
+    {
+        $config = new FlowConfig();
+        $config->setTempDir(storage_path() . '/tmp');
+        $config->setDeleteChunksOnSave(true);
 
-		$request = new FlowRequest();
+        $request = new FlowRequest();
 
-		$totalSize = $request->getTotalSize();
+        $totalSize = $request->getTotalSize();
 
-		if ($totalSize && $totalSize > (1024 * 1024 * 4))
-		{
-			return $this->responseWithError('File size exceeds 4MB');
-		}
+        if ($totalSize && $totalSize > (1024 * 1024 * 4))
+        {
+            return $this->responseWithError('File size exceeds 4MB');
+        }
 
-		$requestFile = $request->getFile();
+        $requestFile = $request->getFile();
 
-		$file = new ScaffolderFile($config, $request);
+        $file = new ScaffolderFile($config, $request);
 
-		if ($file->validateChunk()) {
-			$file->saveChunk();
-		}
+        if ($file->validateChunk()) {
+            $file->saveChunk();
+        }
 
-		if ($file->save(storage_path() . '/tmp/' .  $request->getFileName()))
-		{
-			$file = FileModel::create([
-				'mime_type' => $requestFile['type'],
-				'size' => $requestFile['size'],
-				'file_path' => storage_path() . '/tmp/',
-				'filename' => $requestFile['name'],
-				'disk' => 'local',
-				'status' => false,
-			]);
+        if ($file->save(storage_path() . '/tmp/' .  $request->getFileName()))
+        {
+            $file = FileModel::create([
+                'mime_type' => $requestFile['type'],
+                'size' => $requestFile['size'],
+                'file_path' => storage_path() . '/tmp/',
+                'filename' => $requestFile['name'],
+                'disk' => 'local',
+                'status' => false,
+            ]);
 
-			return $file->id;
-		}
-		else
-		{
-			// Indicate that we are not done with all the chunks.
-			return null;
-		}
-	}
+            return $file->id;
+        }
+        else
+        {
+            // Indicate that we are not done with all the chunks.
+            return null;
+        }
+    }
 
 }

Spacing +5 added lines, -5 removed lines

@@ -5,7 +5,7 @@ 
 use Illuminate\Http\Request;
 use Illuminate\Pagination\Paginator;
 use App\Http\Controllers\Controller;
-use App\Models\{{class_name}} as {{class_name}}Model;;
+use App\Models\{{class_name}} as {{class_name}}Model; ;
 use App\Http\Controllers\File as ScaffolderFile;
 use Log;
 use Flow\Config as FlowConfig;
@@ -21,13 +21,13 @@ 
 	public function show($id)
 	{
 		$file = {{class_name}}Model::find($id);
-		return $file ;
+		return $file;
 	}
 
 	public function upload()
 	{
 		$config = new FlowConfig();
-		$config->setTempDir(storage_path() . '/tmp');
+		$config->setTempDir(storage_path().'/tmp');
 		$config->setDeleteChunksOnSave(true);
 
 		$request = new FlowRequest();
@@ -47,12 +47,12 @@ 
 			$file->saveChunk();
 		}
 
-		if ($file->save(storage_path() . '/tmp/' .  $request->getFileName()))
+		if ($file->save(storage_path().'/tmp/'.$request->getFileName()))
 		{
 			$file = FileModel::create([
 				'mime_type' => $requestFile['type'],
 				'size' => $requestFile['size'],
-				'file_path' => storage_path() . '/tmp/',
+				'file_path' => storage_path().'/tmp/',
 				'filename' => $requestFile['name'],
 				'disk' => 'local',
 				'status' => false,

Braces +1 added lines, -2 removed lines

@@ -59,8 +59,7 @@
 			]);
 
 			return $file->id;
-		}
-		else
+		} else
 		{
 			// Indicate that we are not done with all the chunks.
 			return null;

stubs/Api/Controller/Controller.php

Indentation +105 added lines, -105 removed lines

@@ -14,30 +14,30 @@ 
 
 class {{class_name}}Controller extends Controller
 {
-	// blade views
-	// index view
-	public function index()
-	{
-		return view('{{class_name_lw}}.index');
-	}
-	// create view
-	public function create()
-	{
-		return view('{{class_name_lw}}.create');
-	}
-
-	// edit view
-	public function edit($id)
-	{
-		${{class_name_lw}} = {{class_name}}::find($id);
-
-		return view('{{class_name_lw}}.edit')->with('model', ${{class_name_lw}});
-	}
-
-	// api resources
+    // blade views
+    // index view
+    public function index()
+    {
+        return view('{{class_name_lw}}.index');
+    }
+    // create view
+    public function create()
+    {
+        return view('{{class_name_lw}}.create');
+    }
+
+    // edit view
+    public function edit($id)
+    {
+        ${{class_name_lw}} = {{class_name}}::find($id);
+
+        return view('{{class_name_lw}}.edit')->with('model', ${{class_name_lw}});
+    }
+
+    // api resources
 	
-	// save {{class_name_lw}}
-	/*public function store(Request $request)
+    // save {{class_name_lw}}
+    /*public function store(Request $request)
 	{
 		// validate {{class_name_lw}} and eager objects
 		$this->validate($request, $this->getRules());
@@ -55,20 +55,20 @@ 
 		return ${{class_name_lw}} ;
 	}*/
 
-	// save {{class_name_lw}}
-	public function store(Request $request)
-	{
-		// validate {{class_name_lw}} and eager objects
-		$this->validate($request, $this->getRules());
+    // save {{class_name_lw}}
+    public function store(Request $request)
+    {
+        // validate {{class_name_lw}} and eager objects
+        $this->validate($request, $this->getRules());
 		
-		$model = new {{class_name}}();
+        $model = new {{class_name}}();
 
-		${{class_name_lw}} = $model->store($request);
+        ${{class_name_lw}} = $model->store($request);
 
-		return ${{class_name_lw}};
-	}
+        return ${{class_name_lw}};
+    }
 
-	/*// update {{class_name_lw}} by id
+    /*// update {{class_name_lw}} by id
 	public function update($id, Request $request)
 	{
 		// get vars
@@ -89,45 +89,45 @@ 
 		{{relationship_tables_call}}
 		return ${{class_name_lw}};
 	}*/
-	public function update($id, Request $request)
-	{
-		// validate {{table_name}} and eager objects
-		$this->validate($request, $this->getRules($id));
+    public function update($id, Request $request)
+    {
+        // validate {{table_name}} and eager objects
+        $this->validate($request, $this->getRules($id));
 		
-		$model = new {{class_name}}();
-		${{class_name_lw}} = $model->updateModel($id, $request);
+        $model = new {{class_name}}();
+        ${{class_name_lw}} = $model->updateModel($id, $request);
 
-		return ${{class_name_lw}};
-	}
+        return ${{class_name_lw}};
+    }
 
 
-	/*// get {{class_name_lw}} by id
+    /*// get {{class_name_lw}} by id
 	public function show($id)
 	{
 		${{class_name_lw}} = {{class_name}}::find($id);
 		return ${{class_name_lw}} ;
 	}*/
-	public function show($id)
-	{
-		$model = new {{class_name}}();
-		${{class_name_lw}} = $model->show($id);
-		return ${{class_name_lw}} ;
-	}
-
-	/*// find first by field and value
+    public function show($id)
+    {
+        $model = new {{class_name}}();
+        ${{class_name_lw}} = $model->show($id);
+        return ${{class_name_lw}} ;
+    }
+
+    /*// find first by field and value
 	public function findByField(Request $request)
 	{
 		${{class_name_lw}} = {{class_name}}::where($request->input('field') , '=', $request->input('value'))->first();
 		return ${{class_name_lw}} ;
 	}*/
-	public function findByField(Request $request)
-	{
-		$model = new {{class_name}}();
-		${{class_name_lw}} = $model->findByField($request);
-		return ${{class_name_lw}} ;
-	}
-
-	/*// build all validation rules
+    public function findByField(Request $request)
+    {
+        $model = new {{class_name}}();
+        ${{class_name_lw}} = $model->findByField($request);
+        return ${{class_name_lw}} ;
+    }
+
+    /*// build all validation rules
 	protected function getRules($id = null){
 		// default object rules
 		$rules = {{class_name}}::$rules;
@@ -138,19 +138,19 @@ 
 		
 		return $rules;
 	}*/
-	protected function getRules($id = null){
-		// default object rules
-		$model = new {{class_name}}();
-		$rules = $model::$rules;
-		${{class_name_lw}} = $model->show($id);
-		{{unique_rules}}
-		// nested rules for eager objects
-		{{rules_eager}}
+    protected function getRules($id = null){
+        // default object rules
+        $model = new {{class_name}}();
+        $rules = $model::$rules;
+        ${{class_name_lw}} = $model->show($id);
+        {{unique_rules}}
+        // nested rules for eager objects
+        {{rules_eager}}
 		
-		return $rules;
-	}
+        return $rules;
+    }
 
-	/*// delete model by id
+    /*// delete model by id
 	public function destroy($id)
 	{	
 		$ids = explode(",", $id);
@@ -164,32 +164,32 @@ 
 
 		return json_encode($status);
 	}*/
-	public function destroy($id)
-	{
-		$ids = explode(",", $id);
-	    $ids = array_unique($ids);
+    public function destroy($id)
+    {
+        $ids = explode(",", $id);
+        $ids = array_unique($ids);
 
-	    $model = new {{class_name}}();
+        $model = new {{class_name}}();
 
-	    $success = $model->destroy($ids);
+        $success = $model->destroy($ids);
 
-	    $status = array("error" => true, "message" => "Error deleting object");
-		if ($success)
-			$status = array("error" => false, "message" => "Object successfully deleted");
+        $status = array("error" => true, "message" => "Error deleting object");
+        if ($success)
+            $status = array("error" => false, "message" => "Object successfully deleted");
 
-		return json_encode($status);
+        return json_encode($status);
 
-	}
+    }
 
-	{{reverseRelationships}}
-	{{relationship_tables_store}}
-	{{remove_relationship_objects}}
-	{{enum}}
-	{{checkbox}}
+    {{reverseRelationships}}
+    {{relationship_tables_store}}
+    {{remove_relationship_objects}}
+    {{enum}}
+    {{checkbox}}
 
 
-	// query with search and pagination options
-	/*public function query(Request $request)
+    // query with search and pagination options
+    /*public function query(Request $request)
 	{
 		// get query parameters
 		$params = $request->all();
@@ -238,20 +238,20 @@ 
 		return $query->paginate($pagination["itensPerPage"]);
 	}*/
 
-	// query with search and pagination options
-	public function query(Request $request)
-	{
-		$model = new {{class_name}}();
+    // query with search and pagination options
+    public function query(Request $request)
+    {
+        $model = new {{class_name}}();
 
-		$query = $model->querySearch($request);
+        $query = $model->querySearch($request);
 
-		return $query;
-	}
+        return $query;
+    }
 
 
-	// query with fields filters and pagination
-	//json = {"pagination": {"actual": 1, "itensPerPage": 20}, "fields": ["name","email","cnpj"], "orderBy": "name"}
-	/*public function queryFilters(Request $request)
+    // query with fields filters and pagination
+    //json = {"pagination": {"actual": 1, "itensPerPage": 20}, "fields": ["name","email","cnpj"], "orderBy": "name"}
+    /*public function queryFilters(Request $request)
 	{
 		// get query parameters
 		$params = $request->all();
@@ -311,16 +311,16 @@ 
 
 		return ${{class_name_lw}}->paginate($pagination["itensPerPage"]);
 	}*/
-	// query with fields filters and pagination
-	//json = {"pagination": {"actual": 1, "itensPerPage": 20}, "fields": ["name","email","cnpj"], "orderBy": "name"}
-	public function queryFilters(Request $request)
-	{
-		$model = new {{class_name}}();
+    // query with fields filters and pagination
+    //json = {"pagination": {"actual": 1, "itensPerPage": 20}, "fields": ["name","email","cnpj"], "orderBy": "name"}
+    public function queryFilters(Request $request)
+    {
+        $model = new {{class_name}}();
 
-		${{class_name_lw}} = $model->queryFilters($request);
+        ${{class_name_lw}} = $model->queryFilters($request);
 		
-		return ${{class_name_lw}};
-	}
+        return ${{class_name_lw}};
+    }
 
 	
 }

Spacing +1 added lines, -1 removed lines

@@ -138,7 +138,7 @@
 		
 		return $rules;
 	}*/
-	protected function getRules($id = null){
+	protected function getRules($id = null) {
 		// default object rules
 		$model = new {{class_name}}();
 		$rules = $model::$rules;

Braces +3 added lines, -2 removed lines

@@ -174,8 +174,9 @@
 	    $success = $model->destroy($ids);
 
 	    $status = array("error" => true, "message" => "Error deleting object");
-		if ($success)
-			$status = array("error" => false, "message" => "Object successfully deleted");
+		if ($success) {
+					$status = array("error" => false, "message" => "Object successfully deleted");
+		}
 
 		return json_encode($status);
 

stubs/Api/Model/Model.php

Indentation +169 added lines, -169 removed lines

@@ -13,209 +13,209 @@
 
 class {{class_name}} extends Model
 {
-	/**
-	 * The database table used by the model.
-	 *
-	 * @var string
-	 */
-	protected $table = '{{table_name}}';
-	{{timestamps}}
-
-	{{primaryAttribute}}
-	public $fillable = [
-		{{fillable}}
-	];
-
-	// validation rules 
-	public static $rules = 	[
-			{{validations}}
-	];
-
-	// eager loading objects
-	public $with = [
-		{{eager}}
-	];
-
-	{{enum}}
-
-	{{belongsTo}}
-
-	{{reverseRelationship}}
+    /**
+     * The database table used by the model.
+     *
+     * @var string
+     */
+    protected $table = '{{table_name}}';
+    {{timestamps}}
+
+    {{primaryAttribute}}
+    public $fillable = [
+        {{fillable}}
+    ];
+
+    // validation rules 
+    public static $rules = 	[
+            {{validations}}
+    ];
+
+    // eager loading objects
+    public $with = [
+        {{eager}}
+    ];
+
+    {{enum}}
+
+    {{belongsTo}}
+
+    {{reverseRelationship}}
 	
 
-	//api resources
+    //api resources
 
 
 
-	// save {{class_name_lw}}
-	public function store(Request $request)
-	{
-		$vars = $request->all();
+    // save {{class_name_lw}}
+    public function store(Request $request)
+    {
+        $vars = $request->all();
 
-		//create eager objects
-		{{store_eager_objects}}
+        //create eager objects
+        {{store_eager_objects}}
 
-		${{class_name_lw}} = {{class_name}}::create($vars);
+        ${{class_name_lw}} = {{class_name}}::create($vars);
 
-		//create relationship_tables objects
-		{{relationship_tables_call}}
+        //create relationship_tables objects
+        {{relationship_tables_call}}
 
-		return ${{class_name_lw}} ;
-	}
+        return ${{class_name_lw}} ;
+    }
 
 	
-	// get {{class_name_lw}} by id
-	public function show($id)
-	{
-		${{class_name_lw}} = {{class_name}}::find($id);
-		return ${{class_name_lw}};
-	}
+    // get {{class_name_lw}} by id
+    public function show($id)
+    {
+        ${{class_name_lw}} = {{class_name}}::find($id);
+        return ${{class_name_lw}};
+    }
 
 
 	
-	//get first row by field and value
-	public function findByField(Request $request)
-	{
-		${{class_name_lw}} = {{class_name}}::where($request->input('field') , '=', $request->input('value'))->first();
-		return ${{class_name_lw}} ;
-	}
+    //get first row by field and value
+    public function findByField(Request $request)
+    {
+        ${{class_name_lw}} = {{class_name}}::where($request->input('field') , '=', $request->input('value'))->first();
+        return ${{class_name_lw}} ;
+    }
 
 	
-	// update {{class_name_lw}} by id
-	public function updateModel($id, Request $request)
-	{
-		// get vars
-		$vars = $request->all();
+    // update {{class_name_lw}} by id
+    public function updateModel($id, Request $request)
+    {
+        // get vars
+        $vars = $request->all();
 		
-		//update eager objects
-		{{update_eager_objects}}
+        //update eager objects
+        {{update_eager_objects}}
 
-		${{class_name_lw}} = {{class_name}}::find($id);
-		${{class_name_lw}}->fill($vars);
-		${{class_name_lw}}->save();
+        ${{class_name_lw}} = {{class_name}}::find($id);
+        ${{class_name_lw}}->fill($vars);
+        ${{class_name_lw}}->save();
 
-		//update relationship_tables objects
-		{{remove_relationship_objects_call}}
+        //update relationship_tables objects
+        {{remove_relationship_objects_call}}
 		
-		{{relationship_tables_call}}
+        {{relationship_tables_call}}
 
-		return ${{class_name_lw}};
-	}
+        return ${{class_name_lw}};
+    }
 
 
-	// delete model by id or ids
-	public static function destroy($ids)
-	{	
-		$success = {{class_name}}::whereIn('id', $ids)->delete();
+    // delete model by id or ids
+    public static function destroy($ids)
+    {	
+        $success = {{class_name}}::whereIn('id', $ids)->delete();
 		
-		return $success;
-	}
-
-	// query with search and pagination options
-	public function querySearch(Request $request)
-	{
-		// get query parameters
-		$params = $request->all();
-
-		// get pagination conditions
-		if(isset($params["pagination"])) {
-			$pagination = $params["pagination"];
-		}
-		else { // set default 
-			$pagination =  ["actual" => 1, "itensPerPage" => 25 ] ;
-		}
-
-		// resolve current page
-		$currentPage = $pagination["actual"];
-		Paginator::currentPageResolver(function () use ($currentPage) {
-			return $currentPage;
-		});
-
-		// set first condition 1=1 (all results)
-		$query = {{class_name}}::WhereNotNull('{{table_name}}.{{primary_key}}');
-
-		// get filters conditions
-		$filters = isset($params["filters"]) ? $params["filters"] : $params;
+        return $success;
+    }
+
+    // query with search and pagination options
+    public function querySearch(Request $request)
+    {
+        // get query parameters
+        $params = $request->all();
+
+        // get pagination conditions
+        if(isset($params["pagination"])) {
+            $pagination = $params["pagination"];
+        }
+        else { // set default 
+            $pagination =  ["actual" => 1, "itensPerPage" => 25 ] ;
+        }
+
+        // resolve current page
+        $currentPage = $pagination["actual"];
+        Paginator::currentPageResolver(function () use ($currentPage) {
+            return $currentPage;
+        });
+
+        // set first condition 1=1 (all results)
+        $query = {{class_name}}::WhereNotNull('{{table_name}}.{{primary_key}}');
+
+        // get filters conditions
+        $filters = isset($params["filters"]) ? $params["filters"] : $params;
 		
-		// field by field condition
-		{{conditions}}
+        // field by field condition
+        {{conditions}}
 
-		// join eager objects
-		{{eager_joins}}
+        // join eager objects
+        {{eager_joins}}
 
-		// eager object condition
-		{{eager_conditions}}
+        // eager object condition
+        {{eager_conditions}}
 
-		// join relationship tables objects
-		{{relationship_tables_joins}}
-		// get sort clauses
-		if(isset($params["sort"]) && count($params["sort"])) {
-			foreach($params["sort"] as $sort){
-				{{relationship_tables_joins_sort}} 
-				$query->orderBy($sort["field"], $sort["order"]);
-			}
-		}
+        // join relationship tables objects
+        {{relationship_tables_joins}}
+        // get sort clauses
+        if(isset($params["sort"]) && count($params["sort"])) {
+            foreach($params["sort"] as $sort){
+                {{relationship_tables_joins_sort}} 
+                $query->orderBy($sort["field"], $sort["order"]);
+            }
+        }
 
 
 		
-		return $query->paginate($pagination["itensPerPage"]);
-	}
-
-
-	// query with fields filters and pagination
-	//json = {"pagination": {"actual": 1, "itensPerPage": 20}, "fields": ["name","email","cnpj"], "orderBy": "name"}
-	public function queryFilters(Request $request)
-	{
-		// get query parameters
-		$params = $request->all();
-
-		$orderBy = '{{primary_key}}';
-		$fields = null;
-		$selectArray = [];
-		array_push($selectArray,'{{primary_key}}');
-
-		// get pagination conditions
-		if(isset($params["pagination"])) {
-			$pagination = $params["pagination"];
-		}
-		else { // set default 
-			$pagination =  ["actual" => 1, "itensPerPage" => 25 ] ;
-		}
-
-		// resolve current page
-		$currentPage = $pagination["actual"];
-		Paginator::currentPageResolver(function () use ($currentPage) {
-			return $currentPage;
-		});
-
-		if(isset($params["fields"])) {
-			$fields = $params["fields"];
-
-			foreach ($fields as $field) {
-				if(Schema::hasColumn('{{table_name}}', $field)){
-					array_push($selectArray, $field);
-				}
-			}
-
-		}
-
-		if(isset($params["orderBy"])) {
-			if(Schema::hasColumn('{{table_name}}',$params["orderBy"])){
-				$orderBy = $params["orderBy"];
-			}
-		}
-
-		${{class_name_lw}} = {{class_name}}::WhereNotNull('{{table_name}}.{{primary_key}}');
-
-		${{class_name_lw}}->select($selectArray)->orderBy($orderBy,'asc');
+        return $query->paginate($pagination["itensPerPage"]);
+    }
+
+
+    // query with fields filters and pagination
+    //json = {"pagination": {"actual": 1, "itensPerPage": 20}, "fields": ["name","email","cnpj"], "orderBy": "name"}
+    public function queryFilters(Request $request)
+    {
+        // get query parameters
+        $params = $request->all();
+
+        $orderBy = '{{primary_key}}';
+        $fields = null;
+        $selectArray = [];
+        array_push($selectArray,'{{primary_key}}');
+
+        // get pagination conditions
+        if(isset($params["pagination"])) {
+            $pagination = $params["pagination"];
+        }
+        else { // set default 
+            $pagination =  ["actual" => 1, "itensPerPage" => 25 ] ;
+        }
+
+        // resolve current page
+        $currentPage = $pagination["actual"];
+        Paginator::currentPageResolver(function () use ($currentPage) {
+            return $currentPage;
+        });
+
+        if(isset($params["fields"])) {
+            $fields = $params["fields"];
+
+            foreach ($fields as $field) {
+                if(Schema::hasColumn('{{table_name}}', $field)){
+                    array_push($selectArray, $field);
+                }
+            }
+
+        }
+
+        if(isset($params["orderBy"])) {
+            if(Schema::hasColumn('{{table_name}}',$params["orderBy"])){
+                $orderBy = $params["orderBy"];
+            }
+        }
+
+        ${{class_name_lw}} = {{class_name}}::WhereNotNull('{{table_name}}.{{primary_key}}');
+
+        ${{class_name_lw}}->select($selectArray)->orderBy($orderBy,'asc');
 		
-		return ${{class_name_lw}}->paginate($pagination["itensPerPage"]);
-	}
+        return ${{class_name_lw}}->paginate($pagination["itensPerPage"]);
+    }
 
 	
-	{{relationship_tables_store}}
+    {{relationship_tables_store}}
 
-	{{remove_relationship_objects}}
+    {{remove_relationship_objects}}
 
-	{{checkbox}}
+    {{checkbox}}
 }
\ No newline at end of file

Spacing +16 added lines, -16 removed lines

@@ -27,7 +27,7 @@ 
 	];
 
 	// validation rules 
-	public static $rules = 	[
+	public static $rules = [
 			{{validations}}
 	];
 
@@ -76,7 +76,7 @@ 
 	//get first row by field and value
 	public function findByField(Request $request)
 	{
-		${{class_name_lw}} = {{class_name}}::where($request->input('field') , '=', $request->input('value'))->first();
+		${{class_name_lw}} = {{class_name}}::where($request->input('field'), '=', $request->input('value'))->first();
 		return ${{class_name_lw}} ;
 	}
 
@@ -118,16 +118,16 @@ 
 		$params = $request->all();
 
 		// get pagination conditions
-		if(isset($params["pagination"])) {
+		if (isset($params["pagination"])) {
 			$pagination = $params["pagination"];
 		}
 		else { // set default 
-			$pagination =  ["actual" => 1, "itensPerPage" => 25 ] ;
+			$pagination = ["actual" => 1, "itensPerPage" => 25];
 		}
 
 		// resolve current page
 		$currentPage = $pagination["actual"];
-		Paginator::currentPageResolver(function () use ($currentPage) {
+		Paginator::currentPageResolver(function() use ($currentPage) {
 			return $currentPage;
 		});
 
@@ -149,8 +149,8 @@ 
 		// join relationship tables objects
 		{{relationship_tables_joins}}
 		// get sort clauses
-		if(isset($params["sort"]) && count($params["sort"])) {
-			foreach($params["sort"] as $sort){
+		if (isset($params["sort"]) && count($params["sort"])) {
+			foreach ($params["sort"] as $sort) {
 				{{relationship_tables_joins_sort}} 
 				$query->orderBy($sort["field"], $sort["order"]);
 			}
@@ -172,42 +172,42 @@ 
 		$orderBy = '{{primary_key}}';
 		$fields = null;
 		$selectArray = [];
-		array_push($selectArray,'{{primary_key}}');
+		array_push($selectArray, '{{primary_key}}');
 
 		// get pagination conditions
-		if(isset($params["pagination"])) {
+		if (isset($params["pagination"])) {
 			$pagination = $params["pagination"];
 		}
 		else { // set default 
-			$pagination =  ["actual" => 1, "itensPerPage" => 25 ] ;
+			$pagination = ["actual" => 1, "itensPerPage" => 25];
 		}
 
 		// resolve current page
 		$currentPage = $pagination["actual"];
-		Paginator::currentPageResolver(function () use ($currentPage) {
+		Paginator::currentPageResolver(function() use ($currentPage) {
 			return $currentPage;
 		});
 
-		if(isset($params["fields"])) {
+		if (isset($params["fields"])) {
 			$fields = $params["fields"];
 
 			foreach ($fields as $field) {
-				if(Schema::hasColumn('{{table_name}}', $field)){
+				if (Schema::hasColumn('{{table_name}}', $field)) {
 					array_push($selectArray, $field);
 				}
 			}
 
 		}
 
-		if(isset($params["orderBy"])) {
-			if(Schema::hasColumn('{{table_name}}',$params["orderBy"])){
+		if (isset($params["orderBy"])) {
+			if (Schema::hasColumn('{{table_name}}', $params["orderBy"])) {
 				$orderBy = $params["orderBy"];
 			}
 		}
 
 		${{class_name_lw}} = {{class_name}}::WhereNotNull('{{table_name}}.{{primary_key}}');
 
-		${{class_name_lw}}->select($selectArray)->orderBy($orderBy,'asc');
+		${{class_name_lw}}->select($selectArray)->orderBy($orderBy, 'asc');
 		
 		return ${{class_name_lw}}->paginate($pagination["itensPerPage"]);
 	}

Braces +2 added lines, -4 removed lines

@@ -120,8 +120,7 @@ 
 		// get pagination conditions
 		if(isset($params["pagination"])) {
 			$pagination = $params["pagination"];
-		}
-		else { // set default 
+		} else { // set default 
 			$pagination =  ["actual" => 1, "itensPerPage" => 25 ] ;
 		}
 
@@ -177,8 +176,7 @@ 
 		// get pagination conditions
 		if(isset($params["pagination"])) {
 			$pagination = $params["pagination"];
-		}
-		else { // set default 
+		} else { // set default 
 			$pagination =  ["actual" => 1, "itensPerPage" => 25 ] ;
 		}
 

stubs/Api/Model/FileModel.php

Indentation +18 added lines, -18 removed lines

@@ -7,26 +7,26 @@
 
 class {{class_name}} extends Model
 {
-	/**
-	 * The database table used by the model.
-	 *
-	 * @var string
-	 */
-	protected $table = '{{table_name}}';
+    /**
+     * The database table used by the model.
+     *
+     * @var string
+     */
+    protected $table = '{{table_name}}';
 	
-	{{primaryAttribute}}
-	public $fillable = [
-		{{fillable}}
-	];
+    {{primaryAttribute}}
+    public $fillable = [
+        {{fillable}}
+    ];
 
-	public static function boot()
-	{
-		parent::boot();
+    public static function boot()
+    {
+        parent::boot();
 
-		static::deleting(function($model)
-		{
-			Storage::disk($model->disk)->delete($model->file_path);
-		});
-	}
+        static::deleting(function($model)
+        {
+            Storage::disk($model->disk)->delete($model->file_path);
+        });
+    }
 	
 }
\ No newline at end of file

stubs/Api/Migration.php

Indentation +15 added lines, -15 removed lines

@@ -5,21 +5,21 @@
 
 class Create{{class_name}}Table extends Migration
 {
-	/**
-	 * Run the migrations.
-	 */
-	public function up()
-	{
-		Schema::create('{{table_name}}', function (Blueprint $table) {
+    /**
+     * Run the migrations.
+     */
+    public function up()
+    {
+        Schema::create('{{table_name}}', function (Blueprint $table) {
 {{fields}}
-		});
-	}
+        });
+    }
 
-	/**
-	 * Reverse the migrations.
-	 */
-	public function down()
-	{
-		Schema::drop('{{table_name}}');
-	}
+    /**
+     * Reverse the migrations.
+     */
+    public function down()
+    {
+        Schema::drop('{{table_name}}');
+    }
 }

Spacing +2 added lines, -2 removed lines

@@ -3,14 +3,14 @@
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
 
-class Create{{class_name}}Table extends Migration
+class Create {{class_name}}Table extends Migration
 {
 	/**
 	 * Run the migrations.
 	 */
 	public function up()
 	{
-		Schema::create('{{table_name}}', function (Blueprint $table) {
+		Schema::create('{{table_name}}', function(Blueprint $table) {
 {{fields}}
 		});
 	}