Merge pull request #17 from CasperLaiTW/fix-middleware-closure

Fix controller middleware maybe is closure
garygreen · Nov 5, 2016 · 01401de · 01401de
2 parents b67503f + ee2f5b1
commit 01401de
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/src/MainMiddleware.php b/src/MainMiddleware.php
@@ -17,8 +17,12 @@ public function handle($request, Closure $next)
     {
         if ($request->is(config('pretty-routes.url')))
         {
+            $middlewareClosure = function ($middleware) {
+                return $middleware instanceof Closure ? 'Closure' : $middleware;
+            };
             return new Response(view('pretty-routes::routes', [
                 'routes' => Route::getRoutes(),
+                'middlewareClosure' => $middlewareClosure,
             ]));
         }
 

diff --git a/views/routes.blade.php b/views/routes.blade.php
@@ -63,7 +63,7 @@
                     <td>{!! preg_replace('#(@.*)$#', '<span class="text-warning">$1</span>', $route->getActionName()) !!}</td>
                     <td>
                       @if (method_exists($route, 'controllerMiddleware'))
-                        {{ implode(', ', array_merge($route->middleware(), $route->controllerMiddleware())) }}
+                        {{ implode(', ', array_map($middlewareClosure, array_merge($route->middleware(), $route->controllerMiddleware()))) }}
                       @else
                         {{ implode(', ', $route->middleware()) }}
                       @endif