Merge pull request dingo#1314 from denpamusic/master

Laravel 5.4 Illuminate/Routing/Route class changes.
xiaohash · Jan 25, 2017 · 446bab2 · 446bab2
2 parents 9427f5c + 8d3aee0
commit 446bab2
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/src/Routing/Adapter/Laravel.php b/src/Routing/Adapter/Laravel.php
@@ -5,8 +5,8 @@
 use Illuminate\Http\Request;
 use Illuminate\Routing\Route;
 use Illuminate\Routing\Router;
-use Illuminate\Routing\RouteCollection;
 use Dingo\Api\Contract\Routing\Adapter;
+use Illuminate\Routing\RouteCollection;
 use Dingo\Api\Exception\UnknownVersionException;
 
 class Laravel implements Adapter
@@ -119,6 +119,10 @@ protected function mergeOldRoutes($version)
      */
     public function getRouteProperties($route, Request $request)
     {
+        if (method_exists($route, 'uri') && method_exists($route, 'methods')) {
+            return [$route->uri(), $route->methods(), $route->getAction()];
+        }
+
         return [$route->getUri(), $route->getMethods(), $route->getAction()];
     }