diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-03-08 16:32:43 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-03-08 16:37:22 +0100 |
| commit | 07c07171f9b70a49b592473b8a8400d3838333a3 (patch) | |
| tree | 0dbacc6b1f177c47e99b0be122a42ccf51f510f3 /phpBB | |
| parent | 275910d8b0fd8d5edeee07eb05ad82da48cc72a3 (diff) | |
| download | forums-07c07171f9b70a49b592473b8a8400d3838333a3.tar forums-07c07171f9b70a49b592473b8a8400d3838333a3.tar.gz forums-07c07171f9b70a49b592473b8a8400d3838333a3.tar.bz2 forums-07c07171f9b70a49b592473b8a8400d3838333a3.tar.xz forums-07c07171f9b70a49b592473b8a8400d3838333a3.zip | |
[ticket/12090] Make provider a service and inject it into the helper
PHPBB3-12090
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/config/services.yml | 7 | ||||
| -rw-r--r-- | phpBB/includes/functions_url_matcher.php | 8 | ||||
| -rw-r--r-- | phpBB/phpbb/controller/helper.php | 6 | ||||
| -rw-r--r-- | phpBB/phpbb/controller/provider.php | 30 |
4 files changed, 23 insertions, 28 deletions
diff --git a/phpBB/config/services.yml b/phpBB/config/services.yml index 3427f95cc1..e474c51ae0 100644 --- a/phpBB/config/services.yml +++ b/phpBB/config/services.yml @@ -91,10 +91,10 @@ services: controller.helper: class: phpbb\controller\helper arguments: - - @ext.finder - @template - @user - @config + - @controller.provider - %core.root_path% - %core.php_ext% @@ -105,6 +105,11 @@ services: - @service_container - @template + controller.provider: + class: phpbb\controller\provider + arguments: + - @ext.finder + cron.task_collection: class: phpbb\di\service_collection arguments: diff --git a/phpBB/includes/functions_url_matcher.php b/phpBB/includes/functions_url_matcher.php index c5d6815119..4db1bfa01f 100644 --- a/phpBB/includes/functions_url_matcher.php +++ b/phpBB/includes/functions_url_matcher.php @@ -53,8 +53,8 @@ function phpbb_get_url_matcher(\phpbb\extension\finder $finder, RequestContext $ */ function phpbb_create_dumped_url_matcher(\phpbb\extension\finder $finder, $root_path, $php_ext) { - $provider = new \phpbb\controller\provider(); - $routes = $provider->import_paths_from_finder($finder)->find($root_path); + $provider = new \phpbb\controller\provider($finder); + $routes = $provider->find($root_path); $dumper = new PhpMatcherDumper($routes); $cached_url_matcher_dump = $dumper->dump(array( 'class' => 'phpbb_url_matcher', @@ -72,8 +72,8 @@ function phpbb_create_dumped_url_matcher(\phpbb\extension\finder $finder, $root_ */ function phpbb_create_url_matcher(\phpbb\extension\finder $finder, RequestContext $context, $root_path) { - $provider = new \phpbb\controller\provider(); - $routes = $provider->import_paths_from_finder($finder)->find($root_path); + $provider = new \phpbb\controller\provider($finder); + $routes = $provider->find($root_path); return new UrlMatcher($routes, $context); } diff --git a/phpBB/phpbb/controller/helper.php b/phpBB/phpbb/controller/helper.php index daa52ec672..c97e0883f4 100644 --- a/phpBB/phpbb/controller/helper.php +++ b/phpBB/phpbb/controller/helper.php @@ -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); } diff --git a/phpBB/phpbb/controller/provider.php b/phpBB/phpbb/controller/provider.php index fde51696e8..fbe717f1af 100644 --- a/phpBB/phpbb/controller/provider.php +++ b/phpBB/phpbb/controller/provider.php @@ -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() + )); + } } /** |