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/phpbb/controller/provider.php | |
| 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/phpbb/controller/provider.php')
| -rw-r--r-- | phpBB/phpbb/controller/provider.php | 30 |
1 files changed, 11 insertions, 19 deletions
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() + )); + } } /** |