diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Routing] remove duplicated cache of compiled routes

Browse Source
This commit is contained in:
Tobias Schultze 2012-04-12 04:08:51 +02:00
parent b47cb35e7b
commit 03d30fdadb
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/Symfony/Component/Routing/Generator/UrlGenerator.php
View File

@ -19,7 +19,7 @@ use Symfony\Component\Routing\Exception\RouteNotFoundException;
use Symfony\Component\Routing\Exception\MissingMandatoryParametersException;
/**
* UrlGenerator generates URL based on a set of routes.
* UrlGenerator generates a URL based on a set of routes.
*
* @author Fabien Potencier <fabien@symfony.com>
*
@ -34,7 +34,6 @@ class UrlGenerator implements UrlGeneratorInterface
);
protected $routes;
protected $cache;
/**
* Constructor.
@ -48,7 +47,6 @@ class UrlGenerator implements UrlGeneratorInterface
{
$this->routes = $routes;
$this->context = $context;
$this->cache = array();
}
/**
@ -84,11 +82,10 @@ class UrlGenerator implements UrlGeneratorInterface
throw new RouteNotFoundException(sprintf('Route "%s" does not exist.', $name));
}
if (!isset($this->cache[$name])) {
$this->cache[$name] = $route->compile();
}
// the Route has a cache of its own and is not recompiled as long as it does not get modified
$compiledRoute = $route->compile();
return $this->doGenerate($this->cache[$name]->getVariables(), $route->getDefaults(), $route->getRequirements(), $this->cache[$name]->getTokens(), $parameters, $name, $absolute);
return $this->doGenerate($compiledRoute->getVariables(), $route->getDefaults(), $route->getRequirements(), $compiledRoute->getTokens(), $parameters, $name, $absolute);
}
/**