makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-18 01:08:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/11497] Rename set_ext_finder in find_routing_files

Browse source 
PHPBB3-11497
This commit is contained in:
Tristan Darricau 2014-05-05 18:20:14 +02:00
parent 78e1d119f5
commit 346c6f3998
7 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
phpBB/includes/functions_url_matcher.php
View file

@ -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) function phpbb_create_dumped_url_matcher(\phpbb\extension\manager $manager, $root_path, $php_ext)
{ {
$provider = new \phpbb\controller\provider(); $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(); $routes = $provider->find($root_path)->get_routes();
$dumper = new PhpMatcherDumper($routes); $dumper = new PhpMatcherDumper($routes);
$cached_url_matcher_dump = $dumper->dump(array( $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) function phpbb_create_url_matcher(\phpbb\extension\manager $manager, RequestContext $context, $root_path)
{ {
$provider = new \phpbb\controller\provider(); $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(); $routes = $provider->find($root_path)->get_routes();
return new UrlMatcher($routes, $context); return new UrlMatcher($routes, $context);
} }

2
phpBB/phpbb/controller/helper.php
View file

@ -67,7 +67,7 @@ class helper
$this->config = $config; $this->config = $config;
$this->phpbb_root_path = $phpbb_root_path; $this->phpbb_root_path = $phpbb_root_path;
$this->php_ext = $php_ext; $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(); $this->route_collection = $provider->find($phpbb_root_path)->get_routes();
} }

2
phpBB/phpbb/controller/provider.php
View file

@ -46,7 +46,7 @@ class provider
* @param \phpbb\extension\finder $finder * @param \phpbb\extension\finder $finder
* @return null * @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 // We hardcode the path to the core config directory
// because the finder cannot find it // because the finder cannot find it

2
tests/controller/controller_test.php
View file

@ -30,7 +30,7 @@ class phpbb_controller_controller_test extends phpbb_test_case
public function test_provider() public function test_provider()
{ {
$provider = new \phpbb\controller\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(); $routes = $provider->find(__DIR__)->get_routes();
// This will need to be updated if any new routes are defined // This will need to be updated if any new routes are defined

2
tests/controller/helper_route_test.php
View file

@ -45,7 +45,7 @@ class phpbb_controller_helper_route_test extends phpbb_test_case
new phpbb_mock_cache() new phpbb_mock_cache()
); );
$this->provider = new \phpbb\controller\provider(); $this->provider = new \phpbb\controller\provider();
$this->provider->set_ext_finder($finder); $this->provider->find_routing_files($finder);
$this->provider->find(dirname(__FILE__) . '/'); $this->provider->find(dirname(__FILE__) . '/');
} }

2
tests/mock/controller_helper.php
View file

@ -16,7 +16,7 @@ class phpbb_mock_controller_helper extends \phpbb\controller\helper
$this->config = $config; $this->config = $config;
$this->phpbb_root_path = $phpbb_root_path; $this->phpbb_root_path = $phpbb_root_path;
$this->php_ext = $php_ext; $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(); $this->route_collection = $provider->find($phpbb_root_path_ext)->get_routes();
} }
} }

2
tests/pagination/pagination_test.php
View file

@ -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')); $this->config = new \phpbb\config\config(array('enable_mod_rewrite' => '1'));
$provider = new \phpbb\controller\provider(); $provider = new \phpbb\controller\provider();
$provider->set_ext_finder($this->finder); $provider->find_routing_files($this->finder);
$provider->find(dirname(__FILE__) . '/'); $provider->find(dirname(__FILE__) . '/');
$this->helper = new phpbb_mock_controller_helper($this->template, $this->user, $this->config, $provider, $manager, '', 'php', 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); $this->pagination = new \phpbb\pagination($this->template, $this->user, $this->helper);