2 files changed, 11 insertions, 100 deletions
diff --git a/phpBB/phpbb/controller/helper.php b/phpBB/phpbb/controller/helper.php
index c6c470e91b..2790ea4277 100644
--- a/phpBB/phpbb/controller/helper.php
+++ b/phpBB/phpbb/controller/helper.php
@@ -14,7 +14,6 @@
 namespace phpbb\controller;
 
 use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\Routing\Generator\UrlGenerator;
 use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
 use Symfony\Component\Routing\RequestContext;
 
@@ -41,6 +40,12 @@ class helper
 	*/
 	protected $config;
 
+	/**
+	 * phpBB router
+	 * @var \phpbb\routing\router
+	 */
+	protected $router;
+
 	/* @var \phpbb\symfony_request */
 	protected $symfony_request;
 
@@ -70,26 +75,24 @@ class helper
 	* @param \phpbb\template\template $template Template object
 	* @param \phpbb\user $user User object
 	* @param \phpbb\config\config $config Config object
-	* @param \phpbb\controller\provider $provider Path provider
-	* @param \phpbb\extension\manager $manager Extension manager object
+	* @param \phpbb\routing\router $router phpBB router
 	* @param \phpbb\symfony_request $symfony_request Symfony Request object
 	* @param \phpbb\request\request_interface $request phpBB request object
 	* @param \phpbb\filesystem $filesystem The filesystem object
 	* @param string $phpbb_root_path phpBB root path
 	* @param string $php_ext PHP file extension
 	*/
-	public function __construct(\phpbb\template\template $template, \phpbb\user $user, \phpbb\config\config $config, \phpbb\controller\provider $provider, \phpbb\extension\manager $manager, \phpbb\symfony_request $symfony_request, \phpbb\request\request_interface $request, \phpbb\filesystem $filesystem, $phpbb_root_path, $php_ext)
+	public function __construct(\phpbb\template\template $template, \phpbb\user $user, \phpbb\config\config $config, \phpbb\routing\router $router, \phpbb\symfony_request $symfony_request, \phpbb\request\request_interface $request, \phpbb\filesystem $filesystem, $phpbb_root_path, $php_ext)
 	{
 		$this->template = $template;
 		$this->user = $user;
 		$this->config = $config;
+		$this->router = $router;
 		$this->symfony_request = $symfony_request;
 		$this->request = $request;
 		$this->filesystem = $filesystem;
 		$this->phpbb_root_path = $phpbb_root_path;
 		$this->php_ext = $php_ext;
-		$provider->find_routing_files($manager->get_finder());
-		$this->route_collection = $provider->find($phpbb_root_path)->get_routes();
 	}
 
 	/**
@@ -162,8 +165,8 @@ class helper
 
 		$context->setBaseUrl($base_url);
 
-		$url_generator = new UrlGenerator($this->route_collection, $context);
-		$route_url = $url_generator->generate($route, $params, $reference_type);
+		$this->router->setContext($context);
+		$route_url = $this->router->generate($route, $params, $reference_type);
 
 		if ($is_amp)
 		{
diff --git a/phpBB/phpbb/controller/provider.php b/phpBB/phpbb/controller/provider.php
deleted file mode 100644
index 7e26848290..0000000000
--- a/phpBB/phpbb/controller/provider.php
+++ /dev/null
@@ -1,92 +0,0 @@
-<?php
-/**
-*
-* This file is part of the phpBB Forum Software package.
-*
-* @copyright (c) phpBB Limited <https://www.phpbb.com>
-* @license GNU General Public License, version 2 (GPL-2.0)
-*
-* For full copyright and license information, please see
-* the docs/CREDITS.txt file.
-*
-*/
-
-namespace phpbb\controller;
-
-use Symfony\Component\Routing\RouteCollection;
-use Symfony\Component\Routing\Loader\YamlFileLoader;
-use Symfony\Component\Config\FileLocator;
-
-/**
-* Controller interface
-*/
-class provider
-{
-	/**
-	* YAML file(s) containing route information
-	* @var array
-	*/
-	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
-	*							to YAML files holding route information
-	*/
-	public function __construct($routing_files = array())
-	{
-		$this->routing_files = $routing_files;
-	}
-
-	/**
-	* Find the list of routing files
-	*
-	* @param \phpbb\finder $finder
-	* @return null
-	*/
-	public function find_routing_files(\phpbb\finder $finder)
-	{
-		// We hardcode the path to the core config directory
-		// because the finder cannot find it
-		$this->routing_files = array_merge($this->routing_files, array('config/routing.yml'), array_keys($finder
-				->directory('/config')
-				->suffix('routing.yml')
-				->find()
-		));
-	}
-
-	/**
-	* Find a list of controllers
-	*
-	* @param string $base_path Base path to prepend to file paths
-	* @return provider
-	*/
-	public function find($base_path = '')
-	{
-		$this->routes = new RouteCollection;
-		foreach ($this->routing_files as $file_path)
-		{
-			$loader = new YamlFileLoader(new FileLocator(phpbb_realpath($base_path)));
-			$this->routes->addCollection($loader->load($file_path));
-		}
-
-		return $this;
-	}
-
-	/**
-	* Get the list of routes
-	*
-	* @return RouteCollection Get the route collection
-	*/
-	public function get_routes()
-	{
-		return $this->routes;
-	}
-}