Handle multiple model parameters in routes.

src/PendingRouteTransformers/HandleUrisOfNestedControllers.php

@@ -4,6 +4,7 @@
 
 use Illuminate\Support\Collection;
 use Illuminate\Support\Str;
+use ReflectionParameter;
 use Spatie\RouteDiscovery\PendingRoutes\PendingRoute;
 use Spatie\RouteDiscovery\PendingRoutes\PendingRouteAction;
 
@@ -33,7 +34,20 @@ public function transform(Collection $pendingRoutes): Collection
             }
 
             $childNode->actions->each(function (PendingRouteAction $action) use ($parentPendingRoute, $parentAction) {
-                $result = Str::replace($parentPendingRoute->uri, $parentAction->uri, $action->uri);
+                $paramsToRemove = $action->modelParameters()
+                    ->filter(
+                        fn (ReflectionParameter $parameter) => $parentAction
+                        ->modelParameters()
+                        ->contains(
+                            fn (ReflectionParameter $parentParameter) => $parentParameter->getName() === $parameter->getName())
+                    );
+                $result = Str::of($action->uri)
+                    ->replace(
+                        $paramsToRemove->map(fn (ReflectionParameter $parameter) => "{{$parameter->getName()}}")->toArray(),
+                        ''
+                    )
+                    ->replace('//', '/')
+                    ->replace($parentPendingRoute->uri, $parentAction->uri);
 
                 $action->uri = $result;
             });

src/PendingRoutes/PendingRouteAction.php

@@ -4,6 +4,7 @@
 
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Arr;
+use Illuminate\Support\Collection;
 use Illuminate\Support\Str;
 use ReflectionAttribute;
 use ReflectionMethod;
@@ -20,6 +21,9 @@ class PendingRouteAction
     /** @var array<int, string> */
     public array $methods = [];
 
+    /** @var Collection<ReflectionParameter> */
+    public Collection $modelParameters;
+
     /** @var array{class-string, string} */
     public array $action;
 
@@ -40,35 +44,42 @@ public function __construct(ReflectionMethod $method, string $controllerClass)
     {
         $this->method = $method;
 
+        $this->modelParameters = $this->modelParameters();
+
         $this->uri = $this->relativeUri();
 
         $this->methods = $this->discoverHttpMethods();
 
         $this->action = [$controllerClass, $method->name];
     }
 
-    public function relativeUri(): string
+    /**
+     * @return Collection<ReflectionParameter>
+     */
+    public function modelParameters(): Collection
     {
-        /** @var ReflectionParameter $modelParameter */
-        $modelParameter = collect($this->method->getParameters())->first(function (ReflectionParameter $parameter) {
+        return collect($this->method->getParameters())->filter(function (ReflectionParameter $parameter) {
             $type = $parameter->getType();
 
             return $type instanceof ReflectionNamedType && is_a($type->getName(), Model::class, true);
         });
+    }
 
+    public function relativeUri(): string
+    {
         $uri = '';
 
         if (! in_array($this->method->getName(), $this->commonControllerMethodNames())) {
             $uri = Str::kebab($this->method->getName());
         }
 
-        /** @phpstan-ignore-next-line */
-        if ($modelParameter) {
+        if ($this->modelParameters->isNotEmpty()) {
             if ($uri !== '') {
                 $uri .= '/';
             }
-
-            $uri .= "{{$modelParameter->getName()}}";
+            $uri .= $this->modelParameters
+                ->map(fn(ReflectionParameter $parameter) => "{{$parameter->getName()}}")
+                ->implode('/');
         }
 
         return $uri;

tests/RouteDiscoveryTest.php

@@ -12,6 +12,9 @@
 use Spatie\RouteDiscovery\Tests\Support\TestClasses\Controllers\Middleware\MiddlewareOnControllerController;
 use Spatie\RouteDiscovery\Tests\Support\TestClasses\Controllers\Middleware\MiddlewareOnMethodController;
 use Spatie\RouteDiscovery\Tests\Support\TestClasses\Controllers\Model\ModelController;
+use Spatie\RouteDiscovery\Tests\Support\TestClasses\Controllers\MultipleModel\MultipleModelController;
+use Spatie\RouteDiscovery\Tests\Support\TestClasses\Controllers\NestedWithMultipleParametersController\PhotosController as MpPhotosController;
+use Spatie\RouteDiscovery\Tests\Support\TestClasses\Controllers\NestedWithMultipleParametersController\Photos\CommentsController as MpCommentsController;
 use Spatie\RouteDiscovery\Tests\Support\TestClasses\Controllers\NestedWithParametersController\Photos\CommentsController;
 use Spatie\RouteDiscovery\Tests\Support\TestClasses\Controllers\NestedWithParametersController\PhotosController;
 use Spatie\RouteDiscovery\Tests\Support\TestClasses\Controllers\Nesting\Nested\ChildController;
@@ -120,6 +123,43 @@
     );
 });
 
+it('can automatically discover a nested route with multiple model parameters', function () {
+    $this
+        ->routeRegistrar
+        ->registerDirectory(controllersPath('NestedWithMultipleParametersController'));
+
+    $this->assertRegisteredRoutesCount(5);
+
+    $this->assertRouteRegistered(
+        MpPhotosController::class,
+        controllerMethod: 'show',
+        uri: 'photos/{photo}',
+    );
+
+    $this->assertRouteRegistered(
+        MpPhotosController::class,
+        controllerMethod: 'edit',
+        uri: 'photos/edit/{photo}',
+    );
+
+    $this->assertRouteRegistered(
+        MpCommentsController::class,
+        controllerMethod: 'show',
+        uri: 'photos/{photo}/comments/{comment}',
+    );
+    $this->assertRouteRegistered(
+        MpCommentsController::class,
+        controllerMethod: 'edit',
+        uri: 'photos/{photo}/comments/edit/{comment}',
+    );
+    $this->assertRouteRegistered(
+        MpCommentsController::class,
+        controllerMethod: 'store',
+        httpMethods: 'post',
+        uri: 'photos/{photo}/comments/{comment}',
+    );
+});
+
 it('can automatically discovery a model route', function () {
     $this
         ->routeRegistrar
@@ -134,6 +174,20 @@
         );
 });
 
