feat: private function refactored to protected for extendability

mitulgolakiya · mitulgolakiya · commit a899872989af · 2022-07-24T16:16:43.000+05:30
diff --git a/src/Commands/BaseCommand.php b/src/Commands/BaseCommand.php
@@ -197,7 +197,7 @@ public function performPostActionsWithMigration()
         $this->performPostActions(true);
     }
 
-    private function saveSchemaFile()
+    protected function saveSchemaFile()
     {
         $fileFields = [];
 
@@ -235,7 +235,7 @@ private function saveSchemaFile()
         $this->info($fileName);
     }
 
-    private function saveLocaleFile()
+    protected function saveLocaleFile()
     {
         $locales = [
             'singular' => $this->config->modelNames->name,
@@ -333,7 +333,7 @@ public function getFields()
         $this->getFieldsFromConsole();
     }
 
-    private function getFieldsFromConsole()
+    protected function getFieldsFromConsole()
     {
         $this->info('Specify fields for the model (skip id & timestamp fields, we will add it automatically)');
         $this->info('Read docs carefully to specify field inputs)');
@@ -406,7 +406,7 @@ private function addTimestamps()
         $this->config->fields[] = $updatedAt;
     }
 
-    private function parseFieldsFromJsonFile()
+    protected function parseFieldsFromJsonFile()
     {
         $fieldsFileValue = $this->option('fieldsFile');
         if (file_exists($fieldsFileValue)) {
@@ -438,7 +438,7 @@ private function parseFieldsFromJsonFile()
         }
     }
 
-    private function parseFieldsFromGUI()
+    protected function parseFieldsFromGUI()
     {
         $fileContents = $this->option('jsonFromGUI');
         $jsonData = json_decode($fileContents, true);
@@ -471,7 +471,7 @@ private function parseFieldsFromGUI()
         }
     }
 
-    private function parseFieldsFromTable()
+    protected function parseFieldsFromTable()
     {
         $tableName = $this->config->tableName;
 
diff --git a/src/Common/GeneratorField.php b/src/Common/GeneratorField.php
@@ -109,7 +109,7 @@ public function parseOptions(string $options)
         }
     }
 
-    private function prepareMigrationText()
+    protected function prepareMigrationText()
     {
         $this->migrationText = '$table->';
         $this->migrationText .= $this->dbType."('".$this->name."'";
diff --git a/src/Common/GeneratorFieldRelation.php b/src/Common/GeneratorFieldRelation.php
@@ -76,7 +76,7 @@ public function getRelationFunctionText(string $relationText = null): string
         return '';
     }
 
-    private function generateRelation($functionName, $relation, $relationClass)
+    protected function generateRelation($functionName, $relation, $relationClass)
     {
         $inputs = $this->inputs;
         $relatedModelName = array_shift($inputs);
diff --git a/src/Generators/API/APIControllerGenerator.php b/src/Generators/API/APIControllerGenerator.php
@@ -49,7 +49,7 @@ public function generate()
         $this->config->commandInfo($this->fileName);
     }
 
-    private function docsVariables(): array
+    protected function docsVariables(): array
     {
         $methods = ['controller', 'index', 'store', 'show', 'update', 'destroy'];
 
diff --git a/src/Generators/API/APIRequestGenerator.php b/src/Generators/API/APIRequestGenerator.php
@@ -26,7 +26,7 @@ public function generate()
         $this->generateUpdateRequest();
     }
 
-    private function generateCreateRequest()
+    protected function generateCreateRequest()
     {
         $templateData = view('laravel-generator::api.request.create', $this->variables())->render();
 
@@ -36,7 +36,7 @@ private function generateCreateRequest()
         $this->config->commandInfo($this->createFileName);
     }
 
-    private function generateUpdateRequest()
+    protected function generateUpdateRequest()
     {
         $modelGenerator = app(ModelGenerator::class);
         $rules = $modelGenerator->generateUniqueRules();
diff --git a/src/Generators/API/APIResourceGenerator.php b/src/Generators/API/APIResourceGenerator.php
@@ -33,7 +33,7 @@ public function generate()
         $this->config->commandInfo($this->fileName);
     }
 
