add baseUrl handling in route listener

phly · Oct 26, 2013 · 499b941 · 499b941
1 parent 107a69d
commit 499b941
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 1 deletion.
diff --git a/library/Phlyty/App.php b/library/Phlyty/App.php
@@ -742,12 +742,16 @@ protected function registerRouteListener()
 
             $request = $e->getParam('request');
             $routes  = $this->routesByMethod[$method];
+
+            $baseUrl = $request->getBaseUrl();
+            $baseUrlLength = strlen($baseUrl) ?: null;
+
             foreach ($routes as $index => $route) {
                 if ($index <= $this->routeIndex) {
                     // Skip over routes we've already looked at
                     continue;
                 }
-                $result = $route->route()->match($request);
+                $result = $route->route()->match($request, $baseUrlLength);
                 if ($result) {
                     $this->routeIndex = $index;
                     $this->params     = $result;

diff --git a/tests/PhlytyTest/AppTest.php b/tests/PhlytyTest/AppTest.php
@@ -523,4 +523,20 @@ public function testCanProvideViewModelPrototype()
         $this->assertNotInstanceOf('Phlyty\View\MustacheViewModel', $test);
         $this->assertNotSame($model, $test);
     }
+
+    public function testRouteMatchWithBaseUrl()
+    {
+        $foo = $this->app->get('/foo', function ($app) {
+            $app->response()->setContent('Foo bar!');
+        });
+
+        $this->app->request()->setBaseUrl('/bar/baz');
+
+        $request = $this->app->request();
+        $request->setMethod('GET')
+            ->setUri('/bar/baz/foo');
+        $this->app->run();
+        $response = $this->app->response();
+        $this->assertEquals('Foo bar!', $response->sentContent);
+    }
 }