[Routing] fix url generation for optional parameter having a null value

Tobion · Tobion · commit d7a74349a9b5 · 2013-03-14T10:39:13.000+01:00
diff --git a/src/Symfony/Component/Routing/Generator/UrlGenerator.php b/src/Symfony/Component/Routing/Generator/UrlGenerator.php
@@ -159,7 +159,7 @@ protected function doGenerate($variables, $defaults, $requirements, $tokens, $pa
         $optional = true;
         foreach ($tokens as $token) {
             if ('variable' === $token[0]) {
-                if (!$optional || !array_key_exists($token[3], $defaults) || (string) $mergedParams[$token[3]] !== (string) $defaults[$token[3]]) {
+                if (!$optional || !array_key_exists($token[3], $defaults) || null !== $mergedParams[$token[3]] && (string) $mergedParams[$token[3]] !== (string) $defaults[$token[3]]) {
                     // check requirement
                     if (null !== $this->strictRequirements && !preg_match('#^'.$token[2].'$#', $mergedParams[$token[3]])) {
                         $message = sprintf('Parameter "%s" for route "%s" must match "%s" ("%s" given) to generate a corresponding URL.', $token[3], $name, $token[2], $mergedParams[$token[3]]);
diff --git a/src/Symfony/Component/Routing/Tests/Generator/UrlGeneratorTest.php b/src/Symfony/Component/Routing/Tests/Generator/UrlGeneratorTest.php
@@ -286,6 +286,13 @@ public function testWithAnIntegerAsADefaultValue()
         $this->assertEquals('/app.php/foo', $this->getGenerator($routes)->generate('test', array('default' => 'foo')));
     }
 
+    public function testNullForOptionalParameterIsIgnored()
+    {
+        $routes = $this->getRoutes('test', new Route('/test/{default}', array('default' => 0)));
+
+        $this->assertEquals('/app.php/test', $this->getGenerator($routes)->generate('test', array('default' => null)));
+    }
+
     public function testQueryParamSameAsDefault()
     {
         $routes = $this->getRoutes('test', new Route('/test', array('default' => 'value')));

Original file line number	Diff line number	Diff line change
`@@ -286,6 +286,13 @@ public function testWithAnIntegerAsADefaultValue()`
`286`	`286`	`$this->assertEquals('/app.php/foo', $this->getGenerator($routes)->generate('test', array('default' => 'foo')));`
`287`	`287`	`}`
`288`	`288`
	`289`	`+ public function testNullForOptionalParameterIsIgnored()`
	`290`	`+ {`
	`291`	`+ $routes = $this->getRoutes('test', new Route('/test/{default}', array('default' => 0)));`
	`292`	`+`
	`293`	`+ $this->assertEquals('/app.php/test', $this->getGenerator($routes)->generate('test', array('default' => null)));`
	`294`	`+ }`
	`295`	`+`
`289`	`296`	`public function testQueryParamSameAsDefault()`
`290`	`297`	`{`
`291`	`298`	`$routes = $this->getRoutes('test', new Route('/test', array('default' => 'value')));`