richardudovich
diff --git a/‎src/Symfony/Component/Routing/RouteCompiler.php
Lines changed: 4 additions & 14 deletions b/‎src/Symfony/Component/Routing/RouteCompiler.php
Lines changed: 4 additions & 14 deletions
diff --git a/‎src/Symfony/Component/Routing/Tests/Generator/UrlGeneratorTest.php
Lines changed: 3 additions & 3 deletions b/‎src/Symfony/Component/Routing/Tests/Generator/UrlGeneratorTest.php
Lines changed: 3 additions & 3 deletions
diff --git a/‎src/Symfony/Component/Routing/Tests/RouteCompilerTest.php
Lines changed: 1 addition & 12 deletions b/‎src/Symfony/Component/Routing/Tests/RouteCompilerTest.php
Lines changed: 1 addition & 12 deletions
@@ -23,8 +23,7 @@ class RouteCompiler implements RouteCompilerInterface
     /**
      * {@inheritDoc}
      *
-     * @throws \LogicException If a variable is referenced more than once or if a required variable
-     *                         has a default value that doesn't meet its own requirement.
+     * @throws \LogicException If a variable is referenced more than once
      */
     public function compile(Route $route)
     {
@@ -68,23 +67,14 @@ public function compile(Route $route)
             $tokens[] = array('text', substr($pattern, $pos));
         }
 
-        // find the first optional token and validate the default values for non-optional variables
-        $optional = true;
+        // find the first optional token
         $firstOptional = INF;
         for ($i = count($tokens) - 1; $i >= 0; $i--) {
             $token = $tokens[$i];
             if ('variable' === $token[0] && $route->hasDefault($token[3])) {
-                if ($optional) {
-                    $firstOptional = $i;
-                } elseif (!preg_match('#^'.$token[2].'$#', $route->getDefault($token[3]))) {
-                    throw new \LogicException(sprintf('The default value "%s" of the required variable "%s" in pattern "%s" does not match the requirement "%s". ' .
-                        'This route definition makes no sense because this default can neither be used as default for generating URLs nor can it ever be returned by the matching process. ' .
-                        'You should change the default to something that meets the requirement or remove it.',
-                        $route->getDefault($token[3]), $token[3], $route->getPattern(), $token[2]
-                    ));
-                }
+                $firstOptional = $i;
             } else {
-                $optional = false;
+                break;
             }
         }
 
 
@@ -75,13 +75,13 @@ public function testRelativeUrlWithNullParameter()
     }
 
     /**
-     * @expectedException \LogicException
+     * @expectedException Symfony\Component\Routing\Exception\InvalidParameterException
      */
     public function testRelativeUrlWithNullParameterButNotOptional()
     {
         $routes = $this->getRoutes('test', new Route('/testing/{foo}/bar', array('foo' => null)));
-        // It should raise an exception when compiling this route because the given default value is absolutely
-        // irrelevant for both matching and generating URLs.
+        // This must raise an exception because the default requirement for "foo" is "[^/]+" which is not met with these params.
+        // Generating path "/testing//bar" would be wrong as matching this route would fail.
         $this->getGenerator($routes)->generate('test', array(), false);
     }
 
 
@@ -131,17 +131,6 @@ public function testRouteWithSameVariableTwice()
     {
         $route = new Route('/{name}/{name}');
 
-        $route->compile();
-    }
-
-    /**
-     * @expectedException \LogicException
-     */
-    public function testRouteWithRequiredVariableAndBadDefault()
-    {
-        $route = new Route('/{foo}/', array('foo' => null));
-        // It should raise an exception when compiling this route because the given default value is absolutely
-        // irrelevant for both matching and generating URLs.
-        $route->compile();
+        $compiled = $route->compile();
     }
 }
Original file line number	Diff line number	Diff line change
`@@ -75,13 +75,13 @@ public function testRelativeUrlWithNullParameter()`
`75`	`75`	`}`
`76`	`76`
`77`	`77`	`/**`
`78`		`- * @expectedException \LogicException`
	`78`	`+ * @expectedException Symfony\Component\Routing\Exception\InvalidParameterException`
`79`	`79`	`*/`
`80`	`80`	`public function testRelativeUrlWithNullParameterButNotOptional()`
`81`	`81`	`{`
`82`	`82`	`$routes = $this->getRoutes('test', new Route('/testing/{foo}/bar', array('foo' => null)));`
`83`		`- // It should raise an exception when compiling this route because the given default value is absolutely`
`84`		`- // irrelevant for both matching and generating URLs.`
	`83`	`+ // This must raise an exception because the default requirement for "foo" is "[^/]+" which is not met with these params.`
	`84`	`+ // Generating path "/testing//bar" would be wrong as matching this route would fail.`
`85`	`85`	`$this->getGenerator($routes)->generate('test', array(), false);`
`86`	`86`	`}`
`87`	`87`
Original file line number	Diff line number	Diff line change
`@@ -131,17 +131,6 @@ public function testRouteWithSameVariableTwice()`
`131`	`131`	`{`
`132`	`132`	`$route = new Route('/{name}/{name}');`
`133`	`133`
`134`		`- $route->compile();`
`135`		`- }`
`136`		`-`
`137`		`- /**`
`138`		`- * @expectedException \LogicException`
`139`		`- */`
`140`		`- public function testRouteWithRequiredVariableAndBadDefault()`
`141`		`- {`
`142`		`- $route = new Route('/{foo}/', array('foo' => null));`
`143`		`- // It should raise an exception when compiling this route because the given default value is absolutely`
`144`		`- // irrelevant for both matching and generating URLs.`
`145`		`- $route->compile();`
	`134`	`+ $compiled = $route->compile();`
`146`	`135`	`}`
`147`	`136`	`}`