10BC0 merged branch arnaud-lb/hostname-routes (PR #3378) · symfony/symfony@c94bdf6 · GitHub
[go: up one dir, main page]
Skip to content

Commit c94bdf6

Browse files
fabpotfabpot
committed
merged branch arnaud-lb/hostname-routes (PR #3378)
This PR was merged into the master branch. Commits ------- 17f51a1 Merge pull request #6 from Tobion/hostname-routes e120a7a fix API of RouteCollection 26e5684 some type fixes 514e27a [Routing] fix PhpMatcherDumper that returned numeric-indexed params that are returned besides named placeholders by preg_match 7ed3013 switch to array_replace instead of array_merge 94ec653 removed irrelevant string case in XmlFileLoader 9ffe3de synchronize the fixtures in different formats and fix default for numeric requirement 6cd3457 fixed CS 8366b8a [Routing] fixed validity check for hostname params in UrlGenerator a8ce621 [Routing] added support for hostname in the apache matcher dumper 562174a [Routing] fixed indentation of dumped collections 1489021 fixed CS a270458 [Routing] added some more unit tests 153fcf2 [Routing] added some unit tests for the PHP loader 68da6ad [Routing] added support for hostname in the XML loader 3dfca47 [Routing] added some unit tests for the YAML loader 92f9c15 [Routing] changed CompiledRoute signature to be more consistent d91e5a2 [Routing] fixed Route annotation for hostname (should be hostname_pattern instead of hostnamePattern) 62de881 [Routing] clarified a variable content 11b4378 [Routing] added hostname support in UrlMatcher fc015d5 [Routing] fixed route generation with a hostname pattern when the hostname is the same as the current one (no need to force the generated URL to be absolute) 462999d [Routing] display hostname pattern in router:debug output 805806a [Routing] added hostname matching support to UrlGenerator 7a15e00 [Routing] added hostname matching support to AnnotationClassLoader cab450c [Routing] added hostname matching support to YamlFileLoader 85d11af [Routing] added hostname matching support to PhpMatcherDumper 402359b [Routing] added hostname matching support to RouteCompiler add3658 [Routing] added hostname matching support to Route and RouteCollection 23feb37 [Routing] added hostname matching support to CompiledRoute Discussion ---------- [2.2][Routing] hostname pattern for routes Bug fix: no Feature addition: yes Fixes the following tickets: #1762, #3276 Backwards compatibility break: no Symfony2 tests pass: yes This adds a hostname_pattern property to routes. It works like the pattern property (hostname_pattern can have variables, requirements, etc). The hostname_pattern property can be set on both routes and route collections. Yaml example: ``` yaml # Setting the hostname_pattern for a whole collection of routes AcmeBundle: resource: "@AcmeBundle/Controller/" type: annotation prefix: / hostname_pattern: {locale}.example.com requirements: locale: en|fr # Setting the hostname_pattern for single route some_route: pattern: /hello/{name} hostname_pattern: {locale}.example.com requirements: locale: en|fr name: \w+ defaults: _controller: Foo:bar:baz ``` Annotations example: ``` php <?php /** * Inherits requirements and hostname pattern from the collection * @route("/foo") */ public function fooAction(); /** * Set a specific hostnamePattern for this route only * @route("/foo", hostnamePattern="{_locale}.example.com", requirements={"_locale="fr|en"}) */ public function fooAction(); ``` Performance: Consecutive routes with the same hostname pattern are grouped, and a single test is made against the hostname for this group, so the overhead is very low: ``` @route("/foo", hostnamePattern="a.example.com") @route("/bar", hostnamePattern="a.example.com") @route("/baz", hostnamePattern="b.example.com") ``` is compiled like this: ``` if (hostname matches a.example.com) { // test route "/foo" // test route "/bar" } if (hostname matches b.example.com) { // test route "/baz" } ``` The PR also tries harder to optimize routes sharing the same prefix: ``` @route("/cafe") @route("/cacao") @route("/coca") ``` is compiled like this: ``` if (url starts with /c) { if (url starts with /ca) { // test route "/cafe" // test route "/cacao" } // test route "/coca" } ``` --------------------------------------------------------------------------- by Koc at 2012-02-16T14:14:19Z Interesting. Have you looked at #3057, #3002? Killer feature of #3057 : multiple hostnames per route. --------------------------------------------------------------------------- by arnaud-lb at 2012-02-16T14:21:28Z @Koc yes, the main difference is that this PR allows variables in the hostname pattern, with requirements, etc just like the path pattern. The other PRs use a `_host` requirement, which works like the `_method` requirement (takes a list of allowed hostnames separated by `|`). > Killer feature of #3057 : multiple hostnames per route. If you have multiple tlds you can easily do it like this: ``` yaml hostbased_route: pattern: / hostname_pattern: symfony.{tld} requirements: tld: org|com ``` Or with completely different domain names: ``` yaml hostbased_route: pattern: / hostname_pattern: {domain} requirements: domain: example\.com|symfony\.com ``` Requirements allow DIC %parameters%, so you can also put you domains in your config.yml. --------------------------------------------------------------------------- by Koc at 2012-02-16T15:52:16Z wow, nice! So looks like this PR closes my #3276 ticket? --------------------------------------------------------------------------- by arnaud-lb at 2012-02-16T15:53:55Z Yes, apparently :) --------------------------------------------------------------------------- by Koc at 2012-02-16T15:56:53Z I cann't find method `ParameterBag::resolveValue` calling in this PR, like here https://github.com/symfony/symfony/pull/3316/files --------------------------------------------------------------------------- by arnaud-lb at 2012-02-16T16:03:48Z I think it's in core already --------------------------------------------------------------------------- by Koc at 2012-02-16T16:11:38Z looks like yes https://github.com/symfony/symfony/blob/master/src/Symfony/Bundle/FrameworkBundle/Routing/Router.php#L81 --------------------------------------------------------------------------- by dlsniper at 2012-02-16T19:37:57Z This PR looks great, it's something like this I've been waiting for. I know @fabpot said he's working on something similar but I think if he agrees with this it could be a great addition to the core. @fabpot , @stof any objections about this PR if gets fully done? --------------------------------------------------------------------------- by stof at 2012-02-16T20:00:21Z Well, we already have 2 other implementations for this stuff in the PRs. @fabpot please take time to look at them --------------------------------------------------------------------------- by stof at 2012-02-16T20:03:17Z This one is absolutely not tested and seems to break the existing tests according to the description. So it cannot be reviewed as is. --------------------------------------------------------------------------- by dlsniper at 2012-02-16T22:00:24Z @stof I understand it's a WIP but the other PRs where ignored as well and like you've said, there's a bunch of PRs already on this issue all doing a thing or another. So an early feedback on this, or any other, could lead it to the right path in order to finally solve this issue. --------------------------------------------------------------------------- by arnaud-lb at 2012-02-17T23:57:28Z Added tests; others are passing now --------------------------------------------------------------------------- by arnaud-lb at 2012-02-22T21:10:20Z I'm going to add support for the Apache dumper and the XML loader; does this PR have a chance to be merged ? cc @fabpot @stof --------------------------------------------------------------------------- by stof at 2012-02-22T22:05:23Z @arnaud-lb We need to wait @fabpot's mind about the way he prefers to implement it to know which one can be merged. --------------------------------------------------------------------------- by IjinPL at 2012-02-27T02:01:57Z Forked @arnaud-lb *hostname_pattern* to add XML parasing support. --------------------------------------------------------------------------- by stof at 2012-04-03T23:59:12Z @arnaud-lb Please rebase your branch. It conflicts with master because of the move of the tests @fabpot @vicb ping --------------------------------------------------------------------------- by dlsniper at 2012-04-13T19:52:23Z Hi, If @arnaud-lb won't be able to rebase this I could help with some work on this but there's still the problem of actually choosing the right PR(s) for this issue. @blogsh says in his last commit that this PR is a bit better in his opinion but @fabpot needs to decide in the end. --------------------------------------------------------------------------- by arnaud-lb at 2012-04-14T17:26:55Z @stof rebased --------------------------------------------------------------------------- by nomack84 at 2012-04-20T13:01:00Z @fabpot Any final word about this pull request? It would be nice to have this feature ready for 2.1. --------------------------------------------------------------------------- by asm89 at 2012-04-24T21:27:50Z Using the `{_locale}` placeholder in the host would set the locale for the request just like it does now? Another thing I'm wondering is how/if it should be possible to set the hostname pattern for all your routes, or at least when importing routes? Otherwise you'll end up repeating the same host pattern over and over again. I think this is also important when importing routes from third party bundles. --------------------------------------------------------------------------- by fabpot at 2012-04-25T01:17:51Z I'm reviewing this PR and I'm going to make some modifications. I will send a PR to @arnaud-lb soon. --------------------------------------------------------------------------- by fabpot at 2012-04-25T03:10:18Z I've sent a PR to @arnaud-lb arnaud-lb#3 that fixes some minor bugs and add support in more classes. --------------------------------------------------------------------------- by fabpot at 2012-04-25T03:12:52Z @asm89: Placeholders in the hostname are managed in the same way as the ones from the URL pattern. You can set a hostname pattern for a collection (like the prefix for URL patterns). --------------------------------------------------------------------------- by Tobion at 2012-04-25T09:31:19Z I think we need to change the contents of $variables, $tokens, and $hostnameTokens in the CompiledRoute. They contain redundant information and the content structure of these variables ist not documentation in any way. If we remove duplicated content and put it in a (single) well defined variable, it would also reduce the information that need to be saved in the generated class by the UrlGeneratorDumper. --------------------------------------------------------------------------- by arnaud-lb at 2012-04-26T08:54:21Z @fabpot thanks :) I've merged it --------------------------------------------------------------------------- by stof at 2012-04-26T12:08:40Z A rebase is needed --------------------------------------------------------------------------- by fabpot at 2012-04-26T13:28:08Z no need to rebase, I will resolve the conflicts when merging. I've still have some minor changes to do before merging though. Anyone willing to have a look at implementing the Apache dumper part? --------------------------------------------------------------------------- by Tobion at 2012-04-26T14:59:00Z @fabpot you want to merge this for 2.1 although it introduces big changes that need extensive review and testing? But #3958 is not considered for 2.1? I thought we are in some sort of feature freeze for the components in order to not postpone the release. --------------------------------------------------------------------------- by fabpot at 2012-04-26T17:21:09Z @Tobion: I never said it will be in 2.1. The plan is to create a 2.1 branch soon so that we can continue working on 2.2. --------------------------------------------------------------------------- by Koc at 2012-04-26T19:46:43Z https://twitter.com/#!/fabpot/status/178502663690915840
2 parents f4c05e3 + 17f51a1 commit c94bdf6

40 files changed

+1210
-239
lines changed

‎src/Symfony/Bundle/FrameworkBundle/Command/RouterDebugCommand.php‎

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
use Symfony\Component\Console\Input\InputInterface;
1616
use Symfony\Component\Console\Output\OutputInterface;
1717
use Symfony\Component\Routing\RouterInterface;
18-
use Symfony\Component\Console\Output\Output;
1918

2019
/**
2120
* A console command for retrieving information about routes
@@ -82,37 +81,39 @@ protected function outputRoutes(OutputInterface $output, $routes = null)
8281

8382
$output->writeln($this->getHelper('formatter')->formatSection('router', 'Current routes'));
8483

85-
$maxName = 4;
86-
$maxMethod = 6;
84+
$maxName = strlen('name');
85+
$maxMethod = strlen('method');
86+
$maxHostname = strlen('hostname');
87+
8788
foreach ($routes as $name => $route) {
8889
$requirements = $route->getRequirements();
8990
$method = isset($requirements['_method'])
9091
? strtoupper(is_array($requirements['_method'])
9192
? implode(', ', $requirements['_method']) : $requirements['_method']
9293
)
9394
: 'ANY';
95+
$hostname = '' !== $route->getHostnamePattern()
96+
? $route->getHostnamePattern() : 'ANY';
9497

95-
if (strlen($name) > $maxName) {
96-
$maxName = strlen($name);
97-
}
98-
99-
if (strlen($method) > $maxMethod) {
100-
$maxMethod = strlen($method);
101-
D73A }
98+
$maxName = max($maxName, strlen($name));
99+
$maxMethod = max($maxMethod, strlen($method));
100+
$maxHostname = max($maxHostname, strlen($hostname));
102101
}
103-
$format = '%-'.$maxName.'s %-'.$maxMethod.'s %s';
102+
$format = '%-'.$maxName.'s %-'.$maxMethod.'s %-'.$maxHostname.'s %s';
104103

105104
// displays the generated routes
106-
$format1 = '%-'.($maxName + 19).'s %-'.($maxMethod + 19).'s %s';
107-
$output->writeln(sprintf($format1, '<comment>Name</comment>', '<comment>Method</comment>', '<comment>Pattern</comment>'));
105+
$format1 = '%-'.($maxName + 19).'s %-'.($maxMethod + 19).'s %-'.($maxHostname + 19).'s %s';
106+
$output->writeln(sprintf($format1, '<comment>Name</comment>', '<comment>Method</comment>', '<comment>Hostname</comment>', '<comment>Pattern</comment>'));
108107
foreach ($routes as $name => $route) {
109108
$requirements = $route->getRequirements();
110109
$method = isset($requirements['_method'])
111110
? strtoupper(is_array($requirements['_method'])
112111
? implode(', ', $requirements['_method']) : $requirements['_method']
113112
)
114113
: 'ANY';
115-
$output->writeln(sprintf($format, $name, $method, $route->getPattern()));
114+
$hostname = '' !== $route->getHostnamePattern()
115+
? $route->getHostnamePattern() : 'ANY';
116+
$output->writeln(sprintf($format, $name, $method, $hostname, $route->getPattern()));
116117
}
117118
}
118119

‎src/Symfony/Component/Routing/Annotation/Route.php‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ class Route
2525
private $requirements;
2626
private $options;
2727
private $defaults;
28+
private $hostnamePattern;
2829

2930
/**
3031
* Constructor.
@@ -43,7 +44,7 @@ public function __construct(array $data)
4344
}
4445

4546
foreach ($data as $key => $value) {
46-
$method = 'set'.$key;
47+
$method = 'set'.str_replace('_', '', $key);
4748
if (!method_exists($this, $method)) {
4849
throw new \BadMethodCallException(sprintf("Unknown property '%s' on annotation '%s'.", $key, get_class($this)));
4950
}
@@ -61,6 +62,16 @@ public function getPattern()
6162
return $this->pattern;
6263
}
6364

65+
public function setHostnamePattern($pattern)
66+
{
67+
$this->hostnamePattern = $pattern;
68+
}
69+
70+
public function getHostnamePattern()
71+
{
72+
return $this->hostnamePattern;
73+
}
74+
6475
public function setName($name)
6576
{
6677
$this->name = $name;

‎src/Symfony/Component/Routing/CompiledRoute.php‎

Lines changed: 59 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,20 +22,32 @@ class CompiledRoute
2222
private $tokens;
2323
private $staticPrefix;
2424
private $regex;
25+
private $pathVariables;
26+
private $hostnameVariables;
27+
private $hostnameRegex;
28+
private $hostnameTokens;
2529

2630
/**
2731
* Constructor.
2832
*
29-
* @param string $staticPrefix The static prefix of the compiled route
30-
* @param string $regex The regular expression to use to match this route
31-
* @param array $tokens An array of tokens to use to generate URL for this route
32-
* @param array $variables An array of variables
33+
* @param string $staticPrefix The static prefix of the compiled route
34+
* @param string $regex The regular expression to use to match this route
35+
* @param array $tokens An array of tokens to use to generate URL for this route
36+
* @param array $pathVariables An array of path variables
37+
* @param string|null $hostnameRegex Hostname regex
38+
* @param array $hostnameTokens Hostname tokens
39+
* @param array $hostnameVariables An array of hostname variables
40+
* @param array $variables An array of variables (variables defined in the path and in the hostname patterns)
3341
*/
34-
public function __construct($staticPrefix, $regex, array $tokens, array $variables)
42+
public function __construct($staticPrefix, $regex, array $tokens, array $pathVariables, $hostnameRegex = null, array $hostnameTokens = array(), array $hostnameVariables = array(), array $variables = array())
3543
{
36-
$this->staticPrefix = $staticPrefix;
44+
$this->staticPrefix = (string) $staticPrefix;
3745
$this->regex = $regex;
3846
$this->tokens = $tokens;
47+
$this->pathVariables = $pathVariables;
48+
$this->hostnameRegex = $hostnameRegex;
49+
$this->hostnameTokens = $hostnameTokens;
50+
$this->hostnameVariables = $hostnameVariables;
3951
$this->variables = $variables;
4052
}
4153

@@ -59,6 +71,16 @@ public function getRegex()
5971
return $this->regex;
6072
}
6173

74+
/**
75+
* Returns the hostname regex
76+
*
77+
* @return string|null The hostname regex or null
78+
*/
79+
public function getHostnameRegex()
80+
{
81+
return $this->hostnameRegex;
82+
}
83+
6284
/**
6385
* Returns the tokens.
6486
*
@@ -69,6 +91,16 @@ public function getTokens()
6991
return $this->tokens;
7092
}
7193

94+
/**
95+
* Returns the hostname tokens.
96+
*
97+
* @return array The tokens
98+
*/
99+
public function getHostnameTokens()
100+
{
101+
return $this->hostnameTokens;
102+
}
103+
72104
/**
73105
* Returns the variables.
74106
*
@@ -78,4 +110,25 @@ public function getVariables()
78110
{
79111
return $this->variables;
80112
}
113+
114+
/**
115+
* Returns the path variables.
116+
*
117+
* @return array The variables
118+
*/
119+
public function getPathVariables()
120+
{
121+
return $this->pathVariables;
122+
}
123+
124+
/**
125+
* Returns the hostname variables.
126+
*
127+
* @return array The variables
128+
*/
129+
public function getHostnameVariables()
130+
{
131+
return $this->hostnameVariables;
132+
}
133+
81134
}

