Bug Fixes

CrestApps · Mar 3, 2019 · bf85e7f · bf85e7f
1 parent 4ed7d84
commit bf85e7f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/Commands/Bases/ControllerCommandBase.php b/src/Commands/Bases/ControllerCommandBase.php
@@ -204,10 +204,8 @@ protected function getCommandInput()
             'modelName',
             'prefix',
             'perPage',
-            'fileSnippet',
             'modelDirectory',
             'langFile',
-            'fields',
             'withFormRequest',
             'formRequestName',
             'force',

diff --git a/src/Support/FieldOptimizer.php b/src/Support/FieldOptimizer.php
@@ -99,7 +99,7 @@ protected function optimizeStringField()
      */
     protected function optimizeRequiredField()
     {
-        if (!array_key_exists('is-nullable', $this->meta) && ($this->parser->isNullable() || !$this->parser->isRequired() || $this->parser->isConditionalRequired())) {
+        if (!array_key_exists('is-nullable', $this->meta) && !$this->field->isPrimary() && ($this->parser->isNullable() || !$this->parser->isRequired() || $this->parser->isConditionalRequired())) {
             $this->field->isNullable = true;
         }
 
@@ -209,6 +209,9 @@ protected function optimizeBoolean()
     protected function optimizePrimaryKey()
     {
         if ($this->field->isPrimary()) {
+
+			$this->field->isNullable = false;
+
             if ($this->meta == null) {
                 $this->field->isOnFormView = false;
                 $this->field->isOnIndexView = false;