Add --request --requests flags to make:controller --model=X

Author: PovilasKorop

src/Illuminate/Routing/Console/ControllerMakeCommand.php

@@ -158,6 +158,8 @@ protected function buildModelReplacements(array $replace)
             }
         }
 
+        $replace = $this->buildFormRequestReplacements($replace, $modelClass);
+
         return array_merge($replace, [
             'DummyFullModelClass' => $modelClass,
             '{{ namespacedModel }}' => $modelClass,
@@ -188,6 +190,56 @@ protected function parseModel($model)
         return $this->qualifyModel($model);
     }
 
+    /**
+     * Build the model replacement values.
+     *
+     * @param  array   $replace
+     * @param  string  $modelClass
+     * @return array
+     */
+    protected function buildFormRequestReplacements(array $replace, $modelClass)
+    {
+        $storeRequestClass = $updateRequestClass = 'Request';
+        $namespace = 'Illuminate\\Http';
+
+        if ($this->option('requests')) {
+            $storeRequestClass = 'Store' . class_basename($modelClass) . 'Request';
+            $this->call('make:request', [
+                'name' => $storeRequestClass,
+            ]);
+            $updateRequestClass = 'Update' . class_basename($modelClass) . 'Request';
+            $this->call('make:request', [
+                'name' => $updateRequestClass,
+            ]);
+            $namespace = 'App\\Http\\Requests';
+        }
+        if ($this->option('request')) {
+            $storeRequestClass = $updateRequestClass = class_basename($modelClass) . 'Request';
+            $this->call('make:request', [
+                'name' => $storeRequestClass
+            ]);
+            $namespace = 'App\\Http\\Requests';
+        }
+
+        $namespacedRequests = $namespace . '\\' . $storeRequestClass . ';';
+        if ($storeRequestClass != $updateRequestClass) {
+            $namespacedRequests .= "\r\nuse " . $namespace . "\\" . $updateRequestClass . ";";
+        }
+
+        return array_merge($replace, [
+            '{{ storeRequest }}' => $storeRequestClass,
+            '{{storeRequest}}' => $storeRequestClass,
+            '{{ updateRequest }}' => $updateRequestClass,
+            '{{updateRequest}}' => $updateRequestClass,
+            '{{ namespacedStoreRequest }}' => $namespace . '\\' . $storeRequestClass,
+            '{{namespacedStoreRequest}}' => $namespace . '\\' . $storeRequestClass,
+            '{{ namespacedUpdateRequest }}' => $namespace . '\\' . $updateRequestClass,
+            '{{namespacedUpdateRequest}}' => $namespace . '\\' . $updateRequestClass,
+            '{{ namespacedRequests }}' => $namespacedRequests,
+            '{{namespacedRequests}}' => $namespacedRequests,
+        ]);
+    }
+
     /**
      * Get the console command options.
      *
@@ -203,6 +255,8 @@ protected function getOptions()
             ['model', 'm', InputOption::VALUE_OPTIONAL, 'Generate a resource controller for the given model.'],
             ['parent', 'p', InputOption::VALUE_OPTIONAL, 'Generate a nested resource controller class.'],
             ['resource', 'r', InputOption::VALUE_NONE, 'Generate a resource controller class.'],
+            ['request', null, InputOption::VALUE_NONE, 'Generate a FormRequest class.'],
+            ['requests', null, InputOption::VALUE_NONE, 'Generate FormRequest classes for store and update.'],
         ];
     }
 }

src/Illuminate/Routing/Console/stubs/controller.model.api.stub

@@ -4,7 +4,7 @@ namespace {{ namespace }};
 
 use {{ namespacedModel }};
 use {{ rootNamespace }}Http\Controllers\Controller;
-use Illuminate\Http\Request;
+use {{ namespacedRequests }}
 
 class {{ class }} extends Controller
 {
@@ -21,10 +21,10 @@ class {{ class }} extends Controller
     /**
      * Store a newly created resource in storage.
      *
-     * @param  \Illuminate\Http\Request  $request
+     * @param  \{{ namespacedStoreRequest }}  $request
      * @return \Illuminate\Http\Response
      */
-    public function store(Request $request)
+    public function store({{ storeRequest }} $request)
     {
         //
     }
@@ -43,11 +43,11 @@ class {{ class }} extends Controller
     /**
      * Update the specified resource in storage.
      *
-     * @param  \Illuminate\Http\Request  $request
+     * @param  \{{ namespacedUpdateRequest }}  $request
      * @param  \{{ namespacedModel }}  ${{ modelVariable }}
      * @return \Illuminate\Http\Response
      */
-    public function update(Request $request, {{ model }} ${{ modelVariable }})
+    public function update({{ updateRequest }} $request, {{ model }} ${{ modelVariable }})
     {
         //
     }

src/Illuminate/Routing/Console/stubs/controller.model.stub

@@ -4,7 +4,7 @@ namespace {{ namespace }};
 
 use {{ namespacedModel }};
 use {{ rootNamespace }}Http\Controllers\Controller;
-use Illuminate\Http\Request;
+use {{ namespacedRequests }}
 
 class {{ class }} extends Controller
 {
@@ -31,10 +31,10 @@ class {{ class }} extends Controller
     /**
      * Store a newly created resource in storage.
      *
-     * @param  \Illuminate\Http\Request  $request
+     * @param  \{{ namespacedStoreRequest }}  $request
      * @return \Illuminate\Http\Response
      */
-    public function store(Request $request)
+    public function store({{ storeRequest }} $request)
     {
         //
     }
@@ -64,11 +64,11 @@ class {{ class }} extends Controller
     /**
      * Update the specified resource in storage.
      *
-     * @param  \Illuminate\Http\Request  $request
+     * @param  \{{ namespacedUpdateRequest }}  $request
      * @param  \{{ namespacedModel }}  ${{ modelVariable }}
      * @return \Illuminate\Http\Response
      */
-    public function update(Request $request, {{ model }} ${{ modelVariable }})
+    public function update({{ updateRequest }} $request, {{ model }} ${{ modelVariable }})
     {
         //
     }