Fix #206

sohelamin · Jan 23, 2018 · cd7af2c · cd7af2c
1 parent f9c9d43
commit cd7af2c
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 12 deletions.
diff --git a/src/Commands/CrudApiCommand.php b/src/Commands/CrudApiCommand.php
@@ -84,12 +84,23 @@ public function handle()
             $foreignKeys = $this->processJSONForeignKeys($this->option('fields_from_file'));
         }
 
+        $validations = trim($this->option('validations'));
+        if ($this->option('fields_from_file')) {
+            $validations = $this->processJSONValidations($this->option('fields_from_file'));
+        }
+
         $fieldsArray = explode(';', $fields);
         $fillableArray = [];
 
         foreach ($fieldsArray as $item) {
             $spareParts = explode('#', trim($item));
             $fillableArray[] = $spareParts[0];
+            $modifier = !empty($spareParts[2]) ? $spareParts[2] : 'nullable';
+
+            // Process migration fields
+            $migrationFields .= $spareParts[0] . '#' . $spareParts[1];
+            $migrationFields .= '#' . $modifier;
+            $migrationFields .= ';';
         }
 
         $commaSeparetedString = implode("', '", $fillableArray);
@@ -101,16 +112,11 @@ public function handle()
             $relationships = $this->processJSONRelationships($this->option('fields_from_file'));
         }
 
-        $validations = trim($this->option('validations'));
-        if ($this->option('fields_from_file')) {
-            $validations = $this->processJSONValidations($this->option('fields_from_file'));
-        }
-
         $softDeletes = $this->option('soft-deletes');
 
         $this->call('crud:api-controller', ['name' => $controllerNamespace . $name . 'Controller', '--crud-name' => $name, '--model-name' => $modelName, '--model-namespace' => $modelNamespace, '--pagination' => $perPage, '--validations' => $validations]);
         $this->call('crud:model', ['name' => $modelNamespace . $modelName, '--fillable' => $fillable, '--table' => $tableName, '--pk' => $primaryKey, '--relationships' => $relationships, '--soft-deletes' => $softDeletes]);
-        $this->call('crud:migration', ['name' => $migrationName, '--schema' => $fields, '--pk' => $primaryKey, '--indexes' => $indexes, '--foreign-keys' => $foreignKeys, '--soft-deletes' => $softDeletes]);
+        $this->call('crud:migration', ['name' => $migrationName, '--schema' => $migrationFields, '--pk' => $primaryKey, '--indexes' => $indexes, '--foreign-keys' => $foreignKeys, '--soft-deletes' => $softDeletes]);
 
         // For optimizing the class loader
         $this->callSilent('optimize');

diff --git a/src/Commands/CrudCommand.php b/src/Commands/CrudCommand.php
@@ -101,12 +101,11 @@ public function handle()
         foreach ($fieldsArray as $item) {
             $spareParts = explode('#', trim($item));
             $fillableArray[] = $spareParts[0];
+            $modifier = !empty($spareParts[2]) ? $spareParts[2] : 'nullable';
 
             // Process migration fields
             $migrationFields .= $spareParts[0] . '#' . $spareParts[1];
-            if (!preg_match('/' . $spareParts[0] . '/', $validations)) {
-                $migrationFields .= '#nullable';
-            }
+            $migrationFields .= '#' . $modifier;
             $migrationFields .= ';';
         }
 

diff --git a/src/Commands/CrudModelCommand.php b/src/Commands/CrudModelCommand.php
@@ -197,12 +197,13 @@ protected function replaceSoftDelete(&$stub, $replaceSoftDelete)
      */
     protected function createRelationshipFunction(&$stub, $relationshipName, $relationshipType, $argsString)
     {
-        $code = "public function " . $relationshipName . "()\n\t{\n\t\t"
+        $tabIndent = '    ';
+        $code = "public function " . $relationshipName . "()\n" . $tabIndent . "{\n" . $tabIndent . $tabIndent
             . "return \$this->" . $relationshipType . "(" . $argsString . ");"
-            . "\n\t}";
+            . "\n" . $tabIndent . "}";
 
         $str = '{{relationships}}';
-        $stub = str_replace($str, $code . "\n\t$str", $stub);
+        $stub = str_replace($str, $code . "\n" . $tabIndent . $str, $stub);
 
         return $this;
     }