[1.x] Fixes index views on nested model route bindings (#108)

* Fixes index views on nested model route bindings * Updates test
laravel · Sep 8, 2023 · 765b765 · 765b765
1 parent 0e353c3
commit 765b765
Show file tree

Hide file tree

Showing 6 changed files with 76 additions and 7 deletions.
diff --git a/src/Pipeline/MatchWildcardDirectories.php b/src/Pipeline/MatchWildcardDirectories.php
@@ -13,16 +13,23 @@ class MatchWildcardDirectories
      */
     public function __invoke(State $state, Closure $next): mixed
     {
-        if (! $state->onLastUriSegment() &&
-            $directory = $this->findWildcardDirectory($state->currentDirectory())) {
-            return new ContinueIterating($state->withData(
+        if ($directory = $this->findWildcardDirectory($state->currentDirectory())) {
+            $state = $state->withData(
                 Str::of($directory)
                     ->basename()
                     ->match('/\[(.*)\]/')->value(),
                 $state->currentUriSegment(),
             )->replaceCurrentUriSegmentWith(
                 Str::of($directory)->basename()
-            ));
+            );
+
+            if (! $state->onLastUriSegment()) {
+                return new ContinueIterating($state);
+            }
+
+            if (file_exists($path = $state->currentUriSegmentDirectory().'/index.blade.php')) {
+                return new MatchedView($path, $state->data);
+            }
         }
 
         return $next($state);

diff --git a/tests/Feature/Console/ListCommandTest.php b/tests/Feature/Console/ListCommandTest.php
@@ -41,10 +41,11 @@
           GET       /podcasts/{podcast}/comments/{comment:id} podcasts/[.Tests.Feature.Fixtures.Podcast]/comments/[.Tests.Feature.Fixtures.Comment-id].blad…
           GET       /posts/{lowerCase}/{upperCase}/{podcast}/{user:email}/show posts.show › posts/[lowerCase]/[UpperCase]/[Podcast]/[User-email]/show.bla…
           GET       /users/articles/{user:wrongColumn} ........................................ user.articles › users/articles/[User-wrong_column].blade.php
+          GET       /users/movies/{user}/{movie} ............... users/movies/[.Tests.Feature.Fixtures.User]/[.Tests.Feature.Fixtures.Movie]/index.blade.php
           GET       /users/nuno .......................................................................................... users.nuno › users/nuno.blade.php
           GET       /users/{id} .......................................................................................... users.show › users/[id].blade.php
 
-                                                                                                                                         Showing [17] routes
+                                                                                                                                         Showing [18] routes
 
 
         EOF);
@@ -128,10 +129,11 @@
           GET       /non-routables/{nonRoutable} ............................................. non-routables/[.Tests.Feature.Fixtures.NonRoutable].blade.php
           GET       /posts/{lowerCase}/{upperCase}/{podcast}/{user:email}/show posts.show › posts/[lowerCase]/[UpperCase]/[Podcast]/[User-email]/show.bla…
           GET       /users/articles/{user:wrongColumn} ........................................ user.articles › users/articles/[User-wrong_column].blade.php
+          GET       /users/movies/{user}/{movie} ............... users/movies/[.Tests.Feature.Fixtures.User]/[.Tests.Feature.Fixtures.Movie]/index.blade.php
           GET       /users/nuno .......................................................................................... users.nuno › users/nuno.blade.php
           GET       /users/{id} .......................................................................................... users.show › users/[id].blade.php
 
-                                                                                                                                         Showing [12] routes
+                                                                                                                                         Showing [13] routes
 
 
         EOF);
@@ -230,12 +232,13 @@
           GET       /podcasts/{podcast}/comments/{comment:id} tests/Feature/resources/views/pages/podcasts/[.Tests.Feature.Fixtures.Podcast]/comments/[.Tes…
           GET       /posts/{lowerCase}/{upperCase}/{podcast}/{user:email}/show posts.show › tests/Feature/resources/views/pages/posts/[lowerCase]/[UpperC…
           GET       /users/articles/{user:wrongColumn} .... user.articles › tests/Feature/resources/views/pages/users/articles/[User-wrong_column].blade.php
+          GET       /users/movies/{user}/{movie} tests/Feature/resources/views/pages/users/movies/[.Tests.Feature.Fixtures.User]/[.Tests.Feature.Fixtures.M…
           GET       /users/nuno ...................................................... users.nuno › tests/Feature/resources/views/pages/users/nuno.blade.php
           GET       /users/{id} ...................................................... users.show › tests/Feature/resources/views/pages/users/[id].blade.php
           GET       /{...user} ................................................................ tests/Feature/resources/views/more-pages/[...User].blade.php
           GET       /{...user}/detail ......................... more-pages.user.detail › tests/Feature/resources/views/more-pages/[...User]/detail.blade.php
 
-                                                                                                                                         Showing [20] routes
+                                                                                                                                         Showing [21] routes
 
 
         EOF);

diff --git a/tests/Feature/Fixtures/Movie.php b/tests/Feature/Fixtures/Movie.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace Tests\Feature\Fixtures;
+
+use Illuminate\Database\Eloquent\Model;
+
+class Movie extends Model
+{
+    protected $table = 'movies';
+
+    protected $guarded = [];
+
+    public function user()
+    {
+        return $this->belongsTo(User::class, 'user_id');
+    }
+}
diff --git a/tests/Feature/Fixtures/User.php b/tests/Feature/Fixtures/User.php
@@ -9,6 +9,11 @@ class User extends BaseUser
 {
     protected $guarded = [];
 
+    public function movies(): HasMany
+    {
+        return $this->hasMany(Movie::class);
+    }
+
     public function books(): HasMany
     {
         return $this->hasMany(Book::class);

diff --git a/tests/Feature/ModelBindingTest.php b/tests/Feature/ModelBindingTest.php
@@ -5,8 +5,23 @@
 use Laravel\Folio\Pipeline\PotentiallyBindablePathSegment;
 use Tests\Feature\Fixtures\Event;
 use Tests\Feature\Fixtures\Podcast;
+use Tests\Feature\Fixtures\User;
 
 beforeEach(function () {
+    Schema::create('users', function ($table) {
+        $table->id();
+        $table->string('name');
+        $table->string('email')->unique();
+        $table->timestamps();
+    });
+
+    Schema::create('movies', function ($table) {
+        $table->id();
+        $table->foreignId('user_id');
+        $table->string('name');
+        $table->timestamps();
+    });
+
     Schema::create('podcasts', function ($table) {
         $table->id();
         $table->string('name');
@@ -79,6 +94,25 @@
     $this->get('/podcasts/missing-id')->assertNotFound();
 });
 
+test('child implicit bindings are resolved', function () {
+    $user = User::create([
+        'name' => 'test-name',
+        'email' => '[email protected]',
+    ]);
+
+    $user->movies()->create([
+        'name' => 'test-movie-name',
+    ]);
+
+    $movie = $user->movies()->create([
+        'name' => 'test-movie-name-2',
+    ]);
+
+    $this->get('/users/movies/'.$user->id.'/'.$movie->id)->assertSee(
+        'test-name: test-movie-name-2.',
+    );
+});
+
 test('child implicit bindings are scoped to the parent if field is present', function () {
     $podcast = Podcast::create([
         'name' => 'test-podcast-name',

diff --git a/...ers/movies/[.Tests.Feature.Fixtures.User]/[.Tests.Feature.Fixtures.Movie]/index.blade.php b/...ers/movies/[.Tests.Feature.Fixtures.User]/[.Tests.Feature.Fixtures.Movie]/index.blade.php
@@ -0,0 +1,3 @@
+<div>
+    {{ $user->name }}: {{ $movie->name }}.
+</div>