diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-05-06 13:51:29 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-05-06 13:51:29 +0200 |
| commit | 1b3d54f5dd38bc1bbb5d1f4d87ad53e04e8a9bf6 (patch) | |
| tree | 891277758f0876cb4661392b88a2e2be5523598c /phpBB/phpbb/controller | |
| parent | 71379c3a0f32b57d9d7c73dda7a98edea0ce6736 (diff) | |
| parent | 346c6f39980fe060b57549a8364f2e5dece1eb83 (diff) | |
| download | forums-1b3d54f5dd38bc1bbb5d1f4d87ad53e04e8a9bf6.tar forums-1b3d54f5dd38bc1bbb5d1f4d87ad53e04e8a9bf6.tar.gz forums-1b3d54f5dd38bc1bbb5d1f4d87ad53e04e8a9bf6.tar.bz2 forums-1b3d54f5dd38bc1bbb5d1f4d87ad53e04e8a9bf6.tar.xz forums-1b3d54f5dd38bc1bbb5d1f4d87ad53e04e8a9bf6.zip | |
Merge pull request #2397 from Nicofuma/ticket/11497
[ticket/11497] Remove 'ext.finder' from services' list
* Nicofuma/ticket/11497:
[ticket/11497] Rename set_ext_finder in find_routing_files
[ticket/11497] Change the date in the package declaration
[ticket/11497] Fix pagination tests
[ticket/11497] Use a mock object to define the root folder for the finder
[ticket/11497] Generate the list of the routes in controller_helper
[ticket/11497] Fix the path for the finder in controller_provider
[ticket/11497] Fix tests
[ticket/11497] Update pagination test
[ticket/11497] Remove 'ext.finder' from services' list
Diffstat (limited to 'phpBB/phpbb/controller')
| -rw-r--r-- | phpBB/phpbb/controller/helper.php | 6 | ||||
| -rw-r--r-- | phpBB/phpbb/controller/provider.php | 26 |
2 files changed, 19 insertions, 13 deletions
diff --git a/phpBB/phpbb/controller/helper.php b/phpBB/phpbb/controller/helper.php index 54c30c93fc..959a24f277 100644 --- a/phpBB/phpbb/controller/helper.php +++ b/phpBB/phpbb/controller/helper.php @@ -56,17 +56,19 @@ class helper * @param \phpbb\user $user User object * @param \phpbb\config\config $config Config object * @param \phpbb\controller\provider $provider Path provider + * @param \phpbb\extension\manager $manager Extension manager object * @param string $phpbb_root_path phpBB root path * @param string $php_ext PHP extension */ - public function __construct(\phpbb\template\template $template, \phpbb\user $user, \phpbb\config\config $config, \phpbb\controller\provider $provider, $phpbb_root_path, $php_ext) + public function __construct(\phpbb\template\template $template, \phpbb\user $user, \phpbb\config\config $config, \phpbb\controller\provider $provider, \phpbb\extension\manager $manager, $phpbb_root_path, $php_ext) { $this->template = $template; $this->user = $user; $this->config = $config; $this->phpbb_root_path = $phpbb_root_path; $this->php_ext = $php_ext; - $this->route_collection = $provider->get_routes(); + $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 2c7493f64c..a32ce1473b 100644 --- a/phpBB/phpbb/controller/provider.php +++ b/phpBB/phpbb/controller/provider.php @@ -37,20 +37,24 @@ class provider * @param array() $routing_files Array of strings containing paths * to YAML files holding route information */ - public function __construct(\phpbb\extension\finder $finder = null, $routing_files = array()) + public function __construct($routing_files = array()) { $this->routing_files = $routing_files; + } - if ($finder) - { - // We hardcode the path to the core config directory - // because the finder cannot find it - $this->routing_files = array_merge($this->routing_files, array('config/routing.yml'), array_keys($finder - ->directory('/config') - ->suffix('routing.yml') - ->find() - )); - } + /** + * @param \phpbb\extension\finder $finder + * @return null + */ + public function find_routing_files(\phpbb\extension\finder $finder) + { + // We hardcode the path to the core config directory + // because the finder cannot find it + $this->routing_files = array_merge($this->routing_files, array('config/routing.yml'), array_keys($finder + ->directory('/config') + ->suffix('routing.yml') + ->find() + )); } /** |