Fix #97, #98, #99, #101, #102

Author: MikeAlhayek

README.md

@@ -128,6 +128,7 @@ Checkout our channel on <a href="https://www.youtube.com/channel/UCkEd0nOoRf3o0a
 
 ## Contribution
 Do you like this project and want to contribute?
+- **HELP WANTED** Version `v2.3` needs to be documented before it can be released. If you are able to contribute, please read the <a href="https://github.com/CrestApps/laravel-code-generator/blob/v2.3/CHANGELOG.md">change-log</a> in <a href="https://github.com/CrestApps/laravel-code-generator/tree/v2.3">v2.3 branch</a> and document it in the <a href="https://github.com/CrestApps/crestapps-site">CrestApps-site</a> repository. For any help, my email can be found in the `composer.json` file, feel free to send me an email.
 - Please start by *Staring* this package on GitHub.
 - Sharing this projects with others is your way of saying keep the improvements and new awesome features coming.
 - Report any bugs or send us any comments, idea, thought that you may have about this project as an issue on GitHub.

composer.json

@@ -2,7 +2,7 @@
     "name": "crestapps/laravel-code-generator",
     "license": "MIT",
     "description": "An intelligent code generator for Laravel framework that will save you time! This awesome tool will help you generate resources like views, controllers, routes, migrations, languages and/or form-requests! It is extremely flexible and customizable to cover many on the use cases. It is shipped with cross-browsers compatible template, along with a client-side validation to modernize your application.",
-    "version": "v2.2.12",
+    "version": "v2.2.13",
     "keywords": [
         "laravel","crud","crud generator",
         "laravel crud generator","laravel crud builder",

src/Commands/Bases/MigrationCommandBase.php

@@ -3,6 +3,7 @@
 namespace CrestApps\CodeGenerator\Commands\Bases;
 
 use CrestApps\CodeGenerator\Traits\Migration;
+use CrestApps\CodeGenerator\Support\Helpers;
 use Illuminate\Console\Command;
 
 class MigrationCommandBase extends Command
@@ -20,4 +21,13 @@ public function __construct()
 
         $this->setMigrator();
     }
+	
+	protected function getMigratorNotes()
+	{
+		if(Helpers::isNewerThanOrEqualTo('5.7')) {
+			return $this->migrator->setOutput($this->output);
+		}
+		
+		return $this->migrator->getNotes();
+	}
 }

src/Commands/CreateControllerCommand.php

@@ -379,14 +379,11 @@ protected function getCommandInput()
         return (object) compact(
             'formRequestDirectory',
             'viewDirectory',
-            'viewName',
             'modelName',
             'prefix',
             'perPage',
-            'fileSnippet',
             'modelDirectory',
             'langFile',
-            'fields',
             'withFormRequest',
             'formRequestName',
             'force',

src/Commands/CreateModelCommand.php

@@ -163,7 +163,7 @@ protected function getNamespace($modelName, $modelDirectory)
      *
      * @return string
      */
-    protected function getPrimaryKeyName(Field $primaryField, $primaryKey)
+    protected function getPrimaryKeyName(Field $primaryField = null, $primaryKey = 'id')
     {
         return !is_null($primaryField) ? $primaryField->name : $primaryKey;
     }

src/Commands/Migrations/MigrateAllCommand.php

@@ -49,11 +49,11 @@ public function handle()
             'pretend' => $this->option('pretend'),
             'step' => $this->option('step'),
         ]);
-
+		
         // Once the migrator has run we will grab the note output and send it out to
         // the console screen, since the migrator itself functions without having
         // any instances of the OutputInterface contract passed into the class.
-        foreach ($this->migrator->getNotes() as $note) {
+        foreach ($this->getMigratorNotes() as $note) {
             $this->output->writeln($note);
         }
 
@@ -64,7 +64,7 @@ public function handle()
             $this->call('db:seed', ['--force' => true]);
         }
     }
-
+	
     /**
      * Prepare the migration database for running.
      *

src/Commands/Migrations/ResetAllCommand.php

@@ -52,7 +52,7 @@ public function handle()
         // Once the migrator has run we will grab the note output and send it out to
         // the console screen, since the migrator itself functions without having
         // any instances of the OutputInterface contract passed into the class.
-        foreach ($this->migrator->getNotes() as $note) {
+        foreach ($this->getMigratorNotes() as $note) {
             $this->output->writeln($note);
         }
     }

src/Commands/Migrations/RollbackAllCommand.php

@@ -48,7 +48,7 @@ public function handle()
         // Once the migrator has run we will grab the note output and send it out to
         // the console screen, since the migrator itself functions without having
         // any instances of the OutputInterface contract passed into the class.
-        foreach ($this->migrator->getNotes() as $note) {
+        foreach ($this->getMigratorNotes() as $note) {
             $this->output->writeln($note);
         }
     }

src/Commands/ResourceFileCreateCommand.php

@@ -61,10 +61,12 @@ public function handle()
         }
 
         $fields = FieldTransformer::fromString($this->option('fields'), 'generic', $input->translationFor);
+
         $relations = $this->getRelations($input->relations);
         $indexes = $this->getIndexes($input->indexes);
 
         $resource = new Resource($fields, $relations, $indexes);
+		
 
         $this->createFile($file, Helpers::prettifyJson($resource->toArray()))
             ->info('The "' . basename($file) . '" file was crafted successfully!');

src/Models/Field.php

@@ -882,7 +882,7 @@ public function toArray()
             'is-unique' => $this->isUnique,
             'is-primary' => $this->isPrimary,
             'comment' => $this->comment,
-            'is-nullable' => $this->isNullable,
+            'is-nullable' => $this->isNullable(),
             'is-header' => $this->isHeader,
             'is-unsigned' => $this->isUnsigned,
             'is-auto-increment' => $this->isAutoIncrement,
@@ -1141,7 +1141,7 @@ public function setValidationProperty(array $properties)
             $this->validationRules = is_array($properties['validation']) ? $properties['validation'] : Helpers::removeEmptyItems(explode('|', $properties['validation']));
         }
 
-        if (Helpers::isNewerThanOrEqualTo('5.2') && $this->isNullable && !in_array('nullable', $this->validationRules)) {
+        if (Helpers::isNewerThanOrEqualTo('5.2') && $this->isNullable() && !in_array('nullable', $this->validationRules)) {
             $this->validationRules[] = 'nullable';
         }
 
@@ -1525,7 +1525,7 @@ public function getDecimalPointLength()
      */
     public function getMinLength()
     {
-        if ($this->isRequired() || !$this->isNullable) {
+        if ($this->isRequired() || !$this->isNullable()) {
             return 1;
         }
 
@@ -1807,15 +1807,15 @@ public static function fromArray(array $properties, $localeGroup)
             ->setPlaceholder($properties) // this must come after setForeignRelation
             ->setOnStore($properties)
             ->setOnUpdate($properties);
-
+			
         if (Field::isValidSelectRangeType($properties)) {
             $field->htmlType = 'selectRange';
         }
 
         if ($field->getEloquentDataMethod() == 'enum' && empty($field->getOptions())) {
             throw new Exception('To construct an enum data-type field, options must be set. ' . $field->name);
         }
-
+	
         return $field;
     }
 }