Skip to content

[Routing] Allow using kernel parameters in routes #3316

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
helmer wants to merge 1 commit into from
Closed

[Routing] Allow using kernel parameters in routes #3316

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/Symfony/Bundle/FrameworkBundle/Resources/config/routing.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@

<service id="routing.loader" class="%routing.loader.class%">
<tag name="monolog.logger" channel="router" />
<argument type="service" id="service_container" />
<argument type="service" id="controller_name_converter" />
<argument type="service" id="logger" on-invalid="null" />
<argument type="service" id="routing.resolver" />
Expand Down
22 changes: 21 additions & 1 deletion src/Symfony/Bundle/FrameworkBundle/Routing/DelegatingLoader.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,9 @@
use Symfony\Bundle\FrameworkBundle\Controller\ControllerNameParser;
use Symfony\Component\Config\Loader\DelegatingLoader as BaseDelegatingLoader;
use Symfony\Component\Config\Loader\LoaderResolverInterface;
use Symfony\Component\DependencyInjection\ContainerInterface;
use Symfony\Component\HttpKernel\Log\LoggerInterface;
use Symfony\Component\Routing\Route;

/**
* DelegatingLoader delegates route loading to other loaders using a loader resolver.
Expand All @@ -28,6 +30,7 @@ class DelegatingLoader extends BaseDelegatingLoader
{
protected $parser;
protected $logger;
protected $parameterBag;

/**
* Constructor.
Expand All @@ -36,10 +39,11 @@ class DelegatingLoader extends BaseDelegatingLoader
* @param LoggerInterface $logger A LoggerInterface instance
* @param LoaderResolverInterface $resolver A LoaderResolverInterface instance
*/
public function __construct(ControllerNameParser $parser, LoggerInterface $logger = null, LoaderResolverInterface $resolver)
public function __construct(ContainerInterface $container, ControllerNameParser $parser, LoggerInterface $logger = null, LoaderResolverInterface $resolver)
{
$this->parser = $parser;
$this->logger = $logger;
$this->parameterBag = $container->getParameterBag();

parent::__construct($resolver);
}
Expand All @@ -57,6 +61,8 @@ public function load($resource, $type = null)
$collection = parent::load($resource, $type);

foreach ($collection->all() as $name => $route) {
$this->resolveParameters($route);

if ($controller = $route->getDefault('_controller')) {
try {
$controller = $this->parser->parse($controller);
Expand All @@ -70,4 +76,18 @@ public function load($resource, $type = null)

return $collection;
}

/**
* Replace container parameters inside route pattern and requirements.
*
* @param Route $route A route
*/
protected function resolveParameters(Route $route)
{
$route->setPattern($this->parameterBag->resolveValue($route->getPattern()));

foreach ($route->getRequirements() as $key => $regex) {
$route->setRequirement($key, $this->parameterBag->resolveValue($regex));
}
}
}