Use the regular routes for the UrlGenerator and implemented an iterable routes method so we can get a normalized, iterable array of routes from each adapter.

Signed-off-by: Jason Lewis <[email protected]>

Author: jasonlewis

src/Contract/Routing/Adapter.php

@@ -47,6 +47,16 @@ public function addRoute(array $methods, array $versions, $uri, $action);
      */
     public function getRoutes($version = null);
 
+    /**
+     * Get a normalized iterable set of routes. Top level key must be a version with each
+     * version containing iterable routes that can be consumed by the adapter.
+     *
+     * @param string $version
+     *
+     * @return mixed
+     */
+    public function getIterableRoutes($version = null);
+
     /**
      * Set the routes on the adapter.
      *

src/Provider/ApiServiceProvider.php

@@ -205,7 +205,7 @@ protected function registerUrlGenerator()
         $this->app->singleton('api.url', function ($app) {
             $url = new UrlGenerator($app['request']);
 
-            $url->setRouteCollections($app['api.router']->getAdapterRoutes());
+            $url->setRouteCollections($app['api.router']->getRoutes());
 
             return $url;
         });

src/Routing/Adapter/Laravel.php

@@ -151,6 +151,11 @@ public function getRoutes($version = null)
         return $this->routes;
     }
 
+    public function getIterableRoutes($version = null)
+    {
+        return $this->getRoutes($version);
+    }
+
     /**
      * Set the routes on the adapter.
      *

src/Routing/Adapter/Lumen.php

@@ -2,6 +2,7 @@
 
 namespace Dingo\Api\Routing\Adapter;
 
+use ArrayIterator;
 use ReflectionClass;
 use FastRoute\Dispatcher;
 use FastRoute\RouteParser;
@@ -102,11 +103,11 @@ public function dispatch(Request $request, $version)
      */
     public function getRouteProperties($route, Request $request)
     {
-        $uri = ltrim($request->getRequestUri(), '/');
-        $methods = (array) $request->getMethod();
-        $action = $route[1];
+        $uri = ltrim(isset($route['uri']) ? $route['uri'] : $request->getRequestUri(), '/');
+        $methods = isset($route['methods']) ? $route['methods'] : (array) $request->getMethod();
+        $action = (isset($route[1]) && is_array($route[1])) ? $route[1] : $route;
 
-        if ($request->getMethod() === 'GET') {
+        if ($request->getMethod() === 'GET' && ! in_array('HEAD', $methods)) {
             $methods[] = 'HEAD';
         }
 
@@ -219,6 +220,29 @@ public function getRoutes($version = null)
         return $this->routes;
     }
 
+    /**
+     * Get routes in an iterable form.
+     *
+     * @param string $version
+     *
+     * @return \ArrayIterator
+     */
+    public function getIterableRoutes($version = null)
+    {
+        $itrerable = [];
+
+        foreach ($this->getRoutes($version) as $version => $routes) {
+            foreach ($routes->getData()[0] as $uri => $route) {
+                $methods = array_keys($route);
+                $route = array_shift($route);
+
+                $iterable[$version][$uri] = array_merge($route, compact('uri', 'methods'));
+            }
+        }
+
+        return new ArrayIterator($iterable);
+    }
+
     /**
      * Set the routes on the adapter.
      *

src/Routing/Router.php

@@ -721,7 +721,7 @@ public function getLastGroupPrefix()
      */
     public function getRoutes($version = null)
     {
-        $routes = $this->adapter->getRoutes($version);
+        $routes = $this->adapter->getIterableRoutes($version);
 
         if (! is_null($version)) {
             $routes = [$version => $routes];
@@ -761,9 +761,9 @@ public function getAdapterRoutes()
      */
     public function setAdapterRoutes(array $routes)
     {
-        $this->container->instance('api.routes', $routes);
-
         $this->adapter->setRoutes($routes);
+
+        $this->container->instance('api.routes', $this->getRoutes());
     }
 
     /**

tests/Stubs/RoutingAdapterStub.php

@@ -3,6 +3,7 @@
 namespace Dingo\Api\Tests\Stubs;
 
 use Closure;
+use ArrayIterator;
 use Illuminate\Http\Request;
 use Dingo\Api\Http\Response;
 use Dingo\Api\Contract\Routing\Adapter;
@@ -107,6 +108,11 @@ public function getRoutes($version = null)
         return $this->routes;
     }
 
+    public function getIterableRoutes($version = null)
+    {
+        return new ArrayIterator($this->getRoutes($version));
+    }
+
     public function setRoutes(array $routes)
     {
         //