Work on leading optional parameters.

taylorotwell · taylorotwell · commit 6ea8d8b5b3c9 · 2013-09-27T09:06:40.000-05:00
diff --git a/src/Illuminate/Routing/Matching/UriValidator.php b/src/Illuminate/Routing/Matching/UriValidator.php
@@ -14,6 +14,8 @@ class UriValidator implements ValidatorInterface {
 	 */
 	public function matches(Route $route, Request $request)
 	{
+		//dd($route->uriExpression());
+		//return dd(preg_match('#^(\/)$|^(?:([a-zA-Z0-9\.\-_%=]+))?$#u', 'foo/bar'));
 		return preg_match($route->uriExpression(), $request->path());
 	}
 
diff --git a/src/Illuminate/Routing/Route.php b/src/Illuminate/Routing/Route.php
@@ -72,6 +72,13 @@ class Route {
 	 */
 	protected static $optional = '(?:/([a-zA-Z0-9\.\-_%=]+)';
 
+	/**
+	 * The regular expression for a leading optional wildcard.
+	 *
+	 * @var string
+	 */
+	protected static $leadingOptional = '\/$|^(?:([a-zA-Z0-9\.\-_%=]+)';
+
 	/**
 	 * The validators used by the routes.
 	 *
@@ -487,7 +494,11 @@ protected static function compileStandardOptional($value, $custom = 0)
 	{
 		$value = preg_replace('/\/\{(.*?)\?\}/', static::$optional, $value, -1, $count);
 
-		return $count + $custom > 0 ? $value .= str_repeat(')?', $count + $custom) : $value;
+		$value = preg_replace('/^(\{(.*?)\?\})/', static::$leadingOptional, $value, -1, $leading);
+
+		$total = $leading + $count + $custom;
+
+		return $total > 0 ? $value .= str_repeat(')?', $total) : $value;
 	}
 
 	/**
diff --git a/src/Illuminate/Routing/Router.php b/src/Illuminate/Routing/Router.php
@@ -654,7 +654,7 @@ protected function createRoute($methods, $uri, $action)
 
 		$route = with(new Route(
 			$methods, $uri = $this->prefix($uri), $action)
-	);
+		);
 
 		$route->where($this->patterns);
 
diff --git a/tests/Routing/RoutingRouteTest.php b/tests/Routing/RoutingRouteTest.php
@@ -29,6 +29,32 @@ public function testBasicDispatchingOfRoutes()
 		$router = $this->getRouter();
 		$router->get('foo/{name}/boom/{age?}/{location?}', function($name, $age = 25, $location = 'AR') { return $name.$age.$location; });
 		$this->assertEquals('taylor30AR', $router->dispatch(Request::create('foo/taylor/boom/30', 'GET'))->getContent());
+
+		$router = $this->getRouter();
+		$router->get('{bar}/{baz?}', function($name, $age = 25) { return $name.$age; });
+		$this->assertEquals('taylor25', $router->dispatch(Request::create('taylor', 'GET'))->getContent());
+
+		$router = $this->getRouter();
+		$router->get('{baz?}', function($age = 25) { return $age; });
+		$this->assertEquals('25', $router->dispatch(Request::create('/', 'GET'))->getContent());
+		$this->assertEquals('30', $router->dispatch(Request::create('30', 'GET'))->getContent());
+
+		$router = $this->getRouter();
+		$router->get('{foo?}/{baz?}', function($name = 'taylor', $age = 25) { return $name.$age; });
+		$this->assertEquals('taylor25', $router->dispatch(Request::create('/', 'GET'))->getContent());
+		$this->assertEquals('fred25', $router->dispatch(Request::create('fred', 'GET'))->getContent());
+		$this->assertEquals('fred30', $router->dispatch(Request::create('fred/30', 'GET'))->getContent());
+	}
+
+
+	/**
+	 * @expectedException Symfony\Component\HttpKernel\Exception\NotFoundHttpException
+	 */
+	public function testRoutesDontMatchNonMatchingPathsWithLeadingOptionals()
+	{
+		$router = $this->getRouter();
+		$router->get('{baz?}', function($age = 25) { return $age; });
+		$this->assertEquals('25', $router->dispatch(Request::create('foo/bar', 'GET'))->getContent());;		
 	}
 
 

Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,8 @@ class UriValidator implements ValidatorInterface {`
`14`	`14`	`*/`
`15`	`15`	`public function matches(Route $route, Request $request)`
`16`	`16`	`{`
	`17`	`+ //dd($route->uriExpression());`
	`18`	`+ //return dd(preg_match('#^(\/)$\|^(?:([a-zA-Z0-9\.\-_%=]+))?$#u', 'foo/bar'));`
`17`	`19`	`return preg_match($route->uriExpression(), $request->path());`
`18`	`20`	`}`
`19`	`21`