Fix inherited custom route key name detection (#540)

* Add failing test for inherited custom route key name

* Wip

* Fix

Author: bakerkretzmar

src/Ziggy.php

@@ -3,6 +3,7 @@
 namespace Tightenco\Ziggy;
 
 use Illuminate\Contracts\Routing\UrlRoutable;
+use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Arr;
 use Illuminate\Support\Reflector;
 use Illuminate\Support\Str;
@@ -174,7 +175,7 @@ private function resolveBindings(array $routes): array
                     ? Reflector::getParameterClassName($parameter)
                     : $parameter->getType()->getName();
                 $override = (new ReflectionClass($model))->isInstantiable()
-                    && $model === (new ReflectionMethod($model, 'getRouteKeyName'))->class;
+                    && (new ReflectionMethod($model, 'getRouteKeyName'))->class !== Model::class;
 
                 // Avoid booting this model if it doesn't override the default route key name
                 $bindings[$parameter->getName()] = $override ? app($model)->getRouteKeyName() : 'id';

tests/Unit/RouteModelBindingTest.php

@@ -17,6 +17,9 @@ protected function setUp(): void
         $router->get('users/{user}', function (User $user) {
             return '';
         })->name('users');
+        $router->get('admins/{admin}', function (Admin $admin) {
+            return '';
+        })->name('admins');
         $router->get('tags/{tag}', function (Tag $tag) {
             return '';
         })->name('tags');
@@ -58,6 +61,22 @@ public function can_register_implicit_route_model_bindings()
         $this->assertSame($expected, (new Ziggy)->filter('users')->toArray()['routes']);
     }
 
+    /** @test */
+    public function register_inherited_custom_route_key_name()
+    {
+        $expected = [
+            'admins' => [
+                'uri' => 'admins/{admin}',
+                'methods' => ['GET', 'HEAD'],
+                'bindings' => [
+                    'admin' => 'uuid',
+                ],
+            ],
+        ];
+
+        $this->assertSame($expected, (new Ziggy)->filter('admins')->toArray()['routes']);
+    }
+
     /** @test */
     public function can_ignore_route_parameters_not_bound_to_eloquent_models()
     {
@@ -139,6 +158,13 @@ public function can_merge_implicit_and_scoped_bindings()
                     'user' => 'uuid',
                 ],
             ],
+            'admins' => [
+                'uri' => 'admins/{admin}',
+                'methods' => ['GET', 'HEAD'],
+                'bindings' => [
+                    'admin' => 'uuid',
+                ],
+            ],
             'tags' => [
                 'uri' => 'tags/{tag}',
                 'methods' => ['GET', 'HEAD'],
@@ -188,7 +214,7 @@ public function can_include_bindings_in_json()
             $this->markTestSkipped('Requires Laravel >=7');
         }
 
-        $json = '{"url":"http:\/\/ziggy.dev","port":null,"defaults":{},"routes":{"users":{"uri":"users\/{user}","methods":["GET","HEAD"],"bindings":{"user":"uuid"}},"tags":{"uri":"tags\/{tag}","methods":["GET","HEAD"],"bindings":{"tag":"id"}},"tokens":{"uri":"tokens\/{token}","methods":["GET","HEAD"]},"users.numbers":{"uri":"users\/{user}\/{number}","methods":["GET","HEAD"],"bindings":{"user":"uuid"}},"users.store":{"uri":"users","methods":["POST"]},"posts":{"uri":"blog\/{category}\/{post}","methods":["GET","HEAD"],"bindings":{"category":"id","post":"slug"}},"posts.tags":{"uri":"blog\/{category}\/{post}\/{tag}","methods":["GET","HEAD"],"bindings":{"category":"id","post":"slug","tag":"slug"}}}}';
+        $json = '{"url":"http:\/\/ziggy.dev","port":null,"defaults":{},"routes":{"users":{"uri":"users\/{user}","methods":["GET","HEAD"],"bindings":{"user":"uuid"}},"admins":{"uri":"admins\/{admin}","methods":["GET","HEAD"],"bindings":{"admin":"uuid"}},"tags":{"uri":"tags\/{tag}","methods":["GET","HEAD"],"bindings":{"tag":"id"}},"tokens":{"uri":"tokens\/{token}","methods":["GET","HEAD"]},"users.numbers":{"uri":"users\/{user}\/{number}","methods":["GET","HEAD"],"bindings":{"user":"uuid"}},"users.store":{"uri":"users","methods":["POST"]},"posts":{"uri":"blog\/{category}\/{post}","methods":["GET","HEAD"],"bindings":{"category":"id","post":"slug"}},"posts.tags":{"uri":"blog\/{category}\/{post}\/{tag}","methods":["GET","HEAD"],"bindings":{"category":"id","post":"slug","tag":"slug"}}}}';
 
         $this->assertSame($json, (new Ziggy)->toJson());
     }
@@ -256,3 +282,8 @@ public static function boot()
         static::$wasBooted = true;
     }
 }
+
+class Admin extends User
+{
+    //
+}