diff options
| author | Tristan Darricau <github@nicofuma.fr> | 2014-05-05 18:20:14 +0200 |
|---|---|---|
| committer | Tristan Darricau <github@nicofuma.fr> | 2014-05-05 18:20:14 +0200 |
| commit | 346c6f39980fe060b57549a8364f2e5dece1eb83 (patch) | |
| tree | 85c97630d5619e9f255bb15718e190ad4f881123 | |
| parent | 78e1d119f5b1f92da8ffe068d947035b6f5305ea (diff) | |
| download | forums-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
| -rw-r--r-- | phpBB/includes/functions_url_matcher.php | 4 | ||||
| -rw-r--r-- | phpBB/phpbb/controller/helper.php | 2 | ||||
| -rw-r--r-- | phpBB/phpbb/controller/provider.php | 2 | ||||
| -rw-r--r-- | tests/controller/controller_test.php | 2 | ||||
| -rw-r--r-- | tests/controller/helper_route_test.php | 2 | ||||
| -rw-r--r-- | tests/mock/controller_helper.php | 2 | ||||
| -rw-r--r-- | tests/pagination/pagination_test.php | 2 |
7 files changed, 8 insertions, 8 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 diff --git a/tests/controller/controller_test.php b/tests/controller/controller_test.php index c6d58d70ab..7b8b78dd22 100644 --- a/tests/controller/controller_test.php +++ b/tests/controller/controller_test.php @@ -30,7 +30,7 @@ class phpbb_controller_controller_test extends phpbb_test_case public function test_provider() { $provider = new \phpbb\controller\provider(); - $provider->set_ext_finder($this->extension_manager->get_finder()); + $provider->find_routing_files($this->extension_manager->get_finder()); $routes = $provider->find(__DIR__)->get_routes(); // This will need to be updated if any new routes are defined diff --git a/tests/controller/helper_route_test.php b/tests/controller/helper_route_test.php index c633df7c38..ae6f924a62 100644 --- a/tests/controller/helper_route_test.php +++ b/tests/controller/helper_route_test.php @@ -45,7 +45,7 @@ class phpbb_controller_helper_route_test extends phpbb_test_case new phpbb_mock_cache() ); $this->provider = new \phpbb\controller\provider(); - $this->provider->set_ext_finder($finder); + $this->provider->find_routing_files($finder); $this->provider->find(dirname(__FILE__) . '/'); } diff --git a/tests/mock/controller_helper.php b/tests/mock/controller_helper.php index d46d89b367..01ac6494d0 100644 --- a/tests/mock/controller_helper.php +++ b/tests/mock/controller_helper.php @@ -16,7 +16,7 @@ class phpbb_mock_controller_helper extends \phpbb\controller\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_ext)->get_routes(); } } diff --git a/tests/pagination/pagination_test.php b/tests/pagination/pagination_test.php index 13b31779c0..f7a02dc419 100644 --- a/tests/pagination/pagination_test.php +++ b/tests/pagination/pagination_test.php @@ -40,7 +40,7 @@ class phpbb_pagination_pagination_test extends phpbb_template_template_test_case $this->config = new \phpbb\config\config(array('enable_mod_rewrite' => '1')); $provider = new \phpbb\controller\provider(); - $provider->set_ext_finder($this->finder); + $provider->find_routing_files($this->finder); $provider->find(dirname(__FILE__) . '/'); $this->helper = new phpbb_mock_controller_helper($this->template, $this->user, $this->config, $provider, $manager, '', 'php', dirname(__FILE__) . '/'); $this->pagination = new \phpbb\pagination($this->template, $this->user, $this->helper); |