-    private function generateResourceFields(): array
+    protected function generateResourceFields(): array
     {
         $resourceFields = [];
         foreach ($this->config->fields as $field) {
diff --git a/src/Generators/FactoryGenerator.php b/src/Generators/FactoryGenerator.php
@@ -62,7 +62,7 @@ public function generate()
         $this->config->commandInfo($this->fileName);
     }
 
-    private function generateFields(): string
+    protected function generateFields(): string
     {
         $fields = [];
 
diff --git a/src/Generators/MigrationGenerator.php b/src/Generators/MigrationGenerator.php
@@ -34,7 +34,7 @@ public function variables(): array
         ];
     }
 
-    private function generateFields(): string
+    protected function generateFields(): string
     {
         $fields = [];
         $foreignKeys = [];
diff --git a/src/Generators/ModelGenerator.php b/src/Generators/ModelGenerator.php
@@ -114,7 +114,7 @@ protected function generateFillables(): array
         return $fillables;
     }
 
-    private function fillDocs(): string
+    protected function fillDocs(): string
     {
         if (!$this->config->options->swagger) {
             return '';
@@ -145,7 +145,7 @@ public function generateSwagger(): string
         ]);
     }
 
-    private function generateRequiredFields(): array
+    protected function generateRequiredFields(): array
     {
         $requiredFields = [];
 
@@ -162,7 +162,7 @@ private function generateRequiredFields(): array
         return $requiredFields;
     }
 
-    private function generateRules(): array
+    protected function generateRules(): array
     {
         $dont_require_fields = config('laravel_generator.options.hidden_fields', [])
                 + config('laravel_generator.options.excluded_fields', $this->excluded_fields);
@@ -309,7 +309,7 @@ public function generateCasts(): array
         return $casts;
     }
 
-    private function generateRelations(): string
+    protected function generateRelations(): string
     {
         $relations = [];
 
diff --git a/src/Generators/Scaffold/ControllerGenerator.php b/src/Generators/Scaffold/ControllerGenerator.php
@@ -65,7 +65,7 @@ public function generate()
         $this->config->commandInfo($this->fileName);
     }
 
