prateekkarki / laragen

src/Generators/Common/Model.php

Spacing +6 added lines, -6 removed lines

@@ -21,7 +21,7 @@ 
         file_put_contents($fullFilePath, $modelTemplate);
         $generatedFiles[] = $fullFilePath;
         
-        foreach($this->module->getFilteredColumns('hasPivot') as $type){
+        foreach ($this->module->getFilteredColumns('hasPivot') as $type) {
             $typeTemplate = $this->buildTemplate('common/Models/Pivot', [
                 '{{pivotName}}'       => $type->getPivot(),
                 '{{massAssignables}}' => implode("', '", $type->getTypeColumns()),
@@ -32,7 +32,7 @@ 
             $generatedFiles[] = $fullFilePath;
         }
         
-        foreach($this->module->getFilteredColumns(['hasModel', 'hasOptions']) as $type){
+        foreach ($this->module->getFilteredColumns(['hasModel', 'hasOptions']) as $type) {
             $pivotModel = Str::singular($type->getPivot());
             $typeTemplate = $this->buildTemplate('common/Models/Model', [
                 '{{modelName}}'       => $pivotModel,
@@ -66,10 +66,10 @@ 
     protected function getUsedModels($pivotModel = false) {
         $usedModels = "";
         $classes = [];
-        foreach($this->module->getFilteredColumns(['hasSingleRelation', 'hasPivot', 'hasModel']) as $type){
+        foreach ($this->module->getFilteredColumns(['hasSingleRelation', 'hasPivot', 'hasModel']) as $type) {
             $model = $type->getRelatedModel();
             $class = ($model == 'User') ? config('laragen.options.user_model') : "App\\Models\\".$model;
-            if(in_array($class, $classes) || $model == $this->module->getModelName() || $model == $pivotModel){
+            if (in_array($class, $classes) || $model == $this->module->getModelName() || $model == $pivotModel) {
                 continue;
             }
             $classes[] = $class;
@@ -81,7 +81,7 @@ 
     protected function getForeignMethods()
     {
         $foreignMethods = "";
-        foreach($this->module->getFilteredColumns(['hasPivot', 'hasSingleRelation', 'hasModel']) as $type){
+        foreach ($this->module->getFilteredColumns(['hasPivot', 'hasSingleRelation', 'hasModel']) as $type) {
             $stub = $type->getStub('foreignMethod') ?: 'common/Models/fragments/hasOne';
             $foreignMethods .= $this->buildTemplate($stub, [
                 '{{columnName}}'   => $type->getColumn(),
@@ -89,7 +89,7 @@ 
                 '{{relatedModel}}' => $type->getRelatedModel(),
                 '{{table}}'        => $type->getPivotTable(),
                 '{{parentModel}}' => $type->getParentModel(),
-                '{{parentId}}'     => $type->getParentModelLowercase() . "_id",
+                '{{parentId}}'     => $type->getParentModelLowercase()."_id",
                 '{{childId}}'      => $type->getChildKey(),
             ]);
         }

src/Generators/Common/Migration.php

Spacing +5 added lines, -5 removed lines

@@ -11,11 +11,11 @@ 
 
     public function generate()
     {
-        if(self::$counter==0){
+        if (self::$counter == 0) {
             $existingMigrationFiles = is_dir(database_path('migrations/laragen/')) ? scandir(database_path('migrations/laragen/')) : [];
 
             foreach ($existingMigrationFiles as $file) {
-                $file = database_path("migrations/laragen") . "/" . $file;
+                $file = database_path("migrations/laragen")."/".$file;
                 if (is_file($file))
                     unlink($file);
             }
@@ -23,7 +23,7 @@ 
 
         $generatedFiles = [];
 
-        foreach($this->module->getFilteredColumns('needsTableInit') as $type){
+        foreach ($this->module->getFilteredColumns('needsTableInit') as $type) {
             $migrationTemplate = $this->buildTemplate('common/migrations/pivot', [
                 '{{pivotName}}'        => $type->getMigrationPivot(),
                 '{{pivotTableName}}'   => $type->getPivotTable(),
@@ -46,7 +46,7 @@ 
         file_put_contents($fullFilePath, $migrationTemplate);
         $generatedFiles[] = $fullFilePath;
         
-        foreach($this->module->getFilteredColumns(['hasPivot']) as $type){
+        foreach ($this->module->getFilteredColumns(['hasPivot']) as $type) {
             $migrationTemplate = $this->buildTemplate('common/migrations/pivot', [
                 '{{pivotName}}'        => $type->getMigrationPivot(),
                 '{{pivotTableName}}'   => $type->getPivotTable(),
@@ -73,7 +73,7 @@ 
     {
         $fileCounter = sprintf('%06d', (int) date('His') + ++self::$counter);
         $filenamePrefix = date('Y_m_d_').$fileCounter."_";
-        $fileName = "create_". $related->getPivotTable()."_table.php";
+        $fileName = "create_".$related->getPivotTable()."_table.php";
 
         return $this->getPath("database/migrations/laragen/").$filenamePrefix.$fileName;
     }

src/Generators/Common/Seeder.php

Spacing +17 added lines, -18 removed lines

@@ -46,7 +46,7 @@ 
     {
         $generatedFiles = [];
 
-        if($this::$initializeFlag == 0){
+        if ($this::$initializeFlag == 0) {
             $laragen = app('laragen');
             $modules = $laragen->getModules();
             $permissions = [];
@@ -67,7 +67,7 @@ 
 
             $permissionsCode = '';
             foreach ($allPermissions as $permission) {
-                $permissionsCode .= "Permission::create(['name' => '". $permission ."']);" . PHP_EOL. $this->getTabs(2);
+                $permissionsCode .= "Permission::create(['name' => '".$permission."']);".PHP_EOL.$this->getTabs(2);
 
             }
 
@@ -93,7 +93,7 @@ 
         file_put_contents($fullFilePath, $factoryTemplate);
         $generatedFiles[] = $fullFilePath;
 
-        foreach($this->module->getFilteredColumns(['hasPivot']) as $type){
+        foreach ($this->module->getFilteredColumns(['hasPivot']) as $type) {
             $typeTemplate = $this->buildTemplate('common/Factories/Factory', [
                 '{{modelName}}'      => $type->getPivot(),
                 '{{usedModels}}'     => $this->getUsedModels($type->getFilteredColumns('hasSingleRelation'), $type->getPivot()),
@@ -118,10 +118,10 @@ 
 
         $classes = [$model];
 
-        foreach($types as $type){
+        foreach ($types as $type) {
             $model = $type->getRelatedModel();
             $class = ($model == 'User') ? config('laragen.options.user_model') : "App\\Models\\".$model;
-            if(in_array($class, $classes)){
+            if (in_array($class, $classes)) {
                 continue;
             }
             $classes[] = $class;
@@ -136,8 +136,7 @@ 
         foreach ($columns as $type) {
             $specialTypes = array_keys($this->specialTypesToDefinition);
             $dataDefinition .= in_array($type->getColumn(), $specialTypes) ? 
-                $this->getTabs(2)."'{$type->getColumn()}'"." => ".'$faker->'.$this->specialTypesToDefinition[$type->getColumn()] : 
-                $this->getTabs(2)."'{$type->getColumn()}'"." => ".'$faker->'.$this->typeToDefinition[$type->getDataType()];
+                $this->getTabs(2)."'{$type->getColumn()}'"." => ".'$faker->'.$this->specialTypesToDefinition[$type->getColumn()] : $this->getTabs(2)."'{$type->getColumn()}'"." => ".'$faker->'.$this->typeToDefinition[$type->getDataType()];
             $dataDefinition .= ",".PHP_EOL;
         }
         return $dataDefinition;
@@ -146,8 +145,8 @@ 
     protected function getForeignData($types) {
         $foreignData = "";
 
-        foreach($types as $type){
-            if($type->hasSelfParent()) continue;
+        foreach ($types as $type) {
+            if ($type->hasSelfParent()) continue;
             $foreignData .= $this->buildTemplate('common/Factories/fragments/options', [
                 '{{parent}}'      => $type->getColumnKey(),
                 '{{parentModel}}' => $type->getRelatedModel()
@@ -174,7 +173,7 @@ 
             false
         );
 
-        foreach($this->module->getFilteredColumns(['needsTableInit']) as $type){
+        foreach ($this->module->getFilteredColumns(['needsTableInit']) as $type) {
             
             $this->insertIntoFile(
                 $laragenSeederFile,
@@ -183,14 +182,14 @@ 
                 false
             );
 
-            $seedData = PHP_EOL.$this->getTabs(2). "if(".$type->getPivot()."::all()->count()==0){";
-            $seedData .= PHP_EOL.$this->getTabs(3). "DB::table('".$type->getPivotTable()."')->insert([";
-            foreach($type->getDbData() as $title){
+            $seedData = PHP_EOL.$this->getTabs(2)."if(".$type->getPivot()."::all()->count()==0){";
+            $seedData .= PHP_EOL.$this->getTabs(3)."DB::table('".$type->getPivotTable()."')->insert([";
+            foreach ($type->getDbData() as $title) {
                 $seedData .= PHP_EOL.$this->getTabs(4);
-                $seedData .= "['title' => '" . $title . "'],";
+                $seedData .= "['title' => '".$title."'],";
             }
-            $seedData .=  PHP_EOL.$this->getTabs(3). "]);";
-            $seedData .=  PHP_EOL.$this->getTabs(2). "}";
+            $seedData .= PHP_EOL.$this->getTabs(3)."]);";
+            $seedData .= PHP_EOL.$this->getTabs(2)."}";
 
             $this->insertIntoFile(
                 $laragenSeederFile,
@@ -199,7 +198,7 @@ 
             );
         }
 
-        foreach($this->module->getFilteredColumns(['hasPivot']) as $type){
+        foreach ($this->module->getFilteredColumns(['hasPivot']) as $type) {
             
             $this->insertIntoFile(
                 $laragenSeederFile,
@@ -211,7 +210,7 @@ 
             $this->insertIntoFile(
                 $laragenSeederFile,
                 "\n        // End factories",
-                "\n".$this->getTabs(2)."factory(".$type->getPivot()."::class, ".(int)config('laragen.options.seed_rows') * 2 .")->create();",
+                "\n".$this->getTabs(2)."factory(".$type->getPivot()."::class, ".(int) config('laragen.options.seed_rows') * 2.")->create();",
                 false
             );
         }

src/Generators/BaseGenerator.php

Spacing +1 added lines, -1 removed lines

@@ -63,7 +63,7 @@
     }
 
     public function getCleanPath($file) {
-        return realpath(dirname($file)) . DIRECTORY_SEPARATOR . basename($file);
+        return realpath(dirname($file)).DIRECTORY_SEPARATOR.basename($file);
     }
 
     public function initializeFiles($fileMaps = []) {

src/Generators/Backend/Api.php

Spacing +4 added lines, -4 removed lines

@@ -82,11 +82,11 @@ 
 
     protected function getForeignData() {
         $foreignData = "";
-        $parents = $this->module->getFilteredColumns(['hasPivot','hasSingleRelation']);
+        $parents = $this->module->getFilteredColumns(['hasPivot', 'hasSingleRelation']);
         $columns = [];
         foreach ($parents as $type) {
             $column = $type->getRelatedModule();
-            if(!in_array($column, $columns)){
+            if (!in_array($column, $columns)) {
                 $foreignData .= "'".$column."' => ".$type->getRelatedModel()."::all(),".PHP_EOL.$this->getTabs(3);
                 $columns[] = $column;
             }
@@ -99,10 +99,10 @@ 
         $usedModels = "use ".$namespace.$this->module->getModelName().";";
 
         $classes = [$namespace.$this->module->getModelName()];
-        foreach($this->module->getFilteredColumns(['hasSingleRelation', 'hasPivot', 'hasModel']) as $type){
+        foreach ($this->module->getFilteredColumns(['hasSingleRelation', 'hasPivot', 'hasModel']) as $type) {
             $model = $type->getRelatedModel();
             $class = ($model == 'User') ? config('laragen.options.user_model') : "App\\Models\\".$model;
-            if(in_array($class, $classes)){
+            if (in_array($class, $classes)) {
                 continue;
             }
             $classes[] = $class;

src/Generators/Backend/Controller.php

Spacing +5 added lines, -5 removed lines

@@ -75,7 +75,7 @@ 
                 $fileUploads .= $this->getTabs(3).'}'.PHP_EOL;
                 $fileUploads .= $this->getTabs(3).'$'.$this->module->getModelNameLowercase().'->'.$fileField->getColumn().'()->saveMany($'.$fileField->getColumn().');'.PHP_EOL;
 
-            }else{
+            } else {
                 $fileUploads .= $this->getTabs(3).'$uploadData = $this->uploader->'.$processMethod.'($request->input("'.$fileField->getColumn().'"), "'.$this->module->getModelNameLowercase().'");'.PHP_EOL;
                 $fileUploads .= $this->getTabs(3).'if (empty($uploadData["errors"])) {'.PHP_EOL;
                 $fileUploads .= $this->getTabs(4).'$updateData["'.$fileField->getColumn().'"] = $uploadData["filename"];'.PHP_EOL;
@@ -88,11 +88,11 @@ 
 
     protected function getForeignData() {
         $foreignData = "";
-        $parents = $this->module->getFilteredColumns(['hasPivot','hasSingleRelation']);
+        $parents = $this->module->getFilteredColumns(['hasPivot', 'hasSingleRelation']);
         $columns = [];
         foreach ($parents as $type) {
             $column = $type->getRelatedModule();
-            if(!in_array($column, $columns)){
+            if (!in_array($column, $columns)) {
                 $foreignData .= "'".$column."' => ".$type->getRelatedModel()."::all(),".PHP_EOL.$this->getTabs(3);
                 $columns[] = $column;
             }
@@ -105,10 +105,10 @@ 
         $usedModels = "use ".$namespace.$this->module->getModelName().";";
 
         $classes = [$namespace.$this->module->getModelName()];
-        foreach($this->module->getFilteredColumns(['hasSingleRelation', 'hasPivot', 'hasModel']) as $type){
+        foreach ($this->module->getFilteredColumns(['hasSingleRelation', 'hasPivot', 'hasModel']) as $type) {
             $model = $type->getRelatedModel();
             $class = ($model == 'User') ? config('laragen.options.user_model') : "App\\Models\\".$model;
-            if(in_array($class, $classes)){
+            if (in_array($class, $classes)) {
                 continue;
             }
             $classes[] = $class;

src/Generators/Backend/Observer.php

Spacing +5 added lines, -5 removed lines

@@ -9,9 +9,9 @@ 
     protected static $initializeFlag = 0;
     public function generate()
     {   
-        $generatedFiles=[]; 
+        $generatedFiles = []; 
         
-        if($this::$initializeFlag == 0){
+        if ($this::$initializeFlag == 0) {
             $laragen = app('laragen');
             $modules = $laragen->getModules();
             $models = [];
@@ -22,9 +22,9 @@ 
             $modelsCode = '';
             $usedClasses = '';
             foreach ($models as $model) {
-                $modelsCode .= $model ."::observe(". $model ."Observer::class);" . PHP_EOL. $this->getTabs(2);
-                $usedClasses .= "use App\Observers\\". $model . "Observer;" . PHP_EOL;
-                $usedClasses .= "use App\Models\\". $model . ";" . PHP_EOL;
+                $modelsCode .= $model."::observe(".$model."Observer::class);".PHP_EOL.$this->getTabs(2);
+                $usedClasses .= "use App\Observers\\".$model."Observer;".PHP_EOL;
+                $usedClasses .= "use App\Models\\".$model.";".PHP_EOL;
             }
 
             $observerProviderTemplate = $this->buildTemplate('common/LaragenObserverServiceProvider', [

src/Generators/Backend/View.php

Spacing +15 added lines, -16 removed lines

@@ -61,10 +61,9 @@ 
         foreach ($columns as $column) {

             $headings .= 

                 $simple ? 

-                "<th>" . $column->getDisplay() . "</th>" : 

-                "<th> 

-                    <a href=\"{{ route('backend." . $this->module->getModuleName() . ".index') }}?sort=" . $column->getColumn() . "&sort_dir={{ request()->input('sort_dir')=='asc' ? 'desc' : 'asc' }}\">" . $column->getDisplay() . " 

-                        @if(request()->input('sort')=='" . $column->getColumn() . "')

+                "<th>".$column->getDisplay()."</th>" : "<th> 

+                    <a href=\"{{ route('backend." . $this->module->getModuleName().".index') }}?sort=".$column->getColumn()."&sort_dir={{ request()->input('sort_dir')=='asc' ? 'desc' : 'asc' }}\">".$column->getDisplay()." 

+                        @if(request()->input('sort')=='" . $column->getColumn()."')

                             {!! request()->input('sort_dir')=='asc' ? '<i class=\"fas fa-arrow-down\"></i>' : '<i class=\"fas fa-arrow-up\"></i>' !!}

                         @endif

                     </a>

@@ -78,11 +77,11 @@ 
         $tabs = $this->module->getTabTitles();

         $data = "";

         foreach ($tabs as $key => $tab) {

-            $activeClass = ($key==0) ? 'active' : '';

+            $activeClass = ($key == 0) ? 'active' : '';

             $data .= '<li class="nav-item">'.PHP_EOL.$this->getTabs(7);

-            $data .= '<a class="nav-link '. $activeClass .'" id="base-tab'.$key.'" data-toggle="tab" aria-controls="tab'.$key.'" href="#tab'.$key.'" aria-expanded="true">'.$tab. '</a>' . PHP_EOL . $this->getTabs(6);

+            $data .= '<a class="nav-link '.$activeClass.'" id="base-tab'.$key.'" data-toggle="tab" aria-controls="tab'.$key.'" href="#tab'.$key.'" aria-expanded="true">'.$tab.'</a>'.PHP_EOL.$this->getTabs(6);

             $data .= '</li>';

-            $data .= ($tab!==last($tabs)) ? PHP_EOL . $this->getTabs(6) : '';

+            $data .= ($tab !== last($tabs)) ? PHP_EOL . $this->getTabs(6) : '';

         }

         return $data;

     }

@@ -92,7 +91,7 @@ 
         $columns = $module->getDisplayColumns();

         $data = "";

         foreach ($columns as $column) {

-            $data .= "<td> {{ $" . $model . "->" . $column->getColumn() . " }}</td>" . PHP_EOL;

+            $data .= "<td> {{ $".$model."->".$column->getColumn()." }}</td>".PHP_EOL;

         }

         return $data;

     }

@@ -104,7 +103,7 @@ 
             $relatedModule = app('laragen')->getModule(Str::plural(strtolower(Str::snake($type->getRelatedModel()))));

             $displayColumn = $relatedModule->getDisplayColumns()[0]->getColumn();

         }

-        $formElement = $this->buildTemplate('backend/views/formelements/' . $page . '/' . $type->getFormType(), [

+        $formElement = $this->buildTemplate('backend/views/formelements/'.$page.'/'.$type->getFormType(), [

             '{{key}}'                       => $type->getColumnKey(),

             '{{column}}'                    => $type->getColumn(),

             '{{label}}'                     => $type->getDisplay(),

@@ -115,7 +114,7 @@ 
             '{{modelNameLowercase}}'        => $this->module->getModelNameLowercase(),

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

         ]);

-        return  "@if(auth()->user()->can('view_".$this->module->getModuleName()."_".$type->getColumnKey()."') || auth()->user()->can('edit_".$this->module->getModuleName()."_".$type->getColumnKey()."') )" . PHP_EOL . $formElement . PHP_EOL . "@endif" . PHP_EOL . PHP_EOL;

+        return  "@if(auth()->user()->can('view_".$this->module->getModuleName()."_".$type->getColumnKey()."') || auth()->user()->can('edit_".$this->module->getModuleName()."_".$type->getColumnKey()."') )".PHP_EOL.$formElement.PHP_EOL."@endif".PHP_EOL.PHP_EOL;

     }

 

 

@@ -124,7 +123,7 @@ 
         $displayColumn = $type->getRelatedModule() == 'users' ? 'name' : 'title';

         $relatedModule = app('laragen')->getModule($this->module->getModelNameLowercase()."_".$type->getColumn());

         $displayColumn = $relatedModule->getDisplayColumns()[0]->getColumn();

-        $formElement = $this->buildTemplate('backend/views/formelements/' . $page . '/' . $type->getFormType(), [

+        $formElement = $this->buildTemplate('backend/views/formelements/'.$page.'/'.$type->getFormType(), [

             '{{key}}'                       => $type->getColumn(),

             '{{label}}'                     => $type->getDisplay(),

             '{{relatedModule}}'             => $type->getRelatedModule(),

@@ -134,7 +133,7 @@ 
             '{{relatedModelDisplayColumn}}' => $displayColumn,

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

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

-        ]) . PHP_EOL;

+        ]).PHP_EOL;

         return $formElement;

     }

 

@@ -143,7 +142,7 @@ 
         if (!in_array($page, ['create', 'edit'])) return "";

         $tabs = $this->module->getTabs();

         $tabTitles = $this->module->getTabTitles();

-        $viewTemplate ='<div class="tab-content px-1 pt-1">'.PHP_EOL;

+        $viewTemplate = '<div class="tab-content px-1 pt-1">'.PHP_EOL;

         foreach ($tabs as $key => $tab) {

             $activeClass = ($key == 0) ? 'active' : '';

             $viewTemplate .= $this->getTabs(6).'<div role="tabpanel" class="tab-pane '.$activeClass.'" id="tab'.$key.'" aria-expanded="true" aria-labelledby="base-tab'.$key.'">'.PHP_EOL;

@@ -152,17 +151,17 @@ 
 

 

             $typeTemplate = "";

-            if(is_string($tab)&&!in_array($tab, ['hasFile', 'hasImage', 'Seo'])){

+            if (is_string($tab) && !in_array($tab, ['hasFile', 'hasImage', 'Seo'])) {

                 $types = $this->module->getColumnsData();

                 $type = $types[Str::plural(strtolower(Str::snake($tab)))];

                 $typeTemplate .= $this->buildMultiple($page, $type);

-            }else{

+            } else {

                 foreach ($this->module->getFilteredColumns($tab) as $type) {

                     $typeTemplate .= $this->buildFormElement($page, $type);

                 }

             }

             

-            $viewTemplate .= $this->getTabs(9)."@include('backend.".$this->module->getModuleName().".".$page.".form_parts.". strtolower(Str::title($tabTitles[$key])) ."')".PHP_EOL;

+            $viewTemplate .= $this->getTabs(9)."@include('backend.".$this->module->getModuleName().".".$page.".form_parts.".strtolower(Str::title($tabTitles[$key]))."')".PHP_EOL;

             

             $fullFilePath = $this->getPath("resources/views/backend/".$this->module->getModuleName()."/".$page."/form_parts/").strtolower(Str::title($tabTitles[$key])).".blade.php";

             file_put_contents($fullFilePath, $typeTemplate);

src/Generators/Backend/Request.php

Spacing +2 added lines, -2 removed lines

@@ -25,8 +25,8 @@
     protected function getRules()

     {

         $validation = [];

-        foreach($this->module->getColumns(true) as $column){

-            $validation[] =  "'{$column->getColumnKey()}'" . " => " .  $column->getValidationLine();

+        foreach ($this->module->getColumns(true) as $column) {

+            $validation[] = "'{$column->getColumnKey()}'"." => ".$column->getValidationLine();

         }

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

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