diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-05-06 13:51:29 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-05-06 13:51:29 +0200 |
| commit | 1b3d54f5dd38bc1bbb5d1f4d87ad53e04e8a9bf6 (patch) | |
| tree | 891277758f0876cb4661392b88a2e2be5523598c /phpBB/includes | |
| parent | 71379c3a0f32b57d9d7c73dda7a98edea0ce6736 (diff) | |
| parent | 346c6f39980fe060b57549a8364f2e5dece1eb83 (diff) | |
| download | forums-1b3d54f5dd38bc1bbb5d1f4d87ad53e04e8a9bf6.tar forums-1b3d54f5dd38bc1bbb5d1f4d87ad53e04e8a9bf6.tar.gz forums-1b3d54f5dd38bc1bbb5d1f4d87ad53e04e8a9bf6.tar.bz2 forums-1b3d54f5dd38bc1bbb5d1f4d87ad53e04e8a9bf6.tar.xz forums-1b3d54f5dd38bc1bbb5d1f4d87ad53e04e8a9bf6.zip | |
Merge pull request #2397 from Nicofuma/ticket/11497
[ticket/11497] Remove 'ext.finder' from services' list
* Nicofuma/ticket/11497:
[ticket/11497] Rename set_ext_finder in find_routing_files
[ticket/11497] Change the date in the package declaration
[ticket/11497] Fix pagination tests
[ticket/11497] Use a mock object to define the root folder for the finder
[ticket/11497] Generate the list of the routes in controller_helper
[ticket/11497] Fix the path for the finder in controller_provider
[ticket/11497] Fix tests
[ticket/11497] Update pagination test
[ticket/11497] Remove 'ext.finder' from services' list
Diffstat (limited to 'phpBB/includes')
| -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..cdbe60595c 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->find_routing_files($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->find_routing_files($manager->get_finder()); $routes = $provider->find($root_path)->get_routes(); return new UrlMatcher($routes, $context); } |