diff options
| author | Nicofuma <github@nicofuma.fr> | 2014-05-02 23:03:03 +0200 |
|---|---|---|
| committer | Nicofuma <github@nicofuma.fr> | 2014-05-03 11:29:14 +0200 |
| commit | dc6e2be884fdb8d869e7da03984014fd18e30ae2 (patch) | |
| tree | d8b169637826f923389f9cdb45fea84b0b34ecd9 /phpBB/phpbb/controller/provider.php | |
| parent | 3b823465db93cf525249d00a412d5417b3216b83 (diff) | |
| download | forums-dc6e2be884fdb8d869e7da03984014fd18e30ae2.tar forums-dc6e2be884fdb8d869e7da03984014fd18e30ae2.tar.gz forums-dc6e2be884fdb8d869e7da03984014fd18e30ae2.tar.bz2 forums-dc6e2be884fdb8d869e7da03984014fd18e30ae2.tar.xz forums-dc6e2be884fdb8d869e7da03984014fd18e30ae2.zip | |
[ticket/11497] Remove 'ext.finder' from services' list
PHPBB3-11497
Diffstat (limited to 'phpBB/phpbb/controller/provider.php')
| -rw-r--r-- | phpBB/phpbb/controller/provider.php | 26 |
1 files changed, 15 insertions, 11 deletions
diff --git a/phpBB/phpbb/controller/provider.php b/phpBB/phpbb/controller/provider.php index 2c7493f64c..7e33db1f74 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 set_ext_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($this->routing_files, array('config/routing.yml'), array_keys($finder + ->directory('config') + ->suffix('routing.yml') + ->find() + )); } /** |