Merge branch '4.1' into 4.2

taylorotwell · taylorotwell · commit 28aab1f8e2d3 · 2014-07-18T11:01:59.000-05:00
diff --git a/src/Illuminate/Routing/Router.php b/src/Illuminate/Routing/Router.php
@@ -749,14 +749,16 @@ public static function mergeGroup($new, $old)
 	 */
 	protected static function formatUsesPrefix($new, $old)
 	{
-		if (isset($new['namespace']))
+		if (isset($new['namespace']) && isset($old['namespace']))
 		{
 			return trim(array_get($old, 'namespace'), '\\').'\\'.trim($new['namespace'], '\\');
 		}
-		else
+		elseif (isset($new['namespace']))
 		{
-			return array_get($old, 'namespace');
+			return trim($new['namespace'], '\\');
 		}
+
+		return array_get($old, 'namespace');
 	}
 
 	/**
@@ -772,10 +774,8 @@ protected static function formatGroupPrefix($new, $old)
 		{
 			return trim(array_get($old, 'prefix'), '/').'/'.trim($new['prefix'], '/');
 		}
-		else
-		{
-			return array_get($old, 'prefix');
-		}
+
+		return array_get($old, 'prefix');
 	}
 
 	/**
diff --git a/tests/Routing/RoutingRouteTest.php b/tests/Routing/RoutingRouteTest.php
@@ -679,6 +679,20 @@ public function testMergingControllerUses()
 		$action = $routes[0]->getAction();
 
 		$this->assertEquals('Namespace\\Nested\\Controller', $action['controller']);
+
+
+		$router = $this->getRouter();
+		$router->group(array('prefix' => 'baz'), function() use ($router)
+		{
+			$router->group(array('namespace' => 'Namespace'), function() use ($router)
+			{
+				$router->get('foo/bar', 'Controller');
+			});
+		});
+		$routes = $router->getRoutes()->getRoutes();
+		$action = $routes[0]->getAction();
+
+		$this->assertEquals('Namespace\\Controller', $action['controller']);
 	}
 
 

Original file line number	Diff line number	Diff line change
`@@ -749,14 +749,16 @@ public static function mergeGroup($new, $old)`
`749`	`749`	`*/`
`750`	`750`	`protected static function formatUsesPrefix($new, $old)`
`751`	`751`	`{`
`752`		`- if (isset($new['namespace']))`
	`752`	`+ if (isset($new['namespace']) && isset($old['namespace']))`
`753`	`753`	`{`
`754`	`754`	`return trim(array_get($old, 'namespace'), '\\').'\\'.trim($new['namespace'], '\\');`
`755`	`755`	`}`
`756`		`- else`
	`756`	`+ elseif (isset($new['namespace']))`
`757`	`757`	`{`
`758`		`- return array_get($old, 'namespace');`
	`758`	`+ return trim($new['namespace'], '\\');`
`759`	`759`	`}`
	`760`	`+`
	`761`	`+ return array_get($old, 'namespace');`
`760`	`762`	`}`
`761`	`763`
`762`	`764`	`/**`
`@@ -772,10 +774,8 @@ protected static function formatGroupPrefix($new, $old)`
`772`	`774`	`{`
`773`	`775`	`return trim(array_get($old, 'prefix'), '/').'/'.trim($new['prefix'], '/');`
`774`	`776`	`}`
`775`		`- else`
`776`		`- {`
`777`		`- return array_get($old, 'prefix');`
`778`		`- }`
	`777`	`+`
	`778`	`+ return array_get($old, 'prefix');`
`779`	`779`	`}`
`780`	`780`
`781`	`781`	`/**`