Properly allow array of route requiremnts.

jasonlewis · jasonlewis · commit ab8b474e0e99 · 2013-04-22T20:31:35.000+10:00
Signed-off-by: Jason Lewis &lt;jason.lewis1991@gmail.com&gt;
diff --git a/src/Illuminate/Routing/Route.php b/src/Illuminate/Routing/Route.php
@@ -313,7 +313,7 @@ public function getParameterKeys()
 	 * @param  string  $expression
 	 * @return \Illuminate\Routing\Route
 	 */
-	public function where($name, $expression)
+	public function where($name, $expression = null)
 	{
 		if (is_array($name)) return $this->setArrayOfWheres($name);
 
diff --git a/tests/Routing/RoutingTest.php b/tests/Routing/RoutingTest.php
@@ -373,6 +373,15 @@ public function testFiltersCanBeDisabled()
 	}
 
 
+	public function testWhereAcceptsArrayOfRequirements()
+	{
+		$router = new Router;
+		$router->get('/foo/{name}/{age}', function($name, $age) { return $name.$age; })->where(['age' => '[0-9]+']);
+		$request = Request::create('/foo/jason/22', 'GET');
+		$this->assertEquals('jason22', $router->dispatch($request)->getContent());
+	}
+
+
 	/**
 	 * @expectedException Symfony\Component\HttpKernel\Exception\NotFoundHttpException
 	 */

Original file line number	Diff line number	Diff line change
`@@ -313,7 +313,7 @@ public function getParameterKeys()`
`313`	`313`	`* @param string $expression`
`314`	`314`	`* @return \Illuminate\Routing\Route`
`315`	`315`	`*/`
`316`		`- public function where($name, $expression)`
	`316`	`+ public function where($name, $expression = null)`
`317`	`317`	`{`
`318`	`318`	`if (is_array($name)) return $this->setArrayOfWheres($name);`
`319`	`319`