Merge pull request #1115 from koushki/dev

Bug in Router::match using scope
UnionOfRAD · Aug 30, 2014 · 8e046ca · 8e046ca
2 parents 8e5f8a3 + 864638c
commit 8e046ca
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 3 deletions.
diff --git a/net/http/Route.php b/net/http/Route.php
@@ -336,6 +336,13 @@ protected function _matchMethod($options) {
 	protected function _matchKeys($options) {
 		$args = array('args' => 'args');
 
+		$scope = array();
+		if (!empty($options['scope'])) {
+			$scope = (array)$options['scope'] + array('params' => array());
+			$scope = array_flip($scope['params']);
+		}
+		unset($options['scope']);
+
 		if (array_intersect_key($options, $this->_match) != $this->_match) {
 			return false;
 		}
@@ -344,7 +351,7 @@ protected function _matchKeys($options) {
 				return false;
 			}
 		} else {
-			if (array_diff_key(array_diff_key($options, $this->_match), $this->_keys) !== array()) {
+			if (array_diff_key($options, $this->_match + $this->_keys + $scope)) {
 				return false;
 			}
 		}

diff --git a/net/http/Router.php b/net/http/Router.php
@@ -380,7 +380,7 @@ public static function match($url = array(), $context = null, array $options = a
 		$scope = $options['scope'];
 		if (isset(static::$_configurations[$scope])) {
 			foreach (static::$_configurations[$scope] as $route) {
-				if (!$match = $route->match($url, $context)) {
+				if (!$match = $route->match($url + array('scope' => static::attached($scope)), $context)) {
 					continue;
 				}
 				if ($route->canContinue()) {
@@ -456,7 +456,7 @@ protected static function _matchOptions(&$url, $context, $options) {
 
 			$base = isset($config['base']) ? '/' . $config['base'] : $defaults['base'];
 			$base = $base . ($config['prefix'] ? '/' . $config['prefix'] : '');
-			$config['base'] = $config['absolute'] ? '/' . trim($base, '/') : rtrim($base, '/');
+			$config['base'] = rtrim($config['absolute'] ? '/' . trim($base, '/') : $base, '/');
 			$defaults = $config + $defaults;
 		}
 		return $options + $defaults;

diff --git a/tests/cases/net/http/RouterTest.php b/tests/cases/net/http/RouterTest.php
@@ -1900,6 +1900,25 @@ public function testLibraryBasedRoute() {
 		));
 		$this->assertEqual($expected, $result);
 	}
+
+	public function testMatchWithAbsoluteScope() {
+		Router::attach('app', array(
+			'absolute' => true,
+			'host' => '{:domain}',
+		));
+
+		Router::scope('app', function(){
+			Router::connect('/hello', 'Posts::index');
+		});
+
+		$request = new Request(array('url' => '/hello', 'base' => ''));
+		$result = Router::process($request);
+
+		$expected = 'http://' . $result->params['domain'] . '/hello';
+		$result = Router::match($result->params, $request);
+
+		$this->assertEqual($expected, $result);
+	}
 }
 
 ?>