merged branch nomack84/issue6135 (PR symfony#6136)

This PR was merged into the master branch. Commits ------- c8e65a2 [FrameworkBundle][Routing] Resolve placeholders in hostnamePattern rules Discussion ---------- [FrameworkBundle][Routing] Resolve placeholders in hostnamePattern rules Bug fix: yes Feature addition: no Backwards compatibility break: no Symfony2 tests pass: yes Fixes the following tickets: symfony#6135 License of the code: MIT Currently the placeholders in the `hostname_pattern` rule are not resolved, so that's why this PR is it for. --------------------------------------------------------------------------- by nomack84 at 2012-11-28T14:18:02Z @fabpot Could you please merge this? I really need this fix to be solve. Thanks!

Author: fabpot

src/Symfony/Bundle/FrameworkBundle/Routing/Router.php

@@ -78,6 +78,7 @@ public function warmUp($cacheDir)
  * - the route defaults,
  * - the route requirements,
  * - the route pattern.
+ * - the route hostnamePattern.
  *
  * @param RouteCollection $collection
  */
@@ -96,6 +97,7 @@ private function resolveParameters(RouteCollection $collection)
  }
 
  $route->setPattern($this->resolve($route->getPattern()));
+ $route->setHostnamePattern($this->resolve($route->getHostnamePattern()));
  }
  }
  }

src/Symfony/Bundle/FrameworkBundle/Tests/Routing/RouterTest.php

@@ -117,6 +117,29 @@ public function testPatternPlaceholders()
  );
  }
 
+ public function testHostnamePatternPlaceholders()
+ {
+ $routes = new RouteCollection();
+
+ $route = new Route('foo');
+ $route->setHostnamePattern('/before/%parameter.foo%/after/%%unescaped%%');
+
+ $routes->add('foo', $route);
+
+ $sc = $this->getServiceContainer($routes);
+
+ $sc->expects($this->at(1))->method('hasParameter')->with('parameter.foo')->will($this->returnValue(true));
+ $sc->expects($this->at(2))->method('getParameter')->with('parameter.foo')->will($this->returnValue('foo'));
+
+ $router = new Router($sc, 'foo');
+ $route = $router->getRouteCollection()->get('foo');
+
+ $this->assertEquals(
+ '/before/foo/after/%unescaped%',
+ $route->getHostnamePattern()
+ );
+ }
+
  /**
  * @expectedException \Symfony\Component\DependencyInjection\Exception\ParameterNotFoundException
  * @expectedExceptionMessage You have requested a non-existent parameter "nope".