2 files changed, 9 insertions, 21 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;
 	}
diff --git a/phpBB/includes/functions_url_matcher.php b/phpBB/includes/functions_url_matcher.php
index 782acc4c20..7280cb74eb 100644
--- a/phpBB/includes/functions_url_matcher.php
+++ b/phpBB/includes/functions_url_matcher.php
@@ -37,7 +37,7 @@ function phpbb_get_url_matcher(phpbb_extension_finder $finder, RequestContext $c
 
 	if (!phpbb_url_matcher_dumped($root_path, $php_ext))
 	{
-		phpbb_create_dumped_url_matcher($finder, $context, $root_path, $php_ext);
+		phpbb_create_dumped_url_matcher($finder, $root_path, $php_ext);
 	}
 
 	return phpbb_load_url_matcher($context, $root_path, $php_ext);
@@ -47,15 +47,14 @@ function phpbb_get_url_matcher(phpbb_extension_finder $finder, RequestContext $c
 * Create a new UrlMatcher class and dump it into the cache file
 *
 * @param phpbb_extension_finder $finder Extension finder
-* @param RequestContext $context Symfony RequestContext object
 * @param string $root_path Root path
 * @param string $php_ext PHP extension
 * @return null
 */
-function phpbb_create_dumped_url_matcher(phpbb_extension_finder $finder, RequestContext $context, $root_path, $php_ext)
+function phpbb_create_dumped_url_matcher(phpbb_extension_finder $finder, $root_path, $php_ext)
 {
 	$provider = new phpbb_controller_provider();
-	$routes = $provider->get_paths($finder)->find();
+	$routes = $provider->import_paths_from_finder($finder)->find();
 	$dumper = new PhpMatcherDumper($routes);
 	$cached_url_matcher_dump = $dumper->dump(array(
 		'class'			=> 'phpbb_url_matcher',
@@ -74,7 +73,8 @@ function phpbb_create_dumped_url_matcher(phpbb_extension_finder $finder, Request
 function phpbb_create_url_matcher(phpbb_extension_finder $finder, RequestContext $context)
 {
 	$provider = new phpbb_controller_provider();
-	return new UrlMatcher($provider->get_paths($finder)->find(), $context);
+	$routes = $provider->import_paths_from_finder($finder)->find();
+	return new UrlMatcher($routes, $context);
 }
 
 /**