Merge pull request laravel#1408 from cartalyst/develop

taylorotwell · taylorotwell · commit d693a82615bf · 2012-10-31T14:31:50.000-07:00
Allowing use of third party Routers to handle Routing.
diff --git a/laravel/laravel.php b/laravel/laravel.php
@@ -1,5 +1,7 @@
 <?php namespace Laravel;
 
+use Router;
+
 /*
 |--------------------------------------------------------------------------
 | Bootstrap The Framework Core
@@ -102,7 +104,7 @@
 |
 */
 
-Routing\Router::register('*', '(:all)', function()
+Router::register('*', '(:all)', function()
 {
 	return Event::first('404');
 });
@@ -160,7 +162,7 @@
 |
 */
 
-Request::$route = Routing\Router::route(Request::method(), $uri);
+Request::$route = Router::route(Request::method(), $uri);
 
 $response = Request::$route->call();
 

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,7 @@`
`1`	`1`	`<?php namespace Laravel;`
`2`	`2`
	`3`	`+use Router;`
	`4`	`+`
`3`	`5`	`/*`
`4`	`6`	`\|--------------------------------------------------------------------------`
`5`	`7`	`\| Bootstrap The Framework Core`
`@@ -102,7 +104,7 @@`
`102`	`104`	`\|`
`103`	`105`	`*/`
`104`	`106`
`105`		`-Routing\Router::register('*', '(:all)', function()`
	`107`	`+Router::register('*', '(:all)', function()`
`106`	`108`	`{`
`107`	`109`	`return Event::first('404');`
`108`	`110`	`});`
`@@ -160,7 +162,7 @@`
`160`	`162`	`\|`
`161`	`163`	`*/`
`162`	`164`
`163`		`-Request::$route = Routing\Router::route(Request::method(), $uri);`
	`165`	`+Request::$route = Router::route(Request::method(), $uri);`
`164`	`166`
`165`	`167`	`$response = Request::$route->call();`
`166`	`168`