diff options
| author | Tristan Darricau <github@nicofuma.fr> | 2014-05-11 15:10:14 +0200 |
|---|---|---|
| committer | Tristan Darricau <github@nicofuma.fr> | 2014-05-11 15:10:14 +0200 |
| commit | 16cd1db59a3e089fd07b2b2a7586e32e73a780e9 (patch) | |
| tree | ef4c0283dfb1d4c8b53ec4ab6dd9141af236774f | |
| parent | 197c801746b148e6bcf7b5824e9077c185bf4e5f (diff) | |
| download | forums-16cd1db59a3e089fd07b2b2a7586e32e73a780e9.tar forums-16cd1db59a3e089fd07b2b2a7586e32e73a780e9.tar.gz forums-16cd1db59a3e089fd07b2b2a7586e32e73a780e9.tar.bz2 forums-16cd1db59a3e089fd07b2b2a7586e32e73a780e9.tar.xz forums-16cd1db59a3e089fd07b2b2a7586e32e73a780e9.zip | |
[ticket/12529] Move $phpbb_root_path to the end of the constructor
PHPBB3-12529
| -rw-r--r-- | phpBB/config/services.yml | 2 | ||||
| -rw-r--r-- | phpBB/phpbb/controller/resolver.php | 9 | ||||
| -rw-r--r-- | tests/controller/controller_test.php | 2 |
3 files changed, 7 insertions, 6 deletions
diff --git a/phpBB/config/services.yml b/phpBB/config/services.yml index 45ad108ef9..4de47f750f 100644 --- a/phpBB/config/services.yml +++ b/phpBB/config/services.yml @@ -103,8 +103,8 @@ services: class: phpbb\controller\resolver arguments: - @user - - %core.root_path% - @service_container + - %core.root_path% - @template controller.provider: diff --git a/phpBB/phpbb/controller/resolver.php b/phpBB/phpbb/controller/resolver.php index f4cebc5730..3010901024 100644 --- a/phpBB/phpbb/controller/resolver.php +++ b/phpBB/phpbb/controller/resolver.php @@ -33,7 +33,7 @@ class resolver implements ControllerResolverInterface /** * phpbb\template\template object - * @var phpbb\template\template + * @var \phpbb\template\template */ protected $template; @@ -48,9 +48,10 @@ class resolver implements ControllerResolverInterface * * @param \phpbb\user $user User Object * @param ContainerInterface $container ContainerInterface object + * @param string $phpbb_root_path Relative path to phpBB root * @param \phpbb\template\template $template */ - public function __construct(\phpbb\user $user, $phpbb_root_path, ContainerInterface $container, \phpbb\template\template $template = null) + public function __construct(\phpbb\user $user, ContainerInterface $container, $phpbb_root_path, \phpbb\template\template $template = null) { $this->user = $user; $this->container = $container; @@ -61,7 +62,7 @@ class resolver implements ControllerResolverInterface /** * Load a controller callable * - * @param Symfony\Component\HttpFoundation\Request $request Symfony Request object + * @param \Symfony\Component\HttpFoundation\Request $request Symfony Request object * @return bool|Callable Callable or false * @throws \phpbb\controller\exception */ @@ -116,7 +117,7 @@ class resolver implements ControllerResolverInterface * and should match the parameters of the method you are using as your * controller. * - * @param Symfony\Component\HttpFoundation\Request $request Symfony Request object + * @param \Symfony\Component\HttpFoundation\Request $request Symfony Request object * @param mixed $controller A callable (controller class, method) * @return bool False * @throws \phpbb\controller\exception diff --git a/tests/controller/controller_test.php b/tests/controller/controller_test.php index 630757dfd7..e0564f0a11 100644 --- a/tests/controller/controller_test.php +++ b/tests/controller/controller_test.php @@ -68,7 +68,7 @@ class phpbb_controller_controller_test extends phpbb_test_case include(__DIR__.'/phpbb/controller/foo.php'); } - $resolver = new \phpbb\controller\resolver(new \phpbb\user, dirname(__FILE__) . '/', $container); + $resolver = new \phpbb\controller\resolver(new \phpbb\user, $container, dirname(__FILE__) . '/'); $symfony_request = new Request(); $symfony_request->attributes->set('_controller', 'foo.controller:handle'); |