Form validation added

README.md

@@ -45,7 +45,7 @@ php artisan crud:generate Person --fields="name:string, email:string, age:number
 You can also easily include route, set primary key, set views directory etc through options **--route**, **--pk**, **--view-path** as bellows:
 
 ```
-php artisan crud:generate Person --fields="name:string, email:string, age:number, message:text" --route=yes --pk=id --view-path="admin" --namespace=Admin
+php artisan crud:generate Person --fields="name:string:required, email:string, age:number, message:text:required" --route=yes --pk=id --view-path="admin" --namespace=Admin
 ```
 
 -----------

src/Commands/CrudCommand.php

@@ -53,15 +53,27 @@ public function handle()
             $primaryKey = $this->option('pk');
             $viewPath = $this->option('view-path');
 
-            $fillableArray = explode(',', $fields);
-            foreach ($fillableArray as $value) {
-                $data[] = preg_replace("/(.*?):(.*)/", "$1", trim($value));
+            $fieldsArray = explode(',', $fields);
+            $requiredFields = '';
+            $requiredFieldsStr = '';
+
+            foreach ($fieldsArray as $item) {
+                $fillableArray[] = preg_replace("/(.*?):(.*)/", "$1", trim($item));
+
+                $itemArray = explode(':', $item);
+                $currentField = trim($itemArray[0]);
+                $requiredFieldsStr .= (isset($itemArray[2])
+                    && (trim($itemArray[2]) == 'req'
+                        || trim($itemArray[2]) == 'required'))
+                ? "'$currentField' => 'required', " : '';
             }
 
-            $commaSeparetedString = implode("', '", $data);
+            $commaSeparetedString = implode("', '", $fillableArray);
             $fillable = "['" . $commaSeparetedString . "']";
 
-            $this->call('crud:controller', ['name' => $controllerNamespace . $name . 'Controller', '--crud-name' => $name, '--view-path' => $viewPath]);
+            $requiredFields = ($requiredFieldsStr != '') ? "[" . $requiredFieldsStr . "]" : '';
+
+            $this->call('crud:controller', ['name' => $controllerNamespace . $name . 'Controller', '--crud-name' => $name, '--view-path' => $viewPath, '--required-fields' => $requiredFields]);
             $this->call('crud:model', ['name' => $name, '--fillable' => $fillable, '--table' => str_plural(strtolower($name))]);
             $this->call('crud:migration', ['name' => str_plural(strtolower($name)), '--schema' => $fields, '--pk' => $primaryKey]);
             $this->call('crud:view', ['name' => $name, '--fields' => $fields, '--view-path' => $viewPath]);
@@ -83,4 +95,5 @@ public function handle()
             }
         }
     }
+
 }

src/Commands/CrudControllerCommand.php

@@ -14,7 +14,8 @@ class CrudControllerCommand extends GeneratorCommand
     protected $signature = 'crud:controller
                             {name : The name of the controler.}
                             {--crud-name= : The name of the Crud.}
-                            {--view-path= : The name of the view path.}';
+                            {--view-path= : The name of the view path.}
+                            {--required-fields=null : Required fields for validations.}';
 
     /**
      * The console command description.
@@ -68,13 +69,19 @@ protected function buildClass($name)
         $crudNamePluralCap = str_plural($crudNameCap);
         $crudNameSingular = str_singular($crudName);
 
+        $validationRules = '';
+        if ($this->option('required-fields') != '') {
+            $validationRules = "\$this->validate(\$request, " . $this->option('required-fields') . ");\n";
+        }
+
         return $this->replaceNamespace($stub, $name)
             ->replaceViewPath($stub, $viewPath)
             ->replaceCrudName($stub, $crudName)
             ->replaceCrudNameCap($stub, $crudNameCap)
             ->replaceCrudNamePlural($stub, $crudNamePlural)
             ->replaceCrudNamePluralCap($stub, $crudNamePluralCap)
             ->replaceCrudNameSingular($stub, $crudNameSingular)
+            ->replaceValidationRules($stub, $validationRules)
             ->replaceClass($stub, $name);
     }
 
@@ -167,4 +174,20 @@ protected function replaceCrudNameSingular(&$stub, $crudNameSingular)
 
         return $this;
     }
+
+    /**
+     * Replace the validationRules for the given stub.
+     *
+     * @param  string  $stub
+     * @return $this
+     */
+    protected function replaceValidationRules(&$stub, $validationRules)
+    {
+        $stub = str_replace(
+            '{{validationRules}}', $validationRules, $stub
+        );
+
+        return $this;
+    }
+
 }

src/Commands/CrudMigrationCommand.php

@@ -215,4 +215,5 @@ protected function replaceSchemaDown(&$stub, $schemaDown)
 
         return $this;
     }
+
 }

src/Commands/CrudModelCommand.php

@@ -99,4 +99,5 @@ protected function replaceFillable(&$stub, $fillable)
 
         return $this;
     }
+
 }

src/Commands/CrudViewCommand.php

@@ -211,7 +211,7 @@ protected function wrapField($item, $field)
                     %3\$s
                     {!! \$errors->first('%1\$s', '<p class="help-block">:message</p>') !!}
                 </div>
-            </div>
+            </div>\n
 EOD;
 
         return sprintf($formGroup, $item['name'], ucwords(strtolower(str_replace('_', ' ', $item['name']))), $field);
@@ -314,4 +314,5 @@ protected function createRadioField($item)
 
         return $this->wrapField($item, sprintf($field, $item['name']));
     }
+
 }

src/CrudGeneratorServiceProvider.php

@@ -28,4 +28,5 @@ public function register()
             'Appzcoder\CrudGenerator\Commands\CrudViewCommand'
         );
     }
+
 }

src/stubs/controller.stub

@@ -42,7 +42,7 @@ class DummyClass extends Controller
      */
     public function store(Request $request)
     {
-        //$this->validate($request, ['name' => 'required']); // Uncomment and modify if you need to validate any input.
+        {{validationRules}}
         {{crudNameCap}}::create($request->all());
 
         Session::flash('flash_message', '{{crudNameCap}} successfully added!');
@@ -84,7 +84,7 @@ class DummyClass extends Controller
      */
     public function update($id, Request $request)
     {
-        //$this->validate($request, ['name' => 'required']); // Uncomment and modify if you need to validate any input.
+        {{validationRules}}
         ${{crudNameSingular}} = {{crudNameCap}}::findOrFail($id);
         ${{crudNameSingular}}->update($request->all());
 

src/stubs/migration.stub

@@ -24,4 +24,5 @@ class DummyClass extends Migration
     {
         {{schema_down}}
     }
+
 }

src/stubs/model.stub

@@ -1,4 +1,4 @@
-<?php 
+<?php
 
 namespace DummyNamespace;