[Routing] fixed validity check for hostname params in UrlGenerator

arnaud-lb · arnaud-lb · commit 8366b8ab2789 · 2012-11-12T11:35:18.000+01:00
diff --git a/src/Symfony/Component/Routing/Generator/UrlGenerator.php b/src/Symfony/Component/Routing/Generator/UrlGenerator.php
@@ -199,24 +199,31 @@ protected function doGenerate($variables, $defaults, $requirements, $tokens, $pa
             }
 
             if ($hostnameTokens) {
-                $ghost = '';
+                $routeHost = '';
                 foreach ($hostnameTokens as $token) {
                     if ('variable' === $token[0]) {
-                        if (in_array($mergedParams[$token[3]], array(null, '', false), true)) {
-                            // check requirement
-                            if ($mergedParams[$token[3]] && !preg_match('#^'.$token[2].'$#', $mergedParams[$token[3]])) {
-                                throw new InvalidParameterException(sprintf('Parameter "%s" for route "%s" must match "%s" ("%s" given).', $token[3], $name, $token[2], $mergedParams[$token[3]]));
+                        if (null !== $this->strictRequirements && !preg_match('#^'.$token[2].'$#', $mergedParams[$token[3]])) {
+                            $message = sprintf('Parameter "%s" for route "%s" must match "%s" ("%s" given).', $token[3], $name, $token[2], $mergedParams[$token[3]]);
+
+                            if ($this->strictRequirements) {
+                                throw new InvalidParameterException($message);
+                            }
+
+                            if ($this->logger) {
+                                $this->logger->err($message);
                             }
+
+                            return null;
                         }
 
-                        $ghost = $token[1].$mergedParams[$token[3]].$ghost;
+                        $routeHost = $token[1].$mergedParams[$token[3]].$routeHost;
                     } elseif ('text' === $token[0]) {
-                        $ghost = $token[1].$ghost;
+                        $routeHost = $token[1].$routeHost;
                     }
                 }
 
-                if ($ghost != $host) {
-                    $host = $ghost;
+                if ($routeHost != $host) {
+                    $host = $routeHost;
                     $absolute = true;
                 }
             }
diff --git a/src/Symfony/Component/Routing/Tests/Generator/UrlGeneratorTest.php b/src/Symfony/Component/Routing/Tests/Generator/UrlGeneratorTest.php
@@ -398,6 +398,41 @@ public function testWithHostnameSameAsContextAndAbsolute()
         $this->assertEquals('http://fr.example.com/app.php/Fabien', $this->getGenerator($routes, array('host' => 'fr.example.com'))->generate('test', array('name' =>'Fabien', 'locale' => 'fr'), true));
     }
 
+    /**
+     * @expectedException Symfony\Component\Routing\Exception\InvalidParameterException
+     */
+    public function testUrlWithInvalidParameterInHostname()
+    {
+        $routes = $this->getRoutes('test', new Route('/', array(), array('foo' => 'bar'), array(), '{foo}.example.com'));
+        $this->getGenerator($routes)->generate('test', array('foo' => 'baz'), false);
+    }
+
+    /**
+     * @expectedException Symfony\Component\Routing\Exception\InvalidParameterException
+     */
+    public function testUrlWithInvalidParameterInHostnameWhenParamHasADefaultValue()
+    {
+        $routes = $this->getRoutes('test', new Route('/', array('foo' => 'bar'), array('foo' => 'bar'), array(), '{foo}.example.com'));
+        $this->getGenerator($routes)->generate('test', array('foo' => 'baz'), false);
+    }
+
+    /**
+     * @expectedException Symfony\Component\Routing\Exception\InvalidParameterException
+     */
+    public function testUrlWithInvalidParameterEqualsDefaultValueInHostname()
+    {
+        $routes = $this->getRoutes('test', new Route('/', array('foo' => 'baz'), array('foo' => 'bar'), array(), '{foo}.example.com'));
+        $this->getGenerator($routes)->generate('test', array('foo' => 'baz'), false);
+    }
+
+    public function testUrlWithInvalidParameterInHostnameInNonStrictMode()
+    {
+        $routes = $this->getRoutes('test', new Route('/', array(), array('foo' => 'bar'), array(), '{foo}.example.com'));
+        $generator = $this->getGenerator($routes);
+        $generator->setStrictRequirements(false);
+        $this->assertNull($generator->generate('test', array('foo' => 'baz'), false));
+    }
+
     protected function getGenerator(RouteCollection $routes, array $parameters = array(), $logger = null)
     {
         $context = new RequestContext('/app.php');

Original file line number	Diff line number	Diff line change
`@@ -199,24 +199,31 @@ protected function doGenerate($variables, $defaults, $requirements, $tokens, $pa`
`199`	`199`	`}`
`200`	`200`
`201`	`201`	`if ($hostnameTokens) {`
`202`		`- $ghost = '';`
	`202`	`+ $routeHost = '';`
`203`	`203`	`foreach ($hostnameTokens as $token) {`
`204`	`204`	`if ('variable' === $token[0]) {`
`205`		`- if (in_array($mergedParams[$token[3]], array(null, '', false), true)) {`
`206`		`- // check requirement`
`207`		`- if ($mergedParams[$token[3]] && !preg_match('#^'.$token[2].'$#', $mergedParams[$token[3]])) {`
`208`		`- throw new InvalidParameterException(sprintf('Parameter "%s" for route "%s" must match "%s" ("%s" given).', $token[3], $name, $token[2], $mergedParams[$token[3]]));`
	`205`	`+ if (null !== $this->strictRequirements && !preg_match('#^'.$token[2].'$#', $mergedParams[$token[3]])) {`
	`206`	`+ $message = sprintf('Parameter "%s" for route "%s" must match "%s" ("%s" given).', $token[3], $name, $token[2], $mergedParams[$token[3]]);`
	`207`	`+`
	`208`	`+ if ($this->strictRequirements) {`
	`209`	`+ throw new InvalidParameterException($message);`
	`210`	`+ }`
	`211`	`+`
	`212`	`+ if ($this->logger) {`
	`213`	`+ $this->logger->err($message);`
`209`	`214`	`}`
	`215`	`+`
	`216`	`+ return null;`
`210`	`217`	`}`
`211`	`218`
`212`		`- $ghost = $token[1].$mergedParams[$token[3]].$ghost;`
	`219`	`+ $routeHost = $token[1].$mergedParams[$token[3]].$routeHost;`
`213`	`220`	`} elseif ('text' === $token[0]) {`
`214`		`- $ghost = $token[1].$ghost;`
	`221`	`+ $routeHost = $token[1].$routeHost;`
`215`	`222`	`}`
`216`	`223`	`}`
`217`	`224`
`218`		`- if ($ghost != $host) {`
`219`		`- $host = $ghost;`
	`225`	`+ if ($routeHost != $host) {`
	`226`	`+ $host = $routeHost;`
`220`	`227`	`$absolute = true;`
`221`	`228`	`}`
`222`	`229`	`}`