Honor resourceful controller method contexts

Author: jasonmccreary

src/Generators/ControllerGenerator.php

@@ -69,7 +69,19 @@ private function buildMethods(Controller $controller)
         foreach ($controller->methods() as $name => $statements) {
             $method = str_replace('DummyMethod', $name, $template);
 
-            // TODO: if resourceful action, do implicit model binding
+            if (in_array($name, ['edit', 'update', 'show', 'destroy'])) {
+                $context = Str::singular($controller->prefix());
+                $reference = 'App\\' . $context;
+                $variable = '$' . Str::camel($context);
+
+                // TODO: verify is model
+                $search = '     * @return \\Illuminate\\Http\\Response';
+                $method = str_replace($search,'     * @param \\' . $reference . ' ' . $variable . PHP_EOL . $search, $method);
+
+                $search = '(Request $request';
+                $method = str_replace($search, $search  . ', ' . $context . ' ' . $variable, $method);
+                $this->addImport($controller, $reference);
+            }
 
             $body = '';
             foreach ($statements as $statement) {
@@ -81,7 +93,7 @@ private function buildMethods(Controller $controller)
                     $class = $controller->name() . Str::studly($name) . 'Request';
 
                     $method = str_replace('\Illuminate\Http\Request $request', '\\App\\Http\\Requests\\' . $class . ' $request', $method);
-                    $method = str_replace('(Request $request)', '(' . $class . ' $request)', $method);
+                    $method = str_replace('(Request $request', '(' . $class . ' $request', $method);
 
                     $this->addImport($controller, 'App\\Http\\Requests\\' . $class);
                 } elseif ($statement instanceof DispatchStatement) {
@@ -100,7 +112,7 @@ private function buildMethods(Controller $controller)
                     $body .= self::INDENT . $statement->output() . PHP_EOL;
                 } elseif ($statement instanceof EloquentStatement) {
                     // TODO: pass controller method for context..
-                    $body .= self::INDENT . $statement->output() . PHP_EOL;
+                    $body .= self::INDENT . $statement->output($name) . PHP_EOL;
                     $this->addImport($controller, 'App\\' . Str::studly($statement->reference()));
                 } elseif ($statement instanceof QueryStatement) {
                     $body .= self::INDENT . $statement->output() . PHP_EOL;

src/Generators/RouteGenerator.php

@@ -11,8 +11,6 @@ class RouteGenerator implements Generator
     /** @var \Illuminate\Contracts\Filesystem\Filesystem */
     private $files;
 
-    private $resourceMethods = ['index', 'create', 'store', 'edit', 'update', 'show', 'destroy'];
-
     public function __construct($files)
     {
         $this->files = $files;
@@ -45,11 +43,11 @@ protected function buildRoutes(Controller $controller)
         $className = $controller->className();
         $slug = Str::kebab($controller->prefix());
 
-        $resource_methods = array_intersect($methods, $this->resourceMethods);
+        $resource_methods = array_intersect($methods, Controller::$resourceMethods);
         if (count($resource_methods)) {
             $routes .= sprintf("Route::resource('%s', '%s')", $slug, $className);
 
-            $missing_methods = array_diff($this->resourceMethods, $resource_methods);
+            $missing_methods = array_diff(Controller::$resourceMethods, $resource_methods);
             if (count($missing_methods)) {
                 if (count($missing_methods) < 4) {
                     $routes .= sprintf("->except('%s')", implode("', '", $missing_methods));
@@ -62,7 +60,7 @@ protected function buildRoutes(Controller $controller)
             $routes .= ';' . PHP_EOL;
         }
 
-        $methods = array_diff($methods, $this->resourceMethods);
+        $methods = array_diff($methods, Controller::$resourceMethods);
         foreach ($methods as $method) {
             $routes .= sprintf("Route::get('%s/%s', '%s@%s');", $slug, Str::kebab($method), $className, $method);
             $routes .= PHP_EOL;

src/Models/Controller.php

@@ -8,6 +8,9 @@
 
 class Controller
 {
+    /** @var array */
+    public static $resourceMethods = ['index', 'create', 'store', 'edit', 'update', 'show', 'destroy'];
+
     /**
      * @var string
      */

src/Models/Statements/EloquentStatement.php

@@ -34,13 +34,17 @@ public function reference(): string
         return $this->reference;
     }
 
-    public function output()
+    public function output(string $context)
     {
         if ($this->operation() == 'save') {
-            $code = "$" . Str::lower(Str::singular($this->reference()));
-            $code .= ' = ';
-            $code .= Str::studly($this->reference());
-            $code .= '::create($request->all());';
+            if ($context === 'store') {
+                $code = "$" . Str::lower(Str::singular($this->reference()));
+                $code .= ' = ';
+                $code .= Str::studly($this->reference());
+                $code .= '::create($request->all());';
+            } else {
+                $code = "$" . Str::lower(Str::singular($this->reference())) . '->save();';
+            }
         }
 
         if ($this->operation() == 'find') {

stubs/controller/method.stub

@@ -1,5 +1,5 @@
     /**
-     * @param  \Illuminate\Http\Request $request
+     * @param \Illuminate\Http\Request $request
      * @return \Illuminate\Http\Response
      */
     public function DummyMethod(Request $request)

tests/fixtures/controllers/crazy-eloquent.php

@@ -8,7 +8,7 @@
 class PostController extends Controller
 {
     /**
-     * @param  \Illuminate\Http\Request $request
+     * @param \Illuminate\Http\Request $request
      * @return \Illuminate\Http\Response
      */
     public function index(Request $request)
@@ -19,8 +19,8 @@ public function index(Request $request)
     }
 
     /**
-     * @param  \Illuminate\Http\Request $request
-     * @param  \App\Post $post
+     * @param \Illuminate\Http\Request $request
+     * @param \App\Post $post
      * @return \Illuminate\Http\Response
      */
     public function edit(Request $request, Post $post)
@@ -31,18 +31,18 @@ public function edit(Request $request, Post $post)
     }
 
     /**
-     * @param  \Illuminate\Http\Request $request
-     * @param  \App\Post $post
+     * @param \Illuminate\Http\Request $request
+     * @param \App\Post $post
      * @return \Illuminate\Http\Response
      */
     public function update(Request $request, Post $post)
     {
-        $post = Post::find($id);
+        $post = Post::find($post->id);
 
-        $post_ids = Post::where('title', $title)->take(3)->pluck('id');
+        $post_ids = Post::where('title', $post->title)->take(3)->pluck('id');
 
         $post->save();
 
-        return redirect()->route('post.edit', $id);
+        return redirect()->route('post.edit', $post->id);
     }
 }

tests/fixtures/controllers/readme-example.php

@@ -13,7 +13,7 @@
 class PostController extends Controller
 {
     /**
-     * @param  \Illuminate\Http\Request $request
+     * @param \Illuminate\Http\Request $request
      * @return \Illuminate\Http\Response
      */
     public function index(Request $request)
@@ -24,7 +24,7 @@ public function index(Request $request)
     }
 
     /**
-     * @param  \App\Http\Requests\PostStoreRequest $request
+     * @param \App\Http\Requests\PostStoreRequest $request
      * @return \Illuminate\Http\Response
      */
     public function store(PostStoreRequest $request)