mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 22:10:45 +02:00
Code Issues Releases Wiki Activity

[ticket/12090] Split finding routes and returning routes into 2 methods

Browse Source 
PHPBB3-12090
This commit is contained in:
Joas Schilling
2014-03-09 18:38:21 +01:00
parent 436b1d3577
commit 2eb24d0ace
4 changed files with 25 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
phpBB/phpbb/controller/helper.php
View File

@@ -66,8 +66,7 @@ class helper
$this->config = $config;
$this->phpbb_root_path = $phpbb_root_path;
$this->php_ext = $php_ext;
$this->route_collection = $provider->find($this->phpbb_root_path);
$this->route_collection = $provider->find($this->phpbb_root_path)->get_routes();
}
/**

26
phpBB/phpbb/controller/provider.php
View File

@@ -25,6 +25,12 @@ class provider
*/
protected $routing_files;
/**
* Collection of the routes in phpBB and all found extensions
* @var RouteCollection
*/
protected $routes;
/**
* Construct method
*
@@ -48,20 +54,30 @@ class provider
}
/**
* Get a list of controllers and return it
* Find a list of controllers and return it
*
* @param string $base_path Base path to prepend to file paths
* @return array Array of controllers and their route information
* @return null
*/
public function find($base_path = '')
{
$routes = new RouteCollection;
$this->routes = new RouteCollection;
foreach ($this->routing_files as $file_path)
{
$loader = new YamlFileLoader(new FileLocator($base_path));
$routes->addCollection($loader->load($file_path));
$this->routes->addCollection($loader->load($file_path));
}
return $routes;
return $this;
}
/**
* Get the list of routes
*
* @return RouteCollection Get the route collection
*/
public function get_routes()
{
return $this->routes;
}
}