[5.4] Handle model instance in Authorize middleware

src/Illuminate/Auth/Middleware/Authorize.php

@@ -4,6 +4,7 @@
 
 use Closure;
 use Illuminate\Contracts\Auth\Access\Gate;
+use Illuminate\Database\Eloquent\Model;
 use Illuminate\Contracts\Auth\Factory as Auth;
 
 class Authorize
@@ -70,7 +71,9 @@ protected function getGateArguments($request, $models)
         }
 
         return collect($models)->map(function ($model) use ($request) {
-            return $this->getModel($request, $model);
+            return $model instanceof Model
+                ?$model
+                :$this->getModel($request, $model);
         })->all();
     }
 

tests/Auth/AuthorizeMiddlewareTest.php

@@ -187,6 +187,28 @@ public function testModelAuthorized()
         $this->assertEquals($response->content(), 'success');
     }
 
+    public function testModelInstanceAsParameter()
+    {
+        $instance = m::mock(\Illuminate\Database\Eloquent\Model::class);
+
+        $this->gate()->define('success', function ($user, $model) use ($instance) {
+            $this->assertSame($model, $instance);
+
+            return true;
+        });
+
+        $request = m::mock(Request::class);
+
+        $nextParam = null;
+
+        $next = function ($param) use (&$nextParam) {
+            $nextParam = $param;
+        };
+
+        (new Authorize($this->container->make(Auth::class), $this->gate()))
+            ->handle($request, $next, 'success', $instance);
+    }
+
     /**
      * Get the Gate instance from the container.
      *