[8.x] Respect custom route key with explicit route model binding (#36375)

* feat: respect route custom key for explicit route model bindings

* tests: close mockery after test

* style: changes from StyleCI

Author: erikgaal

src/Illuminate/Routing/RouteBinding.php

@@ -33,15 +33,15 @@ public static function forCallback($container, $binder)
      */
     protected static function createClassBinding($container, $binding)
     {
-        return function ($value, $route) use ($container, $binding) {
+        return function ($value, $route, $key) use ($container, $binding) {
             // If the binding has an @ sign, we will assume it's being used to delimit
             // the class name from the bind method name. This allows for bindings
             // to run multiple bind methods in a single class for convenience.
             [$class, $method] = Str::parseCallback($binding, 'bind');
 
             $callable = [$container->make($class), $method];
 
-            return $callable($value, $route);
+            return $callable($value, $route, $key);
         };
     }
 
@@ -57,7 +57,7 @@ protected static function createClassBinding($container, $binding)
      */
     public static function forModel($container, $class, $callback = null)
     {
-        return function ($value) use ($container, $class, $callback) {
+        return function ($value, $route, $key) use ($container, $class, $callback) {
             if (is_null($value)) {
                 return;
             }
@@ -67,7 +67,7 @@ public static function forModel($container, $class, $callback = null)
             // throw a not found exception otherwise we will return the instance.
             $instance = $container->make($class);
 
-            if ($model = $instance->resolveRouteBinding($value)) {
+            if ($model = $instance->resolveRouteBinding($value, $route->bindingFieldFor($key))) {
                 return $model;
             }
 

src/Illuminate/Routing/Router.php

@@ -840,7 +840,7 @@ public function substituteImplicitBindings($route)
      */
     protected function performBinding($key, $value, $route)
     {
-        return call_user_func($this->binders[$key], $value, $route);
+        return call_user_func($this->binders[$key], $value, $route, $key);
     }
 
     /**

tests/Routing/RoutingRouteTest.php

@@ -29,6 +29,7 @@
 use Illuminate\Routing\UrlGenerator;
 use Illuminate\Support\Str;
 use LogicException;
+use Mockery;
 use PHPUnit\Framework\TestCase;
 use stdClass;
 use Symfony\Component\HttpFoundation\Response as SymfonyResponse;
@@ -938,6 +939,36 @@ public function testModelBinding()
         $this->assertSame('TAYLOR', $router->dispatch(Request::create('foo/taylor', 'GET'))->getContent());
     }
 
+    public function testModelBindingWithCustomKey()
+    {
+        // Create the router.
+        $container = new Container();
+        $router = new Router(new Dispatcher(), $container);
+        $container->singleton(Registrar::class, function () use ($router) {
+            return $router;
+        });
+
+        $router->get('foo/{bar:custom}', ['middleware' => SubstituteBindings::class, 'uses' => function ($name) {
+            return $name;
+        }]);
+        $router->model('bar', RouteModelBindingStub::class);
+
+        // Mock the stub so we can verify that the method is called with custom key.
+        $mock = $container->instance(
+            RouteModelBindingStub::class,
+            Mockery::mock(RouteModelBindingStub::class),
+        );
+
+        $mock->shouldReceive('resolveRouteBinding')
+            ->with('taylor', 'custom')
+            ->once()
+            ->andReturn('TAYLOR');
+
+        $this->assertSame('TAYLOR', $router->dispatch(Request::create('foo/taylor', 'GET'))->getContent());
+
+        Mockery::close();
+    }
+
     public function testModelBindingWithNullReturn()
     {
         $this->expectException(ModelNotFoundException::class);