diff options
| author | Nicofuma <github@nicofuma.fr> | 2014-05-02 23:03:03 +0200 |
|---|---|---|
| committer | Nicofuma <github@nicofuma.fr> | 2014-05-03 11:29:14 +0200 |
| commit | dc6e2be884fdb8d869e7da03984014fd18e30ae2 (patch) | |
| tree | d8b169637826f923389f9cdb45fea84b0b34ecd9 /phpBB/includes/functions_url_matcher.php | |
| parent | 3b823465db93cf525249d00a412d5417b3216b83 (diff) | |
| download | forums-dc6e2be884fdb8d869e7da03984014fd18e30ae2.tar forums-dc6e2be884fdb8d869e7da03984014fd18e30ae2.tar.gz forums-dc6e2be884fdb8d869e7da03984014fd18e30ae2.tar.bz2 forums-dc6e2be884fdb8d869e7da03984014fd18e30ae2.tar.xz forums-dc6e2be884fdb8d869e7da03984014fd18e30ae2.zip | |
[ticket/11497] Remove 'ext.finder' from services' list
PHPBB3-11497
Diffstat (limited to 'phpBB/includes/functions_url_matcher.php')
| -rw-r--r-- | phpBB/includes/functions_url_matcher.php | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/phpBB/includes/functions_url_matcher.php b/phpBB/includes/functions_url_matcher.php index 8e5ae20f93..bc91a38012 100644 --- a/phpBB/includes/functions_url_matcher.php +++ b/phpBB/includes/functions_url_matcher.php @@ -22,22 +22,22 @@ if (!defined('IN_PHPBB')) /** * Create a new UrlMatcher class and dump it into the cache file * -* @param \phpbb\extension\finder $finder Extension finder +* @param \phpbb\extension\manager $manager Extension manager * @param RequestContext $context Symfony RequestContext object * @param string $root_path Root path * @param string $php_ext PHP extension * @return null */ -function phpbb_get_url_matcher(\phpbb\extension\finder $finder, RequestContext $context, $root_path, $php_ext) +function phpbb_get_url_matcher(\phpbb\extension\manager $manager, RequestContext $context, $root_path, $php_ext) { if (defined('DEBUG')) { - return phpbb_create_url_matcher($finder, $context, $root_path); + return phpbb_create_url_matcher($manager, $context, $root_path); } if (!phpbb_url_matcher_dumped($root_path, $php_ext)) { - phpbb_create_dumped_url_matcher($finder, $root_path, $php_ext); + phpbb_create_dumped_url_matcher($manager, $root_path, $php_ext); } return phpbb_load_url_matcher($context, $root_path, $php_ext); @@ -46,14 +46,15 @@ function phpbb_get_url_matcher(\phpbb\extension\finder $finder, RequestContext $ /** * Create a new UrlMatcher class and dump it into the cache file * -* @param \phpbb\extension\finder $finder Extension finder +* @param \phpbb\extension\manager $manager Extension manager * @param string $root_path Root path * @param string $php_ext PHP extension * @return null */ -function phpbb_create_dumped_url_matcher(\phpbb\extension\finder $finder, $root_path, $php_ext) +function phpbb_create_dumped_url_matcher(\phpbb\extension\manager $manager, $root_path, $php_ext) { - $provider = new \phpbb\controller\provider($finder); + $provider = new \phpbb\controller\provider(); + $provider->set_ext_finder($manager->get_finder()); $routes = $provider->find($root_path)->get_routes(); $dumper = new PhpMatcherDumper($routes); $cached_url_matcher_dump = $dumper->dump(array( @@ -66,13 +67,14 @@ function phpbb_create_dumped_url_matcher(\phpbb\extension\finder $finder, $root_ /** * Create a non-cached UrlMatcher * -* @param \phpbb\extension\finder $finder Extension finder +* @param \phpbb\extension\manager $manager Extension manager * @param RequestContext $context Symfony RequestContext object * @return UrlMatcher */ -function phpbb_create_url_matcher(\phpbb\extension\finder $finder, RequestContext $context, $root_path) +function phpbb_create_url_matcher(\phpbb\extension\manager $manager, RequestContext $context, $root_path) { - $provider = new \phpbb\controller\provider($finder); + $provider = new \phpbb\controller\provider(); + $provider->set_ext_finder($manager->get_finder()); $routes = $provider->find($root_path)->get_routes(); return new UrlMatcher($routes, $context); } |