prateekkarki / laragen

src/resources/Controllers/Backend/UploadController.php

Spacing +12 added lines, -12 removed lines

@@ -26,8 +26,8 @@ 
 

         $valid = $this->validateUpload($file, $moduleName, $field);

 

-        if($valid){

-            $imagename = $this->getWritableFilename(str_slug(pathinfo($file->getClientOriginalName(), PATHINFO_FILENAME)).'.'.$file->getClientOriginalExtension(), $moduleName, true);;

+        if ($valid) {

+            $imagename = $this->getWritableFilename(str_slug(pathinfo($file->getClientOriginalName(), PATHINFO_FILENAME)).'.'.$file->getClientOriginalExtension(), $moduleName, true); ;

     

             $destinationPath = storage_path('images/'.$moduleName);

     

@@ -46,7 +46,7 @@ 
         $files = [];

 

         foreach ($request->file('file') as $file) {

-            $imagename = $this->getWritableFilename(str_slug(pathinfo($file->getClientOriginalName(), PATHINFO_FILENAME)).'.'.$file->getClientOriginalExtension(), $moduleName, true);;

+            $imagename = $this->getWritableFilename(str_slug(pathinfo($file->getClientOriginalName(), PATHINFO_FILENAME)).'.'.$file->getClientOriginalExtension(), $moduleName, true); ;

             $destinationPath = storage_path('images/'.$moduleName);

             try {

                 $file->move($destinationPath, $imagename);

@@ -56,7 +56,7 @@ 
             }

         }

 

-        if(!isset($error)){

+        if (!isset($error)) {

             return response()->json(['message' => 'File successfully uploaded', 'filenames' => $files, 'status' => 200], 200);

         }

 

@@ -66,7 +66,7 @@ 
     public function delete(Request $request)

     {

         $moduleName = $request->input('modelName');

-        $modelToCall = "App\\Models\\" . ucfirst($moduleName);

+        $modelToCall = "App\\Models\\".ucfirst($moduleName);

         $model = $modelToCall::find($request->input('modelId'));

         $field = $request->input('field');

         $filename = $model->$field;

@@ -89,7 +89,7 @@ 
      */

     public function process($filename, $moduleName)

     {

-        $messages=['errors'=>[]];

+        $messages = ['errors'=>[]];

         $tempFile = storage_path('images/'.$moduleName.'/'.$filename);

         $fileToWrite = $this->getWritableFilename($filename, $moduleName);

 

@@ -98,25 +98,25 @@ 
         $methodToUse = $tempImage->width() > $tempImage->height() ? 'widen' : 'heighten';

 

         try {

-            $tempImage->$methodToUse(2000, function ($constraint){

+            $tempImage->$methodToUse(2000, function($constraint) {

                 $constraint->upsize();

             })->save($fileToWrite);

             $messages['success']['filename'] = $fileToWrite;

         } catch (\Exception $ex) {

-            $messages['errors'][] = [ 'fileError' => $ex->getMessage()];

+            $messages['errors'][] = ['fileError' => $ex->getMessage()];

         }

         return $messages;

     }

 

-    protected function getWritableFilename($filename, $moduleName, $is_storage=false)

+    protected function getWritableFilename($filename, $moduleName, $is_storage = false)

     {

         $dir = $is_storage ? $this->getPath(storage_path('images/'.$moduleName)) : $this->getPath(public_path('images/'.$moduleName));

         $path = $dir.'/'.$filename;

         if (file_exists($path)) {

             $filename = pathinfo($path, PATHINFO_FILENAME);

-            $filename .= rand(0,9).'.'.pathinfo($path, PATHINFO_EXTENSION);

+            $filename .= rand(0, 9).'.'.pathinfo($path, PATHINFO_EXTENSION);

             return $this->getWritableFilename($filename, $moduleName, $is_storage); 

-        }else{

+        } else {

             return $is_storage ? $filename : $path;

         }

     }

@@ -137,7 +137,7 @@ 
 

         $file = array($field => $file);

 

-        $validator = Validator::make($file , [

+        $validator = Validator::make($file, [

             $field => $rules,

         ]);

 

Braces +4 added lines, -3 removed lines

@@ -116,15 +116,16 @@
             $filename = pathinfo($path, PATHINFO_FILENAME);

             $filename .= rand(0,9).'.'.pathinfo($path, PATHINFO_EXTENSION);

             return $this->getWritableFilename($filename, $moduleName, $is_storage); 

-        }else{

+        } else{

             return $is_storage ? $filename : $path;

         }

     }

 

     protected function getPath($path)

     {

-        if (!is_dir($path))

-            mkdir($path, 0755, true);

+        if (!is_dir($path)) {
+                    mkdir($path, 0755, true);
+        }
 

         return $path;

     }

src/resources/Helpers/laragen_helpers.php

Indentation +1 added lines, -1 removed lines

@@ -1,5 +1,5 @@
 <?php
-  /**
+    /**
      * Helper Functions for Lagaren
      * Autoloads via LaragenServiceProvider
      */

src/LaragenServiceProvider.php

Indentation +2 added lines, -2 removed lines

@@ -36,10 +36,10 @@
     public function register()
     {
         // Register Intervention Provider and Facade
-		$this->app->register(ImageServiceProvider::class);
+        $this->app->register(ImageServiceProvider::class);
         AliasLoader::getInstance()->alias('Image', Image::class);
         
-		$this->app->register("\App\Providers\LaragenRouteServiceProvider");
+        $this->app->register("\App\Providers\LaragenRouteServiceProvider");
 
         $this->app->bind('command.laragen:make', Generate::class);
 

src/Generators/Frontend/View.php

Spacing +6 added lines, -6 removed lines

@@ -12,23 +12,23 @@
 
         $generatedFiles = [];
         foreach ($viewsToBeGenerated as $view) {
-            $viewTemplate = $this->buildTemplate('frontend/views/' . $view, [
+            $viewTemplate = $this->buildTemplate('frontend/views/'.$view, [
                 '{{modelNameSingularLowercase}}' => $this->module->getModelNameLowercase(),
                 '{{modelNamePlural}}'            => $this->module->getModelNamePlural(),
                 '{{moduleName}}'                 => $this->module->getModuleName()
             ]);
 
-            $fullFilePath = $this->getPath("resources/views/" . $this->module->getModuleName()) . "/{$view}.blade.php";
+            $fullFilePath = $this->getPath("resources/views/".$this->module->getModuleName())."/{$view}.blade.php";
             file_put_contents($fullFilePath, $viewTemplate);
-            $generatedFiles[] =  $fullFilePath;
+            $generatedFiles[] = $fullFilePath;
         }
 
-        $layoutPath = $this->getPath("resources/views/laragen/layouts/") . "app.blade.php";
-        if(!file_exists($layoutPath)){
+        $layoutPath = $this->getPath("resources/views/laragen/layouts/")."app.blade.php";
+        if (!file_exists($layoutPath)) {
 
             $viewTemplate = $this->buildTemplate('frontend/views/layouts/app', []);
             file_put_contents($layoutPath, $viewTemplate);
-            $generatedFiles[] =  $layoutPath;
+            $generatedFiles[] = $layoutPath;
         }
 
         return $generatedFiles;

src/Generators/Backend/Request.php

Indentation +2 added lines, -2 removed lines

@@ -19,7 +19,7 @@ 
         $fullFilePath = $this->getPath("app/Http/Requests/Backend/").$this->module->getModelName()."Request".".php";

         file_put_contents($fullFilePath, $controllerTemplate);

         return $fullFilePath;

-	}

+    }

 	

     protected function getRules()

     {

@@ -53,5 +53,5 @@ 
         }

         $delimiter = ",\n{$columnOptions->getTabs(3)}";

         return (implode($delimiter, $validation));

-	}

+    }

 }

Spacing +6 added lines, -6 removed lines

@@ -24,10 +24,10 @@ 
     protected function getRules()

     {

         $validation = [];

-        $moduleData =$this->module->getData();

+        $moduleData = $this->module->getData();

         $modelname = $this->module->getModelNameLowercase();

 

-        foreach($moduleData as $column => $options){

+        foreach ($moduleData as $column => $options) {

             $columnOptions = new DataOption($column, $options);

             $type = $columnOptions->getType();

             $rules = $columnOptions->optionArray();

@@ -35,20 +35,20 @@ 
             $valid_types = ['text' => 'string',

                             'datetime'=> 'date_format:Y-m-d H:i:s',

             ];

-            if(array_key_exists($type, $valid_types)){

+            if (array_key_exists($type, $valid_types)) {

                 $type = $valid_types[$type];

             }

 

-            if(in_array($type, DataOption::$fileTypes) || in_array($type, DataOption::$specialTypes)) continue;

+            if (in_array($type, DataOption::$fileTypes) || in_array($type, DataOption::$specialTypes)) continue;

 

             $uniqueValidation = '\''.$column.'\' => ($this->route()->'.$modelname.') ? ';

             $uniqueValidation .= '\''.DataOption::COLUMN_UNIQUE.':'.$this->module->getModulename().','.$column.','.'\''.'.$this->route()->'.$modelname.'->id';

             $uniqueValidation .= ':\''.DataOption::COLUMN_UNIQUE.':'.$this->module->getModulename().'\'';

 

             if ($columnOptions->isUnique()) {

-                $validation[]= $uniqueValidation;

+                $validation[] = $uniqueValidation;

             } else {

-                $validation[]= empty($rules) ? "'".$column."' => '".$type."'": "'".$column."' => '".$type."|".implode('|',$rules)."'";

+                $validation[] = empty($rules) ? "'".$column."' => '".$type."'" : "'".$column."' => '".$type."|".implode('|', $rules)."'";

             }

         }

         $delimiter = ",\n{$columnOptions->getTabs(3)}";

Braces +3 added lines, -1 removed lines

@@ -39,7 +39,9 @@
                 $type = $valid_types[$type];

             }

 

-            if(in_array($type, DataOption::$fileTypes) || in_array($type, DataOption::$specialTypes)) continue;

+            if(in_array($type, DataOption::$fileTypes) || in_array($type, DataOption::$specialTypes)) {
+                continue;
+            }
 

             $uniqueValidation = '\''.$column.'\' => ($this->route()->'.$modelname.') ? ';

             $uniqueValidation .= '\''.DataOption::COLUMN_UNIQUE.':'.$this->module->getModulename().','.$column.','.'\''.'.$this->route()->'.$modelname.'->id';

src/Generators/Backend/Controller.php

Spacing +8 added lines, -8 removed lines

@@ -24,16 +24,16 @@ 
         return $fullFilePath;
     }
 
-    protected function getFileUploads(){
+    protected function getFileUploads() {
         $fileUploads = "";
         $fileFields = $this->module->getFileColumns();
-        if(empty($fileFields)) return "";
-        if(count($fileFields)>1){
+        if (empty($fileFields)) return "";
+        if (count($fileFields) > 1) {
             $fileUploads .= $this->buildTemplate('backend/fragments/upload-process', [
                 '{{modelNameLowercase}}' => $this->module->getModelNameLowercase(),
                 '{{fileFields}}'         => implode('", "', $fileFields),
             ]);
-        }else{
+        } else {
             $fileField = $fileFields[0];
             $fileUploads .= 'if ($request->has("'.$fileField.'")) {'.PHP_EOL;
             $fileUploads .= $this->getTabs(3).'$this->uploader->process($request->input("'.$fileField.'"), "category");'.PHP_EOL;
@@ -42,12 +42,12 @@ 
         return $fileUploads;
     }
 
-    protected function getForeignData(){
+    protected function getForeignData() {
         $foreignData = "";
         $parents = $this->module->getForeignData();
-        foreach($parents as $parent){
+        foreach ($parents as $parent) {
             $foreignData .= "'".$parent['parentModule']."' => ".$parent['parentModel']."::all()";
-            $foreignData .= ($parent==last($parents)) ? '' : ', ';
+            $foreignData .= ($parent == last($parents)) ? '' : ', ';
         }
         return $foreignData;
     }
@@ -70,7 +70,7 @@ 
     public function getFileExtentionData()
     {
         $controller_ = '';
-        foreach($this->module->getFileColumns('file') as $column){
+        foreach ($this->module->getFileColumns('file') as $column) {
             $controller_ = "$".$this->module->getModelNameLowercase()."['".$column."_extention'] =".' getFileExtention($'.$this->module->getModelNameLowercase()."->".$column.");";
         }
         return $controller_;

Braces +4 added lines, -2 removed lines

@@ -27,13 +27,15 @@
     protected function getFileUploads(){
         $fileUploads = "";
         $fileFields = $this->module->getFileColumns();
-        if(empty($fileFields)) return "";
+        if(empty($fileFields)) {
+            return "";
+        }
         if(count($fileFields)>1){
             $fileUploads .= $this->buildTemplate('backend/fragments/upload-process', [
                 '{{modelNameLowercase}}' => $this->module->getModelNameLowercase(),
                 '{{fileFields}}'         => implode('", "', $fileFields),
             ]);
-        }else{
+        } else{
             $fileField = $fileFields[0];
             $fileUploads .= 'if ($request->has("'.$fileField.'")) {'.PHP_EOL;
             $fileUploads .= $this->getTabs(3).'$this->uploader->process($request->input("'.$fileField.'"), "category");'.PHP_EOL;

src/Generators/Backend/View.php

Indentation +8 added lines, -8 removed lines

@@ -13,9 +13,9 @@ 
     public function generate()

     {

         

-		$viewsToBeGenerated = ['index', 'create', 'edit'];

+        $viewsToBeGenerated = ['index', 'create', 'edit'];

 

-		$generatedFiles = [];

+        $generatedFiles = [];

 		

         foreach ($viewsToBeGenerated as $view) {

             $viewTemplate = $this->buildTemplate('backend/views/' . $view, [

@@ -44,26 +44,26 @@ 
         $this->insertIntoFile(

             $mainMenuFile,

             '{{-- Main Menu --}}',

-			"\n".'<li class="nav-item dropdown">

+            "\n".'<li class="nav-item dropdown">

                     <a href="#" class="nav-link has-dropdown" data-toggle="dropdown"><i class="fas fa-columns"></i> <span> '.str_plural($this->module->getModelName()).' </span></a>

                     <ul class="dropdown-menu">

                         <li><a class="nav-link" href="{{ route("backend.'.$this->module->getModuleName().'.create") }}"> Add new '.str_plural($this->module->getModelName()).'</a></li>

                         <li><a class="nav-link" href="{{ route("backend.'.$this->module->getModuleName().'.index") }}">All '.str_plural($this->module->getModelName()).'</a></li>

                     </ul>

                 </li>'

-		);

+        );

         $generatedFiles = array_merge($generatedFiles, $this->formGenerateCreate());

         return $generatedFiles;

-	}

+    }

 

-	public function getHeadings(){

+    public function getHeadings(){

         $columns = $this->module->getBackendColumnTitles();

         $headings= "";

         foreach ($columns as $column) {

             $headings .= "<th>".$column."</th>";

         }

-		return $headings;

-	}

+        return $headings;

+    }

 

     public function formGenerateCreate()

     {

Spacing +11 added lines, -11 removed lines

@@ -18,7 +18,7 @@ 
 		$generatedFiles = [];

 		

         foreach ($viewsToBeGenerated as $view) {

-            $viewTemplate = $this->buildTemplate('backend/views/' . $view, [

+            $viewTemplate = $this->buildTemplate('backend/views/'.$view, [

                 '{{headings}}' 			 => $this->getHeadings(),

                 '{{moduleDisplayName}}'  => $this->module->getModuleDisplayName(),

                 '{{modelNameLowercase}}' => str_singular($this->module->getModuleName()),

@@ -26,14 +26,14 @@ 
                 '{{moduleName}}'         => $this->module->getModuleName()

             ]);

 

-            $fullFilePath = $this->getPath("resources/views/backend/" . $this->module->getModuleName()) . "/{$view}.blade.php";

+            $fullFilePath = $this->getPath("resources/views/backend/".$this->module->getModuleName())."/{$view}.blade.php";

             file_put_contents($fullFilePath, $viewTemplate);

-            $generatedFiles[] =  $fullFilePath;

+            $generatedFiles[] = $fullFilePath;

         }

 

         $mainMenuFile = $this->getPath("resources/views/backend/includes/")."main_menu.blade.php";

 

-        if(self::$initializeFlag++ == 0){

+        if (self::$initializeFlag++ == 0) {

             $this->initializeFiles([

                 $mainMenuFile => "backend/views/includes/main_menu",

             ]);

@@ -56,9 +56,9 @@ 
         return $generatedFiles;

 	}

 

-	public function getHeadings(){

+	public function getHeadings() {

         $columns = $this->module->getBackendColumnTitles();

-        $headings= "";

+        $headings = "";

         foreach ($columns as $column) {

             $headings .= "<th>".$column."</th>";

         }

@@ -68,7 +68,7 @@ 
     public function formGenerateCreate()

     {

         $viewTemplate = '';

-        foreach($this->module->getData() as $column => $options){

+        foreach ($this->module->getData() as $column => $options) {

             $columnOptions = new DataOption($column, $options);

             $type = $columnOptions->getType();

             $viewTemplate .= $this->buildTemplate('backend/views/formelements/'.$type, [

@@ -86,10 +86,10 @@ 
             '{{createElements}}'             => $viewTemplate,

         ]);

 

-        $formFilePath = $this->getPath("resources/views/backend/" . $this->module->getModuleName()) . "/_form.blade.php";

+        $formFilePath = $this->getPath("resources/views/backend/".$this->module->getModuleName())."/_form.blade.php";

         file_put_contents($formFilePath, $formTemplate);

 

-        $generatedFiles[] =  $formFilePath;

+        $generatedFiles[] = $formFilePath;

         return $generatedFiles;

 

     }

@@ -98,13 +98,13 @@ 
     {

         $modules = config('laragen.modules');

         $displayColumn = "";

-        if(isset($modules[$parentModule])){

+        if (isset($modules[$parentModule])) {

             $module = $modules[$parentModule];

             $module = new Module($parentModule, $module);

             $displayColumn = $module->getDisplayColumn();

         }

 

-        if  ($parentModule=='users'){

+        if ($parentModule == 'users') {

             $displayColumn = 'name';

         }

         return $displayColumn;

src/Generators/Common/Migration.php

Spacing +5 added lines, -5 removed lines

@@ -99,20 +99,20 @@ 
 
     protected function getMultipleSchema($multipleData)
     {
-        $schema =  '$table->bigInteger("'.$this->module->getModelNameLowercase().'_id")->unsigned()->nullable();'.PHP_EOL.$this->getTabs(3);
+        $schema = '$table->bigInteger("'.$this->module->getModelNameLowercase().'_id")->unsigned()->nullable();'.PHP_EOL.$this->getTabs(3);
         $schema .= "\$table->foreign('".$this->module->getModelNameLowercase()."_id')->references('id')->on('".$this->module->getModulename()."')->onDelete('set null');";
 
-        foreach($multipleData as $column => $optionString){
+        foreach ($multipleData as $column => $optionString) {
             $option = new DataOption($column, $optionString);
             $schema .= $option->getSchema();
-            $schema .=  ''.PHP_EOL.$this->getTabs(3);
+            $schema .= ''.PHP_EOL.$this->getTabs(3);
         }
         return $schema;
     }
 
     protected function getPivotSchema($related)
     {
-        $schema =  '$table->bigInteger("'.$this->module->getModelNameLowercase().'_id")->unsigned()->nullable();'.PHP_EOL.$this->getTabs(3);
+        $schema = '$table->bigInteger("'.$this->module->getModelNameLowercase().'_id")->unsigned()->nullable();'.PHP_EOL.$this->getTabs(3);
         $schema .= "\$table->foreign('".$this->module->getModelNameLowercase()."_id')->references('id')->on('".$this->module->getModulename()."')->onDelete('set null');";
 
         $schema .= '$table->bigInteger("'.str_singular($related).'_id")->unsigned()->nullable();';
@@ -123,7 +123,7 @@ 
 
     protected function getGallerySchema($gallery)
     {
-        $schema =  '$table->bigInteger("'.$this->module->getModelNameLowercase().'_id")->unsigned()->nullable();'.PHP_EOL.$this->getTabs(3);
+        $schema = '$table->bigInteger("'.$this->module->getModelNameLowercase().'_id")->unsigned()->nullable();'.PHP_EOL.$this->getTabs(3);
         $schema .= "\$table->foreign('".$this->module->getModelNameLowercase()."_id')->references('id')->on('".$this->module->getModulename()."')->onDelete('set null');";
         $schema .= '$table->string("filename", 128);';
         $schema .= '$table->timestamps();';

src/Generators/Common/Seeder.php

Spacing +10 added lines, -10 removed lines

@@ -23,7 +23,7 @@ 
         file_put_contents($fullFilePath, $factoryTemplate);
         $generatedFiles[] = $fullFilePath;
         
-        $laragenSeederFile = (self::$initializeFlag++ == 0) ? $this->initializeFile($this->getPath("database/seeds/")."LaragenSeeder.php", 'common/Seeder') :  $this->getPath("database/seeds/")."LaragenSeeder.php";
+        $laragenSeederFile = (self::$initializeFlag++ == 0) ? $this->initializeFile($this->getPath("database/seeds/")."LaragenSeeder.php", 'common/Seeder') : $this->getPath("database/seeds/")."LaragenSeeder.php";
 
         $this->insertIntoFile(
             $laragenSeederFile,
@@ -93,23 +93,23 @@ 
 
         $dataDefinition = "";
         foreach ($this->module->getWritableColumns() as $columns) {
-            foreach($columns as $column => $type){
+            foreach ($columns as $column => $type) {
                 $specialTypes = array_keys($specialTypesToDefinition);
-                if(in_array($column,$specialTypes)){
-                    $dataDefinition .= $this->getTabs(2) . "'{$column}'" . " => " . '$faker->' . $specialTypesToDefinition[$column];
+                if (in_array($column, $specialTypes)) {
+                    $dataDefinition .= $this->getTabs(2)."'{$column}'"." => ".'$faker->'.$specialTypesToDefinition[$column];
                 } else {
-                    $dataDefinition .= $this->getTabs(2) . "'{$column}'" . " => " . '$faker->' . $typeToDefinition[$type];
+                    $dataDefinition .= $this->getTabs(2)."'{$column}'"." => ".'$faker->'.$typeToDefinition[$type];
                 }
 
-                if($column != last($columns)) {
-                    $dataDefinition .= "," . PHP_EOL;
+                if ($column != last($columns)) {
+                    $dataDefinition .= ",".PHP_EOL;
                 }
             }
         }
         return $dataDefinition;
     }
 
-    protected function getForeignData(){
+    protected function getForeignData() {
         $columns = $this->module->getForeignColumns('parent');
 
         $foreignData = "";
@@ -121,8 +121,8 @@ 
                     '{{parentModel}}' => ucfirst(camel_case(str_singular($parent)))
                 ]);
                 
-                if($column != last($columns)) {
-                    $foreignData .= "," . PHP_EOL;
+                if ($column != last($columns)) {
+                    $foreignData .= ",".PHP_EOL;
                 }
             }
         }