‎src/Symfony/Component/Routing/Generator/Dumper/PhpGeneratorDumper.php‎

Lines changed: 3 additions & 2 deletions
Original file line numberDif 171A f line numberDiff line change
@@ -91,6 +91,7 @@ private function generateDeclaredRoutes()
9191
$properties[] = $route->getDefaults();
9292
$properties[] = $route->getRequirements();
9393
$properties[] = $compiledRoute->getTokens();
94+
$properties[] = $compiledRoute->getHostnameTokens();
9495

9596
$routes .= sprintf(" '%s' => %s,\n", $name, str_replace("\n", '', var_export($properties, true)));
9697
}
@@ -113,9 +114,9 @@ public function generate(\$name, \$parameters = array(), \$absolute = false)
113114
throw new RouteNotFoundException(sprintf('Route "%s" does not exist.', \$name));
114115
}
115116
116-
list(\$variables, \$defaults, \$requirements, \$tokens) = self::\$declaredRoutes[\$name];
117+
list(\$variables, \$defaults, \$requirements, \$tokens, \$hostnameTokens) = self::\$declaredRoutes[\$name];
117118
118-
return \$this->doGenerate(\$variables, \$defaults, \$requirements, \$tokens, \$parameters, \$name, \$absolute);
119+
return \$this->doGenerate(\$variables, \$defaults, \$requirements, \$tokens, \$parameters, \$name, \$absolute, \$hostnameTokens);
119120
}
120121
EOF;
121122
}

