Merge pull request #253 from JoostK/global-wheres

Allow for setting of parameter patterns globally on the router

Author: taylorotwell

src/Illuminate/Routing/Router.php

@@ -66,6 +66,13 @@ class Router {
 	 */
 	protected $inspector;
 
+	/**
+	 * The global parameter patterns.
+	 *
+	 * @var array
+	 */
+	protected $patterns = array();
+
 	/**
 	 * The registered route binders.
 	 *
@@ -543,6 +550,8 @@ protected function createRoute($method, $pattern, $action)
 
 		))->setRouter($this);
 
+		$route->addRequirements($this->patterns);
+
 		$route->setRequirement('_method', $method);
 
 		// Once we have created the route, we will add them to our route collection
@@ -1037,6 +1046,18 @@ protected function callGlobalFilter(Request $request, $name, array $parameters =
 		}
 	}
 
+	/**
+	 * Set a global where pattern on all routes
+	 *
+	 * @param  string  $key
+	 * @param  string  $pattern
+	 * @return void
+	 */
+	public function pattern($key, $pattern)
+	{
+		$this->patterns[$key] = $pattern;
+	}
+
 	/**
 	 * Register a model binder for a wildcard.
 	 *

tests/Routing/RoutingTest.php

@@ -350,12 +350,28 @@ public function testFiltersCanBeDisabled()
 	}
 
 
+	/**
+	 * @expectedException Symfony\Component\HttpKernel\Exception\NotFoundHttpException
+	 */
 	public function testWhereMethodForcesRegularExpressionMatch()
 	{
 		$router = new Router;
 		$router->get('/foo/{name}/{age}', function($name, $age) { return $name.$age; })->where('age', '[0-9]+');
-		$request = Request::create('/foo/taylor/25', 'GET');
-		$this->assertEquals('taylor25', $router->dispatch($request)->getContent());
+		$request = Request::create('/foo/taylor/abc', 'GET');
+		$this->assertEquals('taylorabc', $router->dispatch($request)->getContent());
+	}
+
+
+	/**
+	 * @expectedException Symfony\Component\HttpKernel\Exception\NotFoundHttpException
+	 */
+	public function testGlobalParameterPatternsAreApplied()
+	{
+		$router = new Router;
+		$router->pattern('age', '[0-9]+');
+		$router->get('/foo/{name}/{age}', function($name, $age) { return $name.$age; });
+		$request = Request::create('/foo/taylor/abc', 'GET');
+		$this->assertEquals('taylorabc', $router->dispatch($request)->getContent());
 	}