Properly handle requests with a trailing slash in Lumen and add test coverage for all adapters.

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

Author: jasonlewis

src/Routing/Adapter/Lumen.php

@@ -90,9 +90,27 @@ public function dispatch(Request $request, $version)
             new $this->dispatcher($routes->getData())
         );
 
+        $this->normalizeRequestUri($request);
+
         return $this->app->dispatch($request);
     }
 
+    /**
+     * Normalize the request URI so that Lumen can properly dispatch it.
+     *
+     * @param \Illuminate\Http\Request $request
+     *
+     * @return void
+     */
+    protected function normalizeRequestUri(Request $request)
+    {
+        $query = $request->server->get('QUERY_STRING');
+
+        $uri = '/'.trim(str_replace('?'.$query, '', $request->server->get('REQUEST_URI')), '/').'?'.$query;
+
+        $request->server->set('REQUEST_URI', $uri);
+    }
+
     /**
      * Get the URI, methods, and action from the route.
      *

tests/Routing/Adapter/BaseAdapterTest.php

@@ -81,6 +81,9 @@ public function testBasicRouteVersions()
         $request = $this->createRequest('/foo', 'GET', ['accept' => 'application/vnd.api.v1+json']);
         $this->assertEquals('foo', $this->router->dispatch($request)->getContent());
 
+        $request = $this->createRequest('/foo/', 'GET', ['accept' => 'application/vnd.api.v1+json']);
+        $this->assertEquals('foo', $this->router->dispatch($request)->getContent(), 'Could not dispatch request with trailing slash.');
+
         $request = $this->createRequest('/foo', 'GET', ['accept' => 'application/vnd.api.v2+json']);
         $this->assertEquals('bar', $this->router->dispatch($request)->getContent());