diff options
| author | David King <imkingdavid@gmail.com> | 2012-11-15 13:59:30 -0500 |
|---|---|---|
| committer | David King <imkingdavid@gmail.com> | 2012-11-16 17:05:46 -0500 |
| commit | db1d49d559a337f7266a9e9f0cfaf3eb025b0ed1 (patch) | |
| tree | 20a76efd46d821a96796bc2b8d026cbd3ad20e6a /phpBB/includes/controller/provider.php | |
| parent | b4eff4f06acce78536a392b733f2438f4d1d1c52 (diff) | |
| download | forums-db1d49d559a337f7266a9e9f0cfaf3eb025b0ed1.tar forums-db1d49d559a337f7266a9e9f0cfaf3eb025b0ed1.tar.gz forums-db1d49d559a337f7266a9e9f0cfaf3eb025b0ed1.tar.bz2 forums-db1d49d559a337f7266a9e9f0cfaf3eb025b0ed1.tar.xz forums-db1d49d559a337f7266a9e9f0cfaf3eb025b0ed1.zip | |
[feature/controller] Rename get_paths to import_paths_from_finder
Also removed unused variable from url_matcher function
PHPBB3-10864
Diffstat (limited to 'phpBB/includes/controller/provider.php')
| -rw-r--r-- | phpBB/includes/controller/provider.php | 20 |
1 files changed, 4 insertions, 16 deletions
diff --git a/phpBB/includes/controller/provider.php b/phpBB/includes/controller/provider.php index 25deedb5d1..b2a5b9f6b2 100644 --- a/phpBB/includes/controller/provider.php +++ b/phpBB/includes/controller/provider.php @@ -39,7 +39,7 @@ class phpbb_controller_provider */ public function __construct($routing_paths = array()) { - $this->set_paths($routing_paths); + $this->routing_paths = $routing_paths; } /** @@ -48,28 +48,16 @@ class phpbb_controller_provider * * @return The current instance of this object for method chaining */ - public function get_paths(phpbb_extension_finder $finder) + 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->set_paths(array_merge(array('config'), array_map('dirname', array_keys($finder + $this->routing_paths = array_merge(array('config'), array_map('dirname', array_keys($finder ->directory('config') ->prefix('routing') ->suffix('yml') ->find() - )))); - - return $this; - } - - /** - * Set the $routing_paths property with a given list of paths - * - * @return The current instance of this object for method chaining - */ - public function set_paths(array $paths) - { - $this->routing_paths = $paths; + ))); return $this; } |