From 14772469ed0c68968d2b6db4e6525bd4b3b7c176 Mon Sep 17 00:00:00 2001 From: James Cole Date: Fri, 9 Feb 2018 19:23:31 +0100 Subject: [PATCH] Remove reference to guard from binder --- app/Http/Middleware/Binder.php | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/app/Http/Middleware/Binder.php b/app/Http/Middleware/Binder.php index 864a75a68a..415dbe2474 100644 --- a/app/Http/Middleware/Binder.php +++ b/app/Http/Middleware/Binder.php @@ -25,7 +25,6 @@ namespace FireflyIII\Http\Middleware; use Closure; use FireflyIII\Support\Domain; use Illuminate\Contracts\Auth\Factory as Auth; -use Illuminate\Http\Request; use Illuminate\Routing\Route; /** @@ -68,16 +67,9 @@ class Binder */ public function handle($request, Closure $next, ...$guards) { - $middleware = $request->route()->middleware(); - $guard = 'web'; - if(in_array('auth:api', $middleware)) { - $guard = 'api'; - } - $guard = auth()->guard($guard); - foreach ($request->route()->parameters() as $key => $value) { if (isset($this->binders[$key])) { - $boundObject = $this->performBinding($guard, $key, $value, $request->route()); + $boundObject = $this->performBinding($key, $value, $request->route()); $request->route()->setParameter($key, $boundObject); } } @@ -92,9 +84,10 @@ class Binder * * @return mixed */ - private function performBinding($guard, string $key, string $value, Route $route) + private function performBinding(string $key, string $value, Route $route) { $class = $this->binders[$key]; - return $class::routeBinder($guard, $value, $route); + + return $class::routeBinder($value, $route); } }