aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
diff options
context:
space:
mode:
authorTristan Darricau <github@nicofuma.fr>2014-05-05 18:20:14 +0200
committerTristan Darricau <github@nicofuma.fr>2014-05-05 18:20:14 +0200
commit346c6f39980fe060b57549a8364f2e5dece1eb83 (patch)
tree85c97630d5619e9f255bb15718e190ad4f881123 /phpBB
parent78e1d119f5b1f92da8ffe068d947035b6f5305ea (diff)
downloadforums-346c6f39980fe060b57549a8364f2e5dece1eb83.tar
forums-346c6f39980fe060b57549a8364f2e5dece1eb83.tar.gz
forums-346c6f39980fe060b57549a8364f2e5dece1eb83.tar.bz2
forums-346c6f39980fe060b57549a8364f2e5dece1eb83.tar.xz
forums-346c6f39980fe060b57549a8364f2e5dece1eb83.zip
[ticket/11497] Rename set_ext_finder in find_routing_files
PHPBB3-11497
Diffstat (limited to 'phpBB')
-rw-r--r--phpBB/includes/functions_url_matcher.php4
-rw-r--r--phpBB/phpbb/controller/helper.php2
-rw-r--r--phpBB/phpbb/controller/provider.php2
3 files changed, 4 insertions, 4 deletions
diff --git a/phpBB/includes/functions_url_matcher.php b/phpBB/includes/functions_url_matcher.php
index bc91a38012..cdbe60595c 100644
--- a/phpBB/includes/functions_url_matcher.php
+++ b/phpBB/includes/functions_url_matcher.php
@@ -54,7 +54,7 @@ function phpbb_get_url_matcher(\phpbb\extension\manager $manager, RequestContext
function phpbb_create_dumped_url_matcher(\phpbb\extension\manager $manager, $root_path, $php_ext)
{
$provider = new \phpbb\controller\provider();
- $provider->set_ext_finder($manager->get_finder());
+ $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(
@@ -74,7 +74,7 @@ function phpbb_create_dumped_url_matcher(\phpbb\extension\manager $manager, $roo
function phpbb_create_url_matcher(\phpbb\extension\manager $manager, RequestContext $context, $root_path)
{
$provider = new \phpbb\controller\provider();
- $provider->set_ext_finder($manager->get_finder());
+ $provider->find_routing_files($manager->get_finder());
$routes = $provider->find($root_path)->get_routes();
return new UrlMatcher($routes, $context);
}
diff --git a/phpBB/phpbb/controller/helper.php b/phpBB/phpbb/controller/helper.php
index 9f1a3864ef..959a24f277 100644
--- a/phpBB/phpbb/controller/helper.php
+++ b/phpBB/phpbb/controller/helper.php
@@ -67,7 +67,7 @@ class helper
$this->config = $config;
$this->phpbb_root_path = $phpbb_root_path;
$this->php_ext = $php_ext;
- $provider->set_ext_finder($manager->get_finder());
+ $provider->find_routing_files($manager->get_finder());
$this->route_collection = $provider->find($phpbb_root_path)->get_routes();
}
diff --git a/phpBB/phpbb/controller/provider.php b/phpBB/phpbb/controller/provider.php
index 287cb44593..a32ce1473b 100644
--- a/phpBB/phpbb/controller/provider.php
+++ b/phpBB/phpbb/controller/provider.php
@@ -46,7 +46,7 @@ class provider
* @param \phpbb\extension\finder $finder
* @return null
*/
- public function set_ext_finder(\phpbb\extension\finder $finder)
+ public function find_routing_files(\phpbb\extension\finder $finder)
{
// We hardcode the path to the core config directory
// because the finder cannot find it