1 files changed, 28 insertions, 16 deletions
diff --git a/phpBB/phpbb/controller/provider.php b/phpBB/phpbb/controller/provider.php
index fde51696e8..a32ce1473b 100644
--- a/phpBB/phpbb/controller/provider.php
+++ b/phpBB/phpbb/controller/provider.php
@@ -26,6 +26,12 @@ class provider
 	protected $routing_files;
 
 	/**
+	* Collection of the routes in phpBB and all found extensions
+	* @var RouteCollection
+	*/
+	protected $routes;
+
+	/**
 	* Construct method
 	*
 	* @param array() $routing_files Array of strings containing paths
@@ -37,39 +43,45 @@ class provider
 	}
 
 	/**
-	* 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
+	* @param \phpbb\extension\finder $finder
+	* @return null
 	*/
-	public function import_paths_from_finder(\phpbb\extension\finder $finder)
+	public function find_routing_files(\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()
+		$this->routing_files = array_merge($this->routing_files, array('config/routing.yml'), array_keys($finder
+				->directory('/config')
+				->suffix('routing.yml')
+				->find()
 		));
-
-		return $this;
 	}
 
 	/**
-	* 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;
 	}
 }