-    private function generateDataTable()
+    protected function generateDataTable()
     {
         $templateData = view('laravel-generator::scaffold.table.datatable', [
             'columns' => implode(','.infy_nl_tab(1, 3), $this->generateDataTableColumns()),
@@ -81,7 +81,7 @@ private function generateDataTable()
         $this->config->commandInfo($fileName);
     }
 
-    private function generateLivewireTable()
+    protected function generateLivewireTable()
     {
         $templateData = view('laravel-generator::scaffold.table.livewire', [
             'columns' => implode(','.infy_nl_tab(1, 3), $this->generateLivewireTableColumns()),
@@ -97,7 +97,7 @@ private function generateLivewireTable()
         $this->config->commandInfo($fileName);
     }
 
-    private function generateDataTableColumns(): array
+    protected function generateDataTableColumns(): array
     {
         $dataTableColumns = [];
         foreach ($this->config->fields as $field) {
@@ -114,7 +114,7 @@ private function generateDataTableColumns(): array
         return $dataTableColumns;
     }
 
-    private function generateLivewireTableColumns(): array
+    protected function generateLivewireTableColumns(): array
     {
         $livewireTableColumns = [];
 
diff --git a/src/Generators/Scaffold/RequestGenerator.php b/src/Generators/Scaffold/RequestGenerator.php
@@ -26,7 +26,7 @@ public function generate()
         $this->generateUpdateRequest();
     }
 
-    private function generateCreateRequest()
+    protected function generateCreateRequest()
     {
         $templateData = view('laravel-generator::scaffold.request.create', $this->variables())->render();
 
@@ -36,7 +36,7 @@ private function generateCreateRequest()
         $this->config->commandInfo($this->createFileName);
     }
 
-    private function generateUpdateRequest()
+    protected function generateUpdateRequest()
     {
         $modelGenerator = new ModelGenerator();
         $rules = $modelGenerator->generateUniqueRules();
diff --git a/src/Generators/Scaffold/ViewGenerator.php b/src/Generators/Scaffold/ViewGenerator.php
@@ -74,7 +74,7 @@ public function generate()
         $this->config->commandComment('Views created: ');
     }
 
-    private function generateTable()
+    protected function generateTable()
     {
         if ($this->config->tableType === 'livewire') {
             return;
@@ -99,12 +99,12 @@ private function generateTable()
         $this->config->commandInfo('table.blade.php created');
     }
 
-    private function generateDataTableBody(): string
+    protected function generateDataTableBody(): string
     {
         return view($this->templateViewPath.'.scaffold.table.datatable.body')->render();
     }
 
-    private function generateDataTableActions()
+    protected function generateDataTableActions()
     {
         $templateData = view($this->templateViewPath.'.scaffold.table.datatable.actions')->render();
 
@@ -113,7 +113,7 @@ private function generateDataTableActions()
         $this->config->commandInfo('datatables_actions.blade.php created');
     }
 
-    private function generateBladeTableBody(): string
+    protected function generateBladeTableBody(): string
     {
         $tableBodyFields = [];
 
@@ -139,7 +139,7 @@ private function generateBladeTableBody(): string
         ])->render();
     }
 
-    private function generateTableHeaderFields(): string
+    protected function generateTableHeaderFields(): string
     {
         $headerFields = [];
 
@@ -157,7 +157,7 @@ private function generateTableHeaderFields(): string
         return implode(infy_nl_tab(1, 4), $headerFields);
     }
 
-    private function generateIndex()
+    protected function generateIndex()
     {
         switch ($this->config->tableType) {
             case 'datatables':
@@ -181,7 +181,7 @@ private function generateIndex()
         $this->config->commandInfo('index.blade.php created');
     }
 
-    private function generateFields()
+    protected function generateFields()
     {
         $htmlFields = [];
 
@@ -246,23 +246,23 @@ private function generateViewComposer($tableName, $variableName, $columns, $sele
         );
     }
 
-    private function generateCreate()
+    protected function generateCreate()
     {
         $templateData = view($this->templateViewPath.'.scaffold.create')->render();
 
         g_filesystem()->createFile($this->path.'create.blade.php', $templateData);
         $this->config->commandInfo('create.blade.php created');
     }
 
-    private function generateUpdate()
+    protected function generateUpdate()
     {
         $templateData = view($this->templateViewPath.'.scaffold.edit')->render();
 
         g_filesystem()->createFile($this->path.'edit.blade.php', $templateData);
         $this->config->commandInfo('edit.blade.php created');
     }
 
-    private function generateShowFields()
+    protected function generateShowFields()
     {
         $fieldsStr = '';
 
@@ -279,7 +279,7 @@ private function generateShowFields()
         $this->config->commandInfo('show_fields.blade.php created');
     }
 
-    private function generateShow()
+    protected function generateShow()
     {
         $templateData = view($this->templateViewPath.'.scaffold.show')->render();
 

Original file line number	Diff line number	Diff line change
`@@ -197,7 +197,7 @@ public function performPostActionsWithMigration()`
`197`	`197`	`$this->performPostActions(true);`
`198`	`198`	`}`
`199`	`199`
`200`		`- private function saveSchemaFile()`
	`200`	`+ protected function saveSchemaFile()`
`201`	`201`	`{`
`202`	`202`	`$fileFields = [];`
`203`	`203`
`@@ -235,7 +235,7 @@ private function saveSchemaFile()`
`235`	`235`	`$this->info($fileName);`
`236`	`236`	`}`
`237`	`237`
`238`		`- private function saveLocaleFile()`
	`238`	`+ protected function saveLocaleFile()`
`239`	`239`	`{`
`240`	`240`	`$locales = [`
`241`	`241`	`'singular' => $this->config->modelNames->name,`
`@@ -333,7 +333,7 @@ public function getFields()`
`333`	`333`	`$this->getFieldsFromConsole();`
`334`	`334`	`}`
`335`	`335`
`336`		`- private function getFieldsFromConsole()`
	`336`	`+ protected function getFieldsFromConsole()`
`337`	`337`	`{`
`338`	`338`	`$this->info('Specify fields for the model (skip id & timestamp fields, we will add it automatically)');`
`339`	`339`	`$this->info('Read docs carefully to specify field inputs)');`
`@@ -406,7 +406,7 @@ private function addTimestamps()`
`406`	`406`	`$this->config->fields[] = $updatedAt;`
`407`	`407`	`}`
`408`	`408`
`409`		`- private function parseFieldsFromJsonFile()`
	`409`	`+ protected function parseFieldsFromJsonFile()`
`410`	`410`	`{`
`411`	`411`	`$fieldsFileValue = $this->option('fieldsFile');`
`412`	`412`	`if (file_exists($fieldsFileValue)) {`
`@@ -438,7 +438,7 @@ private function parseFieldsFromJsonFile()`
`438`	`438`	`}`
`439`	`439`	`}`
`440`	`440`
`441`		`- private function parseFieldsFromGUI()`
	`441`	`+ protected function parseFieldsFromGUI()`
`442`	`442`	`{`
`443`	`443`	`$fileContents = $this->option('jsonFromGUI');`
`444`	`444`	`$jsonData = json_decode($fileContents, true);`
`@@ -471,7 +471,7 @@ private function parseFieldsFromGUI()`
`471`	`471`	`}`
`472`	`472`	`}`
`473`	`473`
`474`		`- private function parseFieldsFromTable()`
	`474`	`+ protected function parseFieldsFromTable()`
`475`	`475`	`{`
`476`	`476`	`$tableName = $this->config->tableName;`
`477`	`477`
Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,7 @@ public function parseOptions(string $options)`
`109`	`109`	`}`
`110`	`110`	`}`
`111`	`111`
`112`		`- private function prepareMigrationText()`
	`112`	`+ protected function prepareMigrationText()`
`113`	`113`	`{`
`114`	`114`	`$this->migrationText = '$table->';`
`115`	`115`	`$this->migrationText .= $this->dbType."('".$this->name."'";`
Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ public function getRelationFunctionText(string $relationText = null): string`
`76`	`76`	`return '';`
`77`	`77`	`}`
`78`	`78`
`79`		`- private function generateRelation($functionName, $relation, $relationClass)`
	`79`	`+ protected function generateRelation($functionName, $relation, $relationClass)`
`80`	`80`	`{`
`81`	`81`	`$inputs = $this->inputs;`
`82`	`82`	`$relatedModelName = array_shift($inputs);`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ public function generate()`
`49`	`49`	`$this->config->commandInfo($this->fileName);`
`50`	`50`	`}`
`51`	`51`
`52`		`- private function docsVariables(): array`
	`52`	`+ protected function docsVariables(): array`
`53`	`53`	`{`
`54`	`54`	`$methods = ['controller', 'index', 'store', 'show', 'update', 'destroy'];`
`55`	`55`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ public function generate()`
`26`	`26`	`$this->generateUpdateRequest();`
`27`	`27`	`}`
`28`	`28`
`29`		`- private function generateCreateRequest()`
	`29`	`+ protected function generateCreateRequest()`
`30`	`30`	`{`
`31`	`31`	`$templateData = view('laravel-generator::api.request.create', $this->variables())->render();`
`32`	`32`
`@@ -36,7 +36,7 @@ private function generateCreateRequest()`
`36`	`36`	`$this->config->commandInfo($this->createFileName);`
`37`	`37`	`}`
`38`	`38`
`39`		`- private function generateUpdateRequest()`
	`39`	`+ protected function generateUpdateRequest()`
`40`	`40`	`{`
`41`	`41`	`$modelGenerator = app(ModelGenerator::class);`
`42`	`42`	`$rules = $modelGenerator->generateUniqueRules();`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ public function generate()`
`33`	`33`	`$this->config->commandInfo($this->fileName);`
`34`	`34`	`}`
`35`	`35`
`36`		`- private function generateResourceFields(): array`
	`36`	`+ protected function generateResourceFields(): array`
`37`	`37`	`{`
`38`	`38`	`$resourceFields = [];`
`39`	`39`	`foreach ($this->config->fields as $field) {`
Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ public function generate()`
`62`	`62`	`$this->config->commandInfo($this->fileName);`
`63`	`63`	`}`
`64`	`64`
`65`		`- private function generateFields(): string`
	`65`	`+ protected function generateFields(): string`
`66`	`66`	`{`
`67`	`67`	`$fields = [];`
`68`	`68`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ public function variables(): array`
`34`	`34`	`];`
`35`	`35`	`}`
`36`	`36`
`37`		`- private function generateFields(): string`
	`37`	`+ protected function generateFields(): string`
`38`	`38`	`{`
`39`	`39`	`$fields = [];`
`40`	`40`	`$foreignKeys = [];`
Original file line number	Diff line number	Diff line change
`@@ -114,7 +114,7 @@ protected function generateFillables(): array`
`114`	`114`	`return $fillables;`
`115`	`115`	`}`
`116`	`116`
`117`		`- private function fillDocs(): string`
	`117`	`+ protected function fillDocs(): string`
`118`	`118`	`{`
`119`	`119`	`if (!$this->config->options->swagger) {`
`120`	`120`	`return '';`
`@@ -145,7 +145,7 @@ public function generateSwagger(): string`
`145`	`145`	`]);`
`146`	`146`	`}`
`147`	`147`
`148`		`- private function generateRequiredFields(): array`
	`148`	`+ protected function generateRequiredFields(): array`
`149`	`149`	`{`
`150`	`150`	`$requiredFields = [];`
`151`	`151`
`@@ -162,7 +162,7 @@ private function generateRequiredFields(): array`
`162`	`162`	`return $requiredFields;`
`163`	`163`	`}`
`164`	`164`
`165`		`- private function generateRules(): array`
	`165`	`+ protected function generateRules(): array`
`166`	`166`	`{`
`167`	`167`	`$dont_require_fields = config('laravel_generator.options.hidden_fields', [])`
`168`	`168`	`+ config('laravel_generator.options.excluded_fields', $this->excluded_fields);`
`@@ -309,7 +309,7 @@ public function generateCasts(): array`
`309`	`309`	`return $casts;`
`310`	`310`	`}`
`311`	`311`
`312`		`- private function generateRelations(): string`
	`312`	`+ protected function generateRelations(): string`
`313`	`313`	`{`
`314`	`314`	`$relations = [];`
`315`	`315`
Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ public function generate()`
`65`	`65`	`$this->config->commandInfo($this->fileName);`
`66`	`66`	`}`
`67`	`67`
`68`		`- private function generateDataTable()`
	`68`	`+ protected function generateDataTable()`
`69`	`69`	`{`
`70`	`70`	`$templateData = view('laravel-generator::scaffold.table.datatable', [`
`71`	`71`	`'columns' => implode(','.infy_nl_tab(1, 3), $this->generateDataTableColumns()),`
`@@ -81,7 +81,7 @@ private function generateDataTable()`
`81`	`81`	`$this->config->commandInfo($fileName);`
`82`	`82`	`}`
`83`	`83`
`84`		`- private function generateLivewireTable()`
	`84`	`+ protected function generateLivewireTable()`
`85`	`85`	`{`
`86`	`86`	`$templateData = view('laravel-generator::scaffold.table.livewire', [`
`87`	`87`	`'columns' => implode(','.infy_nl_tab(1, 3), $this->generateLivewireTableColumns()),`
`@@ -97,7 +97,7 @@ private function generateLivewireTable()`
`97`	`97`	`$this->config->commandInfo($fileName);`
`98`	`98`	`}`
`99`	`99`
`100`		`- private function generateDataTableColumns(): array`
	`100`	`+ protected function generateDataTableColumns(): array`
`101`	`101`	`{`
`102`	`102`	`$dataTableColumns = [];`
`103`	`103`	`foreach ($this->config->fields as $field) {`
`@@ -114,7 +114,7 @@ private function generateDataTableColumns(): array`
`114`	`114`	`return $dataTableColumns;`
`115`	`115`	`}`
`116`	`116`
`117`		`- private function generateLivewireTableColumns(): array`
	`117`	`+ protected function generateLivewireTableColumns(): array`
`118`	`118`	`{`
`119`	`119`	`$livewireTableColumns = [];`
`120`	`120`