diff options
| author | Tristan Darricau <github@nicofuma.fr> | 2014-09-14 21:18:20 +0200 |
|---|---|---|
| committer | Tristan Darricau <github@nicofuma.fr> | 2014-11-20 16:03:48 +0100 |
| commit | a5bfc76a73a213a388126d0f697ba64f27a4b00d (patch) | |
| tree | 2608ef47b98a746c536512ce0b919c27796ffd2c /phpBB/phpbb/controller/helper.php | |
| parent | 3b1c611566399c1e06bd737ec283b141e3c410f5 (diff) | |
| download | forums-a5bfc76a73a213a388126d0f697ba64f27a4b00d.tar forums-a5bfc76a73a213a388126d0f697ba64f27a4b00d.tar.gz forums-a5bfc76a73a213a388126d0f697ba64f27a4b00d.tar.bz2 forums-a5bfc76a73a213a388126d0f697ba64f27a4b00d.tar.xz forums-a5bfc76a73a213a388126d0f697ba64f27a4b00d.zip | |
[ticket/13063] Introduces a new \phpbb\routing\router class
PHPBB3-13063
Diffstat (limited to 'phpBB/phpbb/controller/helper.php')
| -rw-r--r-- | phpBB/phpbb/controller/helper.php | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/phpBB/phpbb/controller/helper.php b/phpBB/phpbb/controller/helper.php index 52e6947c2c..f4535af711 100644 --- a/phpBB/phpbb/controller/helper.php +++ b/phpBB/phpbb/controller/helper.php @@ -14,7 +14,6 @@ namespace phpbb\controller; use Symfony\Component\HttpFoundation\Response; -use Symfony\Component\Routing\Generator\UrlGenerator; use Symfony\Component\Routing\Generator\UrlGeneratorInterface; use Symfony\Component\Routing\RequestContext; @@ -41,6 +40,11 @@ class helper */ protected $config; + /** + * @var \phpbb\routing\router phpBB router + */ + protected $router; + /* @var \phpbb\symfony_request */ protected $symfony_request; @@ -70,7 +74,7 @@ class helper * @param \phpbb\template\template $template Template object * @param \phpbb\user $user User object * @param \phpbb\config\config $config Config object - * @param \phpbb\controller\provider $provider Path provider + * @param \phpbb\routing\router $router phpBB router * @param \phpbb\extension\manager $manager Extension manager object * @param \phpbb\symfony_request $symfony_request Symfony Request object * @param \phpbb\request\request_interface $request phpBB request object @@ -78,18 +82,17 @@ class helper * @param string $phpbb_root_path phpBB root path * @param string $php_ext PHP file extension */ - public function __construct(\phpbb\template\template $template, \phpbb\user $user, \phpbb\config\config $config, \phpbb\controller\provider $provider, \phpbb\extension\manager $manager, \phpbb\symfony_request $symfony_request, \phpbb\request\request_interface $request, \phpbb\filesystem $filesystem, $phpbb_root_path, $php_ext) + public function __construct(\phpbb\template\template $template, \phpbb\user $user, \phpbb\config\config $config, \phpbb\routing\router $router, \phpbb\extension\manager $manager, \phpbb\symfony_request $symfony_request, \phpbb\request\request_interface $request, \phpbb\filesystem $filesystem, $phpbb_root_path, $php_ext) { $this->template = $template; $this->user = $user; $this->config = $config; + $this->router = $router; $this->symfony_request = $symfony_request; $this->request = $request; $this->filesystem = $filesystem; $this->phpbb_root_path = $phpbb_root_path; $this->php_ext = $php_ext; - $provider->find_routing_files($manager->get_finder()); - $this->route_collection = $provider->find($phpbb_root_path)->get_routes(); } /** @@ -162,8 +165,8 @@ class helper $context->setBaseUrl($base_url); - $url_generator = new UrlGenerator($this->route_collection, $context); - $route_url = $url_generator->generate($route, $params, $reference_type); + $this->router->setContext($context); + $route_url = $this->router->generate($route, $params, $reference_type); if ($is_amp) { |