Skip to content

Commit ea4a10d

Browse files
committed
adjust to newest symfony 2.2 after symfony#6825
1 parent 92ee467 commit ea4a10d

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

ProviderBasedGenerator.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,13 +46,13 @@ public function generate($name, $parameters = array(), $absolute = false)
4646
$compiledRoute = $route->compile();
4747

4848
// handle symfony 2.1 and 2.2
49-
// getHostnameTokens exists only since 2.2
50-
$hostnameTokens = null;
51-
if (method_exists($compiledRoute, 'getHostnameTokens')) {
52-
$hostnameTokens = $compiledRoute->getHostnameTokens();
49+
// getHostTokens exists only since 2.2
50+
$hostTokens = null;
51+
if (method_exists($compiledRoute, 'getHostTokens')) {
52+
$hostTokens = $compiledRoute->getHostTokens();
5353
}
5454

55-
return $this->doGenerate($compiledRoute->getVariables(), $route->getDefaults(), $route->getRequirements(), $compiledRoute->getTokens(), $parameters, $name, $absolute, $hostnameTokens);
55+
return $this->doGenerate($compiledRoute->getVariables(), $route->getDefaults(), $route->getRequirements(), $compiledRoute->getTokens(), $parameters, $name, $absolute, $hostTokens);
5656
}
5757

5858
/**

Tests/Routing/ContentAwareGeneratorTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -278,7 +278,7 @@ public function testSupports()
278278
*/
279279
class TestableContentAwareGenerator extends ContentAwareGenerator
280280
{
281-
protected function doGenerate($variables, $defaults, $requirements, $tokens, $parameters, $name, $absolute, $hostnameTokens = null)
281+
protected function doGenerate($variables, $defaults, $requirements, $tokens, $parameters, $name, $absolute, $hostTokens = null)
282282
{
283283
return 'result_url';
284284
}

Tests/Routing/ProviderBasedGeneratorTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ public function testSupports()
8787
*/
8888
class TestableProviderBasedGenerator extends ProviderBasedGenerator
8989
{
90-
protected function doGenerate($variables, $defaults, $requirements, $tokens, $parameters, $name, $absolute, $hostnameTokens = null)
90+
protected function doGenerate($variables, $defaults, $requirements, $tokens, $parameters, $name, $absolute, $hostTokens = null)
9191
{
9292
return 'result_url';
9393
}

0 commit comments

Comments
 (0)