Working on routing.

danieljames · Dec 13, 2013 · ee8639d · ee8639d
1 parent f48e599
commit ee8639d
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 10 deletions.
diff --git a/src/Illuminate/Routing/Route.php b/src/Illuminate/Routing/Route.php
@@ -441,14 +441,15 @@ public function uriExpression($delimit = true)
 	public static function compileString($value, $delimit = true, array $wheres = array())
 	{
 		$value = static::prepareString($value);
+
 		$value = static::compileOptional(static::compileParameters($value, $wheres), $wheres);
 
 		return $delimit ? static::delimit($value) : $value;
 	}
-	
+
 	/**
 	 * Prepare a string for use as regular expression.
-	 * 
+	 *
 	 * @param  string  $value
 	 * @return string
 	 */
@@ -468,7 +469,7 @@ protected static function compileParameters($value, array $wheres = array())
 	{
 		$value = static::compileWhereParameters($value, $wheres);
 
-		return preg_replace('/\{([A-Za-z\-\_]+)\}/', static::$wildcard, $value);
+		return preg_replace('/\{([A-Za-z\-\_]+?)\}/', static::$wildcard, $value);
 	}
 
 	/**
@@ -511,9 +512,9 @@ protected static function compileOptional($value, $wheres = array())
 	 */
 	protected static function compileStandardOptional($value, $custom = 0)
 	{
-		$value = preg_replace('/\/\{([A-Za-z\-\_]+)\?\}/', static::$optional, $value, -1, $count);
+		$value = preg_replace('/\/\{([A-Za-z\-\_]+?)\?\}/', static::$optional, $value, -1, $count);
 
-		$value = preg_replace('/^(\{([A-Za-z\-\_]+)\?\})/', static::$leadingOptional, $value, -1, $leading);
+		$value = preg_replace('/^(\{([A-Za-z\-\_]+?)\?\})/', static::$leadingOptional, $value, -1, $leading);
 
 		$total = $leading + $count + $custom;
 

diff --git a/tests/Routing/RoutingRouteTest.php b/tests/Routing/RoutingRouteTest.php
@@ -6,6 +6,7 @@
 
 class RoutingRouteTest extends PHPUnit_Framework_TestCase {
 
+
 	public function testBasicDispatchingOfRoutes()
 	{
 		$router = $this->getRouter();
@@ -67,6 +68,24 @@ public function testBasicDispatchingOfRoutes()
 	}
 
 
+        public function testNonGreedyMatches()
+        {
+            $route = new Route('GET', 'images/{id}.{ext}', function() {});
+
+            $request1 = Request::create('images/1.png', 'GET');
+            $this->assertTrue($route->matches($request1));
+            $route->bind($request1);
+            $this->assertEquals('1', $route->parameter('id'));
+            $this->assertEquals('png', $route->parameter('ext'));
+
+            $request2 = Request::create('images/12.png', 'GET');
+            $this->assertTrue($route->matches($request2));
+            $route->bind($request2);
+            $this->assertEquals('12', $route->parameter('id'));
+            $this->assertEquals('png', $route->parameter('ext'));
+        }
+
+
 	/**
 	 * @expectedException Symfony\Component\HttpKernel\Exception\NotFoundHttpException
 	 */
@@ -342,24 +361,24 @@ public function testWherePatternsProperlyFilter()
 		$route->where('bar', '[0-9]+');
 		$this->assertFalse($route->matches($request));
 	}
-	
-	
+
+
 	public function testDotDoesNotMatchEverything()
 	{
 		$route = new Route('GET', 'images/{id}.{ext}', function() {});
-		
+
 		$request1 = Request::create('images/1.png', 'GET');
 		$this->assertTrue($route->matches($request1));
 		$route->bind($request1);
 		$this->assertEquals('1', $route->parameter('id'));
 		$this->assertEquals('png', $route->parameter('ext'));
-		
+
 		$request2 = Request::create('images/12.png', 'GET');
 		$this->assertTrue($route->matches($request2));
 		$route->bind($request2);
 		$this->assertEquals('12', $route->parameter('id'));
 		$this->assertEquals('png', $route->parameter('ext'));
-		
+
 	}