diff options
| author | David King <imkingdavid@gmail.com> | 2012-11-15 13:59:30 -0500 |
|---|---|---|
| committer | David King <imkingdavid@gmail.com> | 2012-11-16 17:05:46 -0500 |
| commit | db1d49d559a337f7266a9e9f0cfaf3eb025b0ed1 (patch) | |
| tree | 20a76efd46d821a96796bc2b8d026cbd3ad20e6a /phpBB/includes/functions_url_matcher.php | |
| parent | b4eff4f06acce78536a392b733f2438f4d1d1c52 (diff) | |
| download | forums-db1d49d559a337f7266a9e9f0cfaf3eb025b0ed1.tar forums-db1d49d559a337f7266a9e9f0cfaf3eb025b0ed1.tar.gz forums-db1d49d559a337f7266a9e9f0cfaf3eb025b0ed1.tar.bz2 forums-db1d49d559a337f7266a9e9f0cfaf3eb025b0ed1.tar.xz forums-db1d49d559a337f7266a9e9f0cfaf3eb025b0ed1.zip | |
[feature/controller] Rename get_paths to import_paths_from_finder
Also removed unused variable from url_matcher function
PHPBB3-10864
Diffstat (limited to 'phpBB/includes/functions_url_matcher.php')
| -rw-r--r-- | phpBB/includes/functions_url_matcher.php | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/phpBB/includes/functions_url_matcher.php b/phpBB/includes/functions_url_matcher.php index 782acc4c20..7280cb74eb 100644 --- a/phpBB/includes/functions_url_matcher.php +++ b/phpBB/includes/functions_url_matcher.php @@ -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); } /** |