prateekkarki / laragen

src/Models/Types/Relational/Multiple/MultipleDataType.php

Spacing +3 added lines, -3 removed lines

@@ -36,17 +36,17 @@
 

     public function getPivot()

     {

-        return $this->getParentModel() . $this->getChildModel();

+        return $this->getParentModel().$this->getChildModel();

     }

 

     public function getMigrationPivot()

     {

-        return $this->getParentModel() . Str::plural($this->getChildModel());

+        return $this->getParentModel().Str::plural($this->getChildModel());

     }

 

     public function getPivotTable()

     {

-        return $this->getParentModelLowercase(). "_" . strtolower(Str::plural($this->columnName));

+        return $this->getParentModelLowercase()."_".strtolower(Str::plural($this->columnName));

     }

 

     public function getPivotColumns()

src/Models/Types/Relational/Multiple/RelatedType.php

Indentation +1 added lines, -1 removed lines

@@ -8,7 +8,7 @@
 class RelatedType extends MultipleType

 {

     protected $hasPivot = true;

-	protected $formType = 'related';

+    protected $formType = 'related';

     protected $stubs = [

         'foreignMethod' => 'common/Models/fragments/belongsToMany'

     ];

Spacing +3 added lines, -3 removed lines

@@ -20,7 +20,7 @@ 
         $schema .= '$table->bigInteger("'.$this->getParentKey().'")->unsigned()->nullable();'.PHP_EOL.$this->getTabs(3);

         $schema .= '$table->foreign("'.$this->getParentKey().'")->references("id")->on("'.$moduleName.'")->onDelete("set null");'.PHP_EOL.$this->getTabs(3);

 

-        $schema .= '$table->bigInteger("'. $this->getChildKey() .'")->unsigned()->nullable();'.PHP_EOL.$this->getTabs(3);

+        $schema .= '$table->bigInteger("'.$this->getChildKey().'")->unsigned()->nullable();'.PHP_EOL.$this->getTabs(3);

         $schema .= '$table->foreign("'.$this->getChildKey().'")->references("id")->on("'.$this->typeOption.'")->onDelete("set null");'.PHP_EOL;

 

         return $schema;

@@ -43,7 +43,7 @@ 
 

     public function getChildKey()

     {

-        return Str::singular($this->columnName) ."_id";

+        return Str::singular($this->columnName)."_id";

     }

 

     public function getChildModel()

@@ -89,6 +89,6 @@ 
 

     public function getTypeColumns()

     {

-        return [$this->getParentModelLowercase().'_id', strtolower(Str::singular($this->typeOption)) . '_id'];

+        return [$this->getParentModelLowercase().'_id', strtolower(Str::singular($this->typeOption)).'_id'];

     }

 }

src/Models/Types/Relational/SingleType.php

Indentation +1 added lines, -1 removed lines

@@ -8,7 +8,7 @@
     protected $hasSingleRelation = true;

     protected $size = false;

     protected $relationalType = false;

-	protected $formType = 'parent';

+    protected $formType = 'parent';

     

     protected $stubs = [

         'modelMethod' => 'common/Models/fragments/hasOne',

Spacing +2 added lines, -2 removed lines

@@ -20,13 +20,13 @@
         return 'exists:'.$this->getRelatedModule().',id';

     }

 

-    public function hasSelfParent(){

+    public function hasSelfParent() {

         return ($this->typeOption == $this->getParentModule() || $this->typeOption == "self");

     }

 

     public function getColumnKey()

     {

-        return $this->columnName . "_id";

+        return $this->columnName."_id";

     }

 

 }

src/Generators/Common/Route.php

Spacing +3 added lines, -3 removed lines

@@ -26,7 +26,7 @@ 
             ]);

         }

 

-        if(app('laragen')->generatorExists('Frontend\\Controller')){

+        if (app('laragen')->generatorExists('Frontend\\Controller')) {

             $this->insertIntoFile(

                 $webRouteFile,

                 "<?php\n",

@@ -41,7 +41,7 @@ 
             $generatedFiles[] = $webRouteFile;

         }

         

-        if(app('laragen')->generatorExists('Backend\\Controller')){

+        if (app('laragen')->generatorExists('Backend\\Controller')) {

             $this->insertIntoFile(

                 $backendWebRouteFile,

                 "<?php\n",

@@ -56,7 +56,7 @@ 
             $generatedFiles[] = $backendWebRouteFile;

         }

         

-        if(app('laragen')->generatorExists('Backend\\Api')){

+        if (app('laragen')->generatorExists('Backend\\Api')) {

             $this->insertIntoFile(

                 $backendApiRouteFile,

                 "<?php\n",

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

Braces +3 added lines, -2 removed lines

@@ -16,8 +16,9 @@
 
             foreach ($existingMigrationFiles as $file) {
                 $file = database_path("migrations/laragen") . "/" . $file;
-                if (is_file($file))
-                    unlink($file);
+                if (is_file($file)) {
+                                    unlink($file);
+                }
             }
         }
 

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
             );
         }

Braces +3 added lines, -1 removed lines

@@ -147,7 +147,9 @@
         $foreignData = "";
 
         foreach($types as $type){
-            if($type->hasSelfParent()) continue;
+            if($type->hasSelfParent()) {
+                continue;
+            }
             $foreignData .= $this->buildTemplate('common/Factories/fragments/options', [
                 '{{parent}}'      => $type->getColumnKey(),
                 '{{parentModel}}' => $type->getRelatedModel()

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;

Braces +9 added lines, -3 removed lines

@@ -29,7 +29,9 @@ 
         $relatedUpdates = "";
         $relatedTypes = $this->module->getFilteredColumns(['hasPivot']);
         
-        if (empty($relatedTypes)) return "";
+        if (empty($relatedTypes)) {
+            return "";
+        }
         if (count($relatedTypes) > 1) {
             $relatedUpdates .= $this->buildTemplate('backend/fragments/related-create', [
                 '{{modelNameLowercase}}' => $this->module->getModelNameLowercase(),
@@ -47,7 +49,9 @@ 
     protected function getRelatedUpdates() {
         $relatedUpdates = "";
         $relatedTypes = $this->module->getFilteredColumns(['hasPivot']);
-        if (empty($relatedTypes)) return "";
+        if (empty($relatedTypes)) {
+            return "";
+        }
         if (count($relatedTypes) > 1) {
             $relatedUpdates .= $this->buildTemplate('backend/fragments/related-process', [
                 '{{modelNameLowercase}}' => $this->module->getModelNameLowercase(),
@@ -65,7 +69,9 @@ 
     protected function getFileUploads() {
         $fileUploads = "";
         $fileFields = $this->module->getFilteredColumns(['hasFile']);
-        if (empty($fileFields)) return "";
+        if (empty($fileFields)) {
+            return "";
+        }
         if (count($fileFields) > 1) {
             $fileUploads .= $this->buildTemplate('backend/fragments/upload-process', [
                 '{{modelNameLowercase}}' => $this->module->getModelNameLowercase(),