diff options
| author | Nils Adermann <naderman@naderman.de> | 2013-10-22 00:29:20 -0700 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2013-10-22 00:29:20 -0700 |
| commit | a7e41b23fd7e7f39b1e37796eca618a59e0cb9be (patch) | |
| tree | f6f1ab691dce3e59204271a7e4c4463f406ac27d /phpBB/phpbb/controller/provider.php | |
| parent | ba5b53521a186dc23d6d4b849c7f76196c783d43 (diff) | |
| parent | 96317b2c4518976c683dd67f38a8a6f8faabdf15 (diff) | |
| download | forums-a7e41b23fd7e7f39b1e37796eca618a59e0cb9be.tar forums-a7e41b23fd7e7f39b1e37796eca618a59e0cb9be.tar.gz forums-a7e41b23fd7e7f39b1e37796eca618a59e0cb9be.tar.bz2 forums-a7e41b23fd7e7f39b1e37796eca618a59e0cb9be.tar.xz forums-a7e41b23fd7e7f39b1e37796eca618a59e0cb9be.zip | |
Merge pull request #1801 from nickvergessen/ticket/11948
Ticket/11948 Extensions should be allowed to have more then 1 routing file
Diffstat (limited to 'phpBB/phpbb/controller/provider.php')
| -rw-r--r-- | phpBB/phpbb/controller/provider.php | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/phpBB/phpbb/controller/provider.php b/phpBB/phpbb/controller/provider.php index 3aad08e3aa..048ca72084 100644 --- a/phpBB/phpbb/controller/provider.php +++ b/phpBB/phpbb/controller/provider.php @@ -31,17 +31,17 @@ class provider * YAML file(s) containing route information * @var array */ - protected $routing_paths; + protected $routing_files; /** * Construct method * - * @param array() $routing_paths Array of strings containing paths + * @param array() $routing_files Array of strings containing paths * to YAML files holding route information */ - public function __construct($routing_paths = array()) + public function __construct($routing_files = array()) { - $this->routing_paths = $routing_paths; + $this->routing_files = $routing_files; } /** @@ -54,12 +54,11 @@ class provider { // We hardcode the path to the core config directory // because the finder cannot find it - $this->routing_paths = array_merge(array('config'), array_map('dirname', array_keys($finder + $this->routing_files = array_merge(array('config/routing.yml'), array_keys($finder ->directory('config') - ->prefix('routing') - ->suffix('yml') + ->suffix('routing.yml') ->find() - ))); + )); return $this; } @@ -73,10 +72,10 @@ class provider public function find($base_path = '') { $routes = new RouteCollection; - foreach ($this->routing_paths as $path) + foreach ($this->routing_files as $file_path) { - $loader = new YamlFileLoader(new FileLocator($base_path . $path)); - $routes->addCollection($loader->load('routing.yml')); + $loader = new YamlFileLoader(new FileLocator($base_path)); + $routes->addCollection($loader->load($file_path)); } return $routes; |