bugfixes

keeko · Jul 21, 2016 · 5621bf5 · 5621bf5
1 parent f342dc6
commit 5621bf5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/src/kernel/AbstractKernel.php b/src/kernel/AbstractKernel.php
@@ -8,9 +8,6 @@
 use keeko\framework\service\ServiceContainer;
 use phootwork\collection\Map;
 use Symfony\Component\EventDispatcher\EventDispatcher;
-use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\HttpFoundation\Cookie;
-use keeko\core\model\ApplicationUriQuery;
 
 abstract class AbstractKernel {
 

diff --git a/src/routing/ApplicationRouter.php b/src/routing/ApplicationRouter.php
@@ -33,13 +33,14 @@ public function match($request) {
 			->filterByHttphost($request->getHttpHost())
 			->find();
 
-		$requestUri = new Text($request->getRequestUri());
+		$requestUri = Text::create($request->getRequestUri())->trimRight('/');
 		foreach ($uris as $uri) {
 			$basepath = new Text($uri->getBasepath());
 
 			// either request uri and uri basepath are both empty
 			// or request uri starts with basepath
-			if (($basepath->isEmpty() && $requestUri->isEmpty()) || $requestUri->startsWith($basepath)) {
+			if (($basepath->isEmpty() && $uri->getHttphost() == $request->getHttpHost())
+					|| $requestUri->startsWith($basepath)) {
 				// assign when it's the first found
 				if ($found === null) {
 					$found = $uri;