mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-08 01:36:57 +02:00
Code Issues Releases Wiki Activity

[feature/controller] Rename get_paths to import_paths_from_finder

Browse Source 
Also removed unused variable from url_matcher function

PHPBB3-10864
This commit is contained in:
David King
2012-11-15 13:59:30 -05:00
parent b4eff4f06a
commit db1d49d559
2 changed files with 9 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
phpBB/includes/functions_url_matcher.php
View File

@@ -37,7 +37,7 @@ function phpbb_get_url_matcher(phpbb_extension_finder $finder, RequestContext $c
if (!phpbb_url_matcher_dumped($root_path, $php_ext))
{
phpbb_create_dumped_url_matcher($finder, $context, $root_path, $php_ext);
phpbb_create_dumped_url_matcher($finder, $root_path, $php_ext);
}
return phpbb_load_url_matcher($context, $root_path, $php_ext);
@@ -47,15 +47,14 @@ function phpbb_get_url_matcher(phpbb_extension_finder $finder, RequestContext $c
* Create a new UrlMatcher class and dump it into the cache file
*
* @param phpbb_extension_finder $finder Extension finder
* @param RequestContext $context Symfony RequestContext object
* @param string $root_path Root path
* @param string $php_ext PHP extension
* @return null
*/
function phpbb_create_dumped_url_matcher(phpbb_extension_finder $finder, RequestContext $context, $root_path, $php_ext)
function phpbb_create_dumped_url_matcher(phpbb_extension_finder $finder, $root_path, $php_ext)
{
$provider = new phpbb_controller_provider();
$routes = $provider->get_paths($finder)->find();
$routes = $provider->import_paths_from_finder($finder)->find();
$dumper = new PhpMatcherDumper($routes);
$cached_url_matcher_dump = $dumper->dump(array(
'class' => 'phpbb_url_matcher',
@@ -74,7 +73,8 @@ function phpbb_create_dumped_url_matcher(phpbb_extension_finder $finder, Request
function phpbb_create_url_matcher(phpbb_extension_finder $finder, RequestContext $context)
{
$provider = new phpbb_controller_provider();
return new UrlMatcher($provider->get_paths($finder)->find(), $context);
$routes = $provider->import_paths_from_finder($finder)->find();
return new UrlMatcher($routes, $context);
}
/**