‎src/Symfony/Component/Routing/Generator/UrlGenerator.php‎

Lines changed: 34 additions & 4 deletions
192
Original file line numberDiff line numberDiff line change
@@ -122,14 +122,14 @@ public function generate($name, $parameters = array(), $absolute = false)
122122
// the Route has a cache of its own and is not recompiled as long as it does not get modified
123123
$compiledRoute = $route->compile();
124124

125-
return $this->doGenerate($compiledRoute->getVariables(), $route->getDefaults(), $route->getRequirements(), $compiledRoute->getTokens(), $parameters, $name, $absolute);
125+
return $this->doGenerate($compiledRoute->getVariables(), $route->getDefaults(), $route->getRequirements(), $compiledRoute->getTokens(), $parameters, $name, $absolute, $compiledRoute->getHostnameTokens());
126126
}
127127

128128
/**
129129
* @throws MissingMandatoryParametersException When route has some missing mandatory parameters
130130
* @throws InvalidParameterException When a parameter value is not correct
131131
*/
132-
protected function doGenerate($variables, $defaults, $requirements, $tokens, $parameters, $name, $absolute)
132+
protected function doGenerate($variables, $defaults, $requirements, $tokens, $parameters, $name, $absolute, $hostnameTokens)
133133
{
134134
$variables = array_flip($variables);
135135
$mergedParams = array_replace($defaults, $this->context->getParameters(), $parameters);
@@ -191,13 +191,43 @@ protected function doGenerate($variables, $defaults, $requirements, $tokens, $pa
191191
$url .= '?'.$query;
192
}
193193

194-
if ($this->context->getHost()) {
194+
if ($host = $this->context->getHost()) {
195195
$scheme = $this->context->getScheme();
196196
if (isset($requirements['_scheme']) && ($req = strtolower($requirements['_scheme'])) && $scheme != $req) {
197197
$absolute = true;
198198
$scheme = $req;
199199
}
200200

201+
if ($hostnameTokens) {
202+
$routeHost = '';
203+
foreach ($hostnameTokens as $token) {
204+
if ('variable' === $token[0]) {
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);
214+
}
215+
216+
return null;
217+
}
218+
219+
$routeHost = $token[1].$mergedParams[$token[3]].$routeHost;
220+
} elseif ('text' === $token[0]) {
221+
$routeHost = $token[1].$routeHost;
222+
}
223+
}
224+
225+
if ($routeHost != $host) {
226+
$host = $routeHost;
227+
$absolute = true;
228+
}
229+
}
230+
201231
if ($absolute) {
202232
$port = '';
203233
if ('http' === $scheme && 80 != $this->context->getHttpPort()) {
@@ -206,7 +236,7 @@ protected function doGenerate($variables, $defaults, $requirements, $tokens, $pa
206236
$port = ':'.$this->context->getHttpsPort();
207237
171A }
208238

209-
$url = $scheme.'://'.$this->context->getHost().$port.$url;
239+
$url = $scheme.'://'.$host.$port.$url;
210240
}
211241
}
212242

