Merge pull request laravel#86 from jasonlewis/feature/custom-fastroute-dispatcher

taylorotwell · taylorotwell · commit c5ffd8262c00 · 2015-05-08T07:53:37.000-05:00
Allow developers to register their own FastRoute dispatcher with the app.
diff --git a/src/Application.php b/src/Application.php
@@ -128,6 +128,13 @@ class Application extends Container implements ApplicationContract, HttpKernelIn
      */
     protected $ranServiceBinders = [];
 
+    /**
+     * The FastRoute dispatcher.
+     *
+     * @var \FastRoute\Dispatcher
+     */
+    protected $dispatcher;
+
     /**
      * Create a new Lumen application instance.
      *
@@ -1098,13 +1105,24 @@ public function dispatch($request = null)
      */
     protected function createDispatcher()
     {
-        return \FastRoute\simpleDispatcher(function ($r) {
+        return $this->dispatcher ?: \FastRoute\simpleDispatcher(function ($r) {
             foreach ($this->routes as $route) {
                 $r->addRoute($route['method'], $route['uri'], $route['action']);
             }
         });
     }
 
+    /**
+     * Set the FastRoute dispatcher instance.
+     *
+     * @param  \FastRoute\Dispatcher  $dispatcher
+     * @return void
+     */
+    public function setDispatcher(Dispatcher $dispatcher)
+    {
+        $this->dispatcher = $dispatcher;
+    }
+
     /**
      * Handle the response from the FastRoute dispatcher.
      *
diff --git a/tests/FullApplicationTest.php b/tests/FullApplicationTest.php
@@ -333,6 +333,25 @@ public function testRegisterServiceProvider()
         $provider = new LumenTestServiceProvider($app);
         $app->register($provider);
     }
+
+
+    public function testUsingCustomDispatcher()
+    {
+        $routes = new FastRoute\RouteCollector(new FastRoute\RouteParser\Std, new FastRoute\DataGenerator\GroupCountBased);
+
+        $routes->addRoute('GET', '/', [function () {
+            return response('Hello World');
+        }]);
+
+        $app = new Application;
+
+        $app->setDispatcher(new FastRoute\Dispatcher\GroupCountBased($routes->getData()));
+
+        $response = $app->handle(Request::create('/', 'GET'));
+
+        $this->assertEquals(200, $response->getStatusCode());
+        $this->assertEquals('Hello World', $response->getContent());
+    }
 }
 
 class LumenTestService {}