+it('can automatically discovery multiple model route', function () {
+    $this
+        ->routeRegistrar
+        ->registerDirectory(controllersPath('MultipleModel'));
+
+    $this
+        ->assertRegisteredRoutesCount(1)
+        ->assertRouteRegistered(
+            MultipleModelController::class,
+            controllerMethod: 'edit',
+            uri: 'multiple-model/edit/{user}/{photo}',
+        );
+});
+
 it('will only automatically register public methods', function () {
     $this
         ->routeRegistrar

tests/Support/TestClasses/Controllers/MultipleModel/MultipleModelController.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace Spatie\RouteDiscovery\Tests\Support\TestClasses\Controllers\MultipleModel;
+
+use Spatie\RouteDiscovery\Tests\Support\TestClasses\Models\Photo;
+use Spatie\RouteDiscovery\Tests\Support\TestClasses\Models\User;
+
+class MultipleModelController
+{
+    public function edit(User $user, Photo $photo)
+    {
+    }
+}

tests/Support/TestClasses/Controllers/NestedWithMultipleParametersController/Photos/CommentsController.php

@@ -0,0 +1,22 @@
+<?php
+
+namespace Spatie\RouteDiscovery\Tests\Support\TestClasses\Controllers\NestedWithMultipleParametersController\Photos;
+
+use Spatie\RouteDiscovery\Tests\Support\TestClasses\Models\Comment;
+use Spatie\RouteDiscovery\Tests\Support\TestClasses\Models\Photo;
+use Spatie\RouteDiscovery\Tests\Support\TestClasses\Models\User;
+
+class CommentsController
+{
+    public function show(Photo $photo, Comment $comment)
+    {
+    }
+
+    public function edit(Photo $photo, Comment $comment)
+    {
+    }
+
+    public function store(Photo $photo, Comment $comment)
+    {
+    }
+}

tests/Support/TestClasses/Controllers/NestedWithMultipleParametersController/PhotosController.php

@@ -0,0 +1,16 @@
+<?php
+
+namespace Spatie\RouteDiscovery\Tests\Support\TestClasses\Controllers\NestedWithMultipleParametersController;
+
+use Spatie\RouteDiscovery\Tests\Support\TestClasses\Models\Photo;
+
+class PhotosController
+{
+    public function show(Photo $photo)
+    {
+    }
+
+    public function edit(Photo $photo)
+    {
+    }
+}