‎src/Symfony/Component/Routing/Loader/AnnotationClassLoader.php‎

Lines changed: 19 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
abstract class AnnotationClassLoader implements LoaderInterface
5858
{
5959
protected $reader;
60-
protected $routeAnnotationClass = 'Symfony\\Component\\Routing\\Annotation\\Route';
60+
protected $routeAnnotationClass = 'Symfony\\Component\\Routing\\Annotation\\Route';
6161
protected $defaultRouteIndex;
6262

6363
/**
@@ -97,10 +97,11 @@ public function load($class, $type = null)
9797
}
9898

9999
$globals = array(
100-
'pattern' => '',
101-
'requirements' => array(),
102-
'options' => array(),
103-
'defaults' => array(),
100+
'pattern' => '',
101+
'requirements' => array(),
102+
'options' => array(),
103+
'defaults' => array(),
104+
'hostname_pattern' => '',
104105
);
105106

106107
$class = new \ReflectionClass($class);
@@ -124,6 +125,10 @@ public function load($class, $type = null)
124125
if (null !== $annot->getDefaults()) {
125126
$globals['defaults'] = $annot->getDefaults();
126127
}
128+
129+
if (null !== $annot->getHostnamePattern()) {
130+
$globals['hostname_pattern'] = $annot->getHostnamePattern();
131+
}
127132
}
128133

129134
$collection = new RouteCollection();
@@ -148,16 +153,21 @@ protected function addRoute(RouteCollection $collection, $annot, $globals, \Refl
148153
$name = $this->getDefaultRouteName($class, $method);
149154
}
150155

151-
$defaults = array_merge($globals['defaults'], $annot->getDefaults());
156+
$defaults = array_replace($globals['defaults'], $annot->getDefaults());
152157
foreach ($method->getParameters() as $param) {
153158
if ($param->isOptional()) {
154159
$defaults[$param->getName()] = $param->getDefaultValue();
155160
}
156161
}
157-
$requirements = array_merge($globals['requirements'], $annot->getRequirements());
158-
$options = array_merge($globals['options'], $annot->getOptions());
162+
$requirements = array_replace($globals['requirements'], $annot->getRequirements());
163+
$options = array_replace($globals['options'], $annot->getOptions());
164+
165+
$hostnamePattern = $annot->getHostnamePattern();
166+
if (null === $hostnamePattern) {
167+
$hostnamePattern = $globals['hostname_pattern'];
168+
}
159169

160-
$route = new Route($globals['pattern'].$annot->getPattern(), $defaults, $requirements, $options);
170+
$route = new Route($globals['pattern'].$annot->getPattern(), $defaults, $requirements, $options, $hostnamePattern);
161171

162172
$this->configureRoute($route, $class, $method, $annot);
163173

0 commit comments

Comments
 (0)
0