Merge pull request symfony#14 from nacmartin/emptystring

dbu · dbu · commit d9d1501cbc36 · 2012-01-30T00:09:09.000-08:00
when the route parameter is set but is the empty string, do not take it (workaround for an issue with phpcr-odm)
diff --git a/Routing/DoctrineRouter.php b/Routing/DoctrineRouter.php
@@ -144,7 +144,7 @@ public function getContext()
      */
     public function generate($name, $parameters = array(), $absolute = false)
     {
-        if (isset($parameters['route'])) {
+        if (isset($parameters['route']) && $parameters['route'] !== '') {
             $route = $parameters['route'];
         } else {
             $route = $this->getRouteFromContent($parameters);
diff --git a/Tests/Routing/DoctrineRouterTest.php b/Tests/Routing/DoctrineRouterTest.php
@@ -102,6 +102,34 @@ public function testGenerateHome()
         $this->assertEquals('/base/', $url);
     }
 
+    public function testGenerateEmptyRouteString()
+    {
+        $this->container->expects($this->once())
+            ->method('get')
+            ->with('request')
+            ->will($this->returnValue($this->request)
+        );
+
+        $this->container->expects($this->any())
+            ->method('get')
+            ->with('request')
+            ->will($this->returnValue($this->request)
+        );
+
+        $this->contentDocument->expects($this->once())
+            ->method('getRoutes')
+            ->will($this->returnValue(array(new RouteMock('/idprefix'))));
+
+        $context = $this->buildMock('Symfony\\Component\\Routing\\RequestContext');
+        $context->expects($this->once())
+            ->method('getBaseUrl')
+            ->will($this->returnValue('/base'));
+        $this->router->setContext($context);
+
+        $url = $this->router->generate('ignore', array('content'=>$this->contentDocument, 'route' => ''));
+        $this->assertEquals('/base/', $url);
+    }
+
     public function testGenerateAbsolute()
     {
         $this->container->expects($this->once())

Original file line number	Diff line number	Diff line change
`@@ -144,7 +144,7 @@ public function getContext()`
`144`	`144`	`*/`
`145`	`145`	`public function generate($name, $parameters = array(), $absolute = false)`
`146`	`146`	`{`
`147`		`- if (isset($parameters['route'])) {`
	`147`	`+ if (isset($parameters['route']) && $parameters['route'] !== '') {`
`148`	`148`	`$route = $parameters['route'];`
`149`	`149`	`} else {`
`150`	`150`	`$route = $this->getRouteFromContent($parameters);`