aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid King <imkingdavid@gmail.com>2012-11-17 18:05:32 -0500
committerDavid King <imkingdavid@gmail.com>2012-11-17 18:05:32 -0500
commit4d6f6351dd0563b26105d15b98052d907f9c52ed (patch)
tree9a4f057cd2d12fdbd5411bc59682a6e777460eb8
parent8913b2c7c4ffc38d4caf34ca7014b8a07f11d19d (diff)
downloadforums-4d6f6351dd0563b26105d15b98052d907f9c52ed.tar
forums-4d6f6351dd0563b26105d15b98052d907f9c52ed.tar.gz
forums-4d6f6351dd0563b26105d15b98052d907f9c52ed.tar.bz2
forums-4d6f6351dd0563b26105d15b98052d907f9c52ed.tar.xz
forums-4d6f6351dd0563b26105d15b98052d907f9c52ed.zip
[feature/controller] Allow injecting Symfony Request into controllers
PHPBB3-10864
-rw-r--r--phpBB/includes/controller/resolver.php4
1 files changed, 4 insertions, 0 deletions
diff --git a/phpBB/includes/controller/resolver.php b/phpBB/includes/controller/resolver.php
index 901aa7eaa0..ee469aa9c8 100644
--- a/phpBB/includes/controller/resolver.php
+++ b/phpBB/includes/controller/resolver.php
@@ -109,6 +109,10 @@ class phpbb_controller_resolver implements ControllerResolverInterface
{
$arguments[] = $attributes[$param->name];
}
+ else if ($param->getClass() && $param->getClass()->isInstance($request))
+ {
+ $arguments[] = $request;
+ }
else if ($param->isDefaultValueAvailable())
{
$arguments[] = $param->getDefaultValue();