mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-07 01:06:48 +02:00
Code Issues Releases Wiki Activity

[ticket/12090] Make provider a service and inject it into the helper

Browse Source 
PHPBB3-12090
This commit is contained in:
Joas Schilling
2014-03-08 16:32:43 +01:00
parent 275910d8b0
commit 07c07171f9
7 changed files with 28 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
phpBB/phpbb/controller/helper.php
View File

@@ -58,16 +58,14 @@ class helper
* @param string $phpbb_root_path phpBB root path
* @param string $php_ext PHP extension
*/
public function __construct(\phpbb\extension\finder $finder, \phpbb\template\template $template, \phpbb\user $user, \phpbb\config\config $config, $phpbb_root_path, $php_ext)
public function __construct(\phpbb\template\template $template, \phpbb\user $user, \phpbb\config\config $config, \phpbb\controller\provider $provider, $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;
$provider = new \phpbb\controller\provider();
$this->route_collection = $provider->import_paths_from_finder($finder)->find($this->phpbb_root_path);
$this->route_collection = $provider->find($this->phpbb_root_path);
}

30
phpBB/phpbb/controller/provider.php
View File

@@ -31,28 +31,20 @@ class provider
* @param array() $routing_files Array of strings containing paths
* to YAML files holding route information
*/
public function __construct($routing_files = array())
public function __construct(\phpbb\extension\finder $finder = null, $routing_files = array())
{
$this->routing_files = $routing_files;
}
/**
* Locate paths containing routing files
* This sets an internal property but does not return the paths.
*
* @return The current instance of this object for method chaining
*/
public function import_paths_from_finder(\phpbb\extension\finder $finder)
{
// We hardcode the path to the core config directory
// because the finder cannot find it
$this->routing_files = array_merge(array('config/routing.yml'), array_keys($finder
->directory('config')
->suffix('routing.yml')
->find()
));
return $this;
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()
));
}